diff --git a/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageOutput.java b/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageOutput.java
index 8e1390ba0f3..e819dd12fff 100644
--- a/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageOutput.java
+++ b/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageOutput.java
@@ -21,6 +21,7 @@
 import freemarker.cache.ClassTemplateLoader;
 import freemarker.template.*;
 import org.apache.plc4x.plugins.codegenerator.language.LanguageOutput;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.ConstantsTypeDefinition;
 import org.apache.plc4x.plugins.codegenerator.types.definitions.EnumTypeDefinition;
 import org.apache.plc4x.plugins.codegenerator.types.definitions.DataIoTypeDefinition;
 import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
@@ -31,10 +32,7 @@
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public abstract class FreemarkerLanguageOutput implements LanguageOutput {
 
@@ -53,13 +51,15 @@ public void generate(File outputDir, String version, String languageName, String
         freemarkerConfiguration.setTemplateLoader(classTemplateLoader);
 
         // Initialize all templates
-        List<Template> specTemplates;
+        List<Template> specTemplatesList;
+        List<Template> constantsTemplateList;
         List<Template> complexTypesTemplateList;
         List<Template> enumTypesTemplateList;
         List<Template> dataIoTemplateList;
         List<Template> miscTemplateList;
         try {
-            specTemplates = getSpecTemplates(freemarkerConfiguration);
+            specTemplatesList = getSpecTemplates(freemarkerConfiguration);
+            constantsTemplateList = getConstantsTemplates(freemarkerConfiguration);
             complexTypesTemplateList = getComplexTypeTemplates(freemarkerConfiguration);
             enumTypesTemplateList = getEnumTypeTemplates(freemarkerConfiguration);
             dataIoTemplateList = getDataIoTemplates(freemarkerConfiguration);
@@ -69,7 +69,7 @@ public void generate(File outputDir, String version, String languageName, String
         }
 
         // Generate output that's global for the entire mspec
-        if (!specTemplates.isEmpty()) {
+        if (!specTemplatesList.isEmpty()) {
             Map<String, Object> typeContext = new HashMap<>();
             typeContext.put("languageName", languageName);
             typeContext.put("protocolName", protocolName);
@@ -78,7 +78,7 @@ public void generate(File outputDir, String version, String languageName, String
             typeContext.put("tracer", Tracer.start("global"));
             typeContext.putAll(options);
 
-            for (Template template : specTemplates) {
+            for (Template template : specTemplatesList) {
                 try {
                     renderTemplate(outputDir, template, typeContext);
                 } catch (IOException | TemplateException e) {
@@ -87,8 +87,36 @@ public void generate(File outputDir, String version, String languageName, String
             }
         }
 
+        // Generate constants types
+        Optional<TypeDefinition> constantsTypeDefinition = types.values().stream().filter(type -> type instanceof ConstantsTypeDefinition).findFirst();
+        if (!constantsTemplateList.isEmpty() && constantsTypeDefinition.isPresent()) {
+            TypeDefinition typeDefinition = constantsTypeDefinition.get();
+            Map<String, Object> typeContext = new HashMap<>();
+            typeContext.put("languageName", languageName);
+            typeContext.put("protocolName", protocolName);
+            typeContext.put("outputFlavor", outputFlavor);
+            typeContext.put("typeName", typeDefinition.getName());
+            typeContext.put("type", typeDefinition);
+            typeContext.put("helper", getHelper(typeDefinition, protocolName, outputFlavor, types, options));
+            typeContext.put("tracer", Tracer.start("global"));
+            typeContext.putAll(options);
+
+            for (Template template : constantsTemplateList) {
+                try {
+                    renderTemplate(outputDir, template, typeContext);
+                } catch (IOException | TemplateException e) {
+                    throw new GenerationException("Error generating constants.", e);
+                }
+            }
+        }
+
         // Iterate over the types and have content generated for each one
         for (Map.Entry<String, TypeDefinition> typeEntry : types.entrySet()) {
+            // "Constants" types are handled separately.
+            if (typeEntry.getValue() instanceof ConstantsTypeDefinition) {
+                continue;
+            }
+
             // Prepare a new generation context
             Map<String, Object> typeContext = new HashMap<>();
             typeContext.put("languageName", languageName);
@@ -202,6 +230,8 @@ private Configuration getFreemarkerConfiguration() throws GenerationException {
 
     protected abstract List<Template> getSpecTemplates(Configuration freemarkerConfiguration) throws IOException;
 
+    protected abstract List<Template> getConstantsTemplates(Configuration freemarkerConfiguration) throws IOException;
+
     protected abstract List<Template> getComplexTypeTemplates(Configuration freemarkerConfiguration) throws IOException;
 
     protected abstract List<Template> getEnumTypeTemplates(Configuration freemarkerConfiguration) throws IOException;
diff --git a/code-generation/language/c/src/main/java/org/apache/plc4x/language/c/CLanguageOutput.java b/code-generation/language/c/src/main/java/org/apache/plc4x/language/c/CLanguageOutput.java
index 119ab1cfb49..a71250dd2a0 100644
--- a/code-generation/language/c/src/main/java/org/apache/plc4x/language/c/CLanguageOutput.java
+++ b/code-generation/language/c/src/main/java/org/apache/plc4x/language/c/CLanguageOutput.java
@@ -53,11 +53,20 @@ protected List<Template> getSpecTemplates(Configuration freemarkerConfiguration)
         return Collections.emptyList();
     }
 
+    @Override
+    protected List<Template> getConstantsTemplates(Configuration freemarkerConfiguration) throws IOException {
+        return Arrays.asList(
+            freemarkerConfiguration.getTemplate("templates/c/constants-template.h.ftlh"),
+            freemarkerConfiguration.getTemplate("templates/c/constants-template.c.ftlh")
+        );
+    }
+
     @Override
     protected List<Template> getComplexTypeTemplates(Configuration freemarkerConfiguration) throws IOException {
         return Arrays.asList(
             freemarkerConfiguration.getTemplate("templates/c/complex-type-template.h.ftlh"),
-            freemarkerConfiguration.getTemplate("templates/c/complex-type-template.c.ftlh"));
+            freemarkerConfiguration.getTemplate("templates/c/complex-type-template.c.ftlh")
+        );
     }
 
     @Override
diff --git a/code-generation/language/c/src/main/java/org/apache/plc4x/language/c/CLanguageTemplateHelper.java b/code-generation/language/c/src/main/java/org/apache/plc4x/language/c/CLanguageTemplateHelper.java
index 12f0ac08892..549daea7bfa 100644
--- a/code-generation/language/c/src/main/java/org/apache/plc4x/language/c/CLanguageTemplateHelper.java
+++ b/code-generation/language/c/src/main/java/org/apache/plc4x/language/c/CLanguageTemplateHelper.java
@@ -137,19 +137,25 @@ public String getLanguageTypeNameForField(Field field) {
         return getLanguageTypeNameForTypeReference(typeReference);
     }
 
-    public List<Pair<ConstField, ComplexTypeDefinition>> getAllConstFields() {
+    public List<Pair<ConstField, String>> getAllConstFields() {
         // Note: a map is not an option here as ConstFields are duplicated
-        List<Pair<ConstField, ComplexTypeDefinition>> constFields = new LinkedList<>();
-        ComplexTypeDefinition complexTypeDefinition = (ComplexTypeDefinition) this.thisType;
-        complexTypeDefinition.getConstFields()
-            .forEach(constField -> constFields.add(Pair.of(constField, complexTypeDefinition)));
-        complexTypeDefinition.getSwitchField()
-            .map(SwitchField::getCases)
-            .ifPresent(discriminatedComplexTypeDefinitions ->
-                discriminatedComplexTypeDefinitions.forEach(switchCase ->
-                    switchCase.getConstFields().forEach(constField -> constFields.add(Pair.of(constField, switchCase)))
-                )
-            );
+        List<Pair<ConstField, String>> constFields = new LinkedList<>();
+        if(this.thisType instanceof ComplexTypeDefinition) {
+            ComplexTypeDefinition complexTypeDefinition = (ComplexTypeDefinition) this.thisType;
+            complexTypeDefinition.getConstFields()
+                .forEach(constField -> constFields.add(Pair.of(constField, complexTypeDefinition.getName())));
+            complexTypeDefinition.getSwitchField()
+                .map(SwitchField::getCases)
+                .ifPresent(discriminatedComplexTypeDefinitions ->
+                    discriminatedComplexTypeDefinitions.forEach(switchCase ->
+                        switchCase.getConstFields().forEach(constField -> constFields.add(Pair.of(constField, switchCase.getName())))
+                    )
+                );
+        } else if (this.thisType instanceof ConstantsTypeDefinition) {
+            ConstantsTypeDefinition constantsTypeDefinition = (ConstantsTypeDefinition) this.thisType;
+            constantsTypeDefinition.getConstFields()
+                .forEach(constField -> constFields.add(Pair.of(constField, constantsTypeDefinition.getName())));
+        }
         return constFields;
     }
 
diff --git a/code-generation/language/c/src/main/resources/templates/c/complex-type-template.c.ftlh b/code-generation/language/c/src/main/resources/templates/c/complex-type-template.c.ftlh
index f081bbd4c8e..be0333c5c56 100644
--- a/code-generation/language/c/src/main/resources/templates/c/complex-type-template.c.ftlh
+++ b/code-generation/language/c/src/main/resources/templates/c/complex-type-template.c.ftlh
@@ -98,10 +98,10 @@ ${helper.getCTypeName(type.name)} ${helper.getCTypeName(type.name)}_null() {
 // Constant values.
     <#list helper.getAllConstFields() as entry>
         <#assign constField=entry.key>
-        <#assign parentType=entry.value>
-static const ${helper.getLanguageTypeNameForField(constField)} ${helper.getCTypeName(parentType.name)?upper_case}_${helper.camelCaseToSnakeCase(constField.name)?upper_case}_const = ${helper.toParseExpression(type, constField, constField.referenceValue, parserArguments)};
-${helper.getLanguageTypeNameForField(constField)} ${helper.getCTypeName(parentType.name)?upper_case}_${helper.camelCaseToSnakeCase(constField.name)?upper_case}() {
-  return ${helper.getCTypeName(parentType.name)?upper_case}_${helper.camelCaseToSnakeCase(constField.name)?upper_case}_const;
+        <#assign parentTypeName=entry.value>
+static const ${helper.getLanguageTypeNameForField(constField)} ${helper.getCTypeName(parentTypeName)?upper_case}_${helper.camelCaseToSnakeCase(constField.name)?upper_case}_const = ${helper.toParseExpression(type, constField, constField.referenceValue, parserArguments)};
+${helper.getLanguageTypeNameForField(constField)} ${helper.getCTypeName(parentTypeName)?upper_case}_${helper.camelCaseToSnakeCase(constField.name)?upper_case}() {
+  return ${helper.getCTypeName(parentTypeName)?upper_case}_${helper.camelCaseToSnakeCase(constField.name)?upper_case}_const;
 }
     </#list>
 </#if>
diff --git a/code-generation/language/c/src/main/resources/templates/c/complex-type-template.h.ftlh b/code-generation/language/c/src/main/resources/templates/c/complex-type-template.h.ftlh
index 93710c0b080..fc7971051ac 100644
--- a/code-generation/language/c/src/main/resources/templates/c/complex-type-template.h.ftlh
+++ b/code-generation/language/c/src/main/resources/templates/c/complex-type-template.h.ftlh
@@ -122,8 +122,8 @@ ${helper.getCTypeName(type.name)}_discriminator ${helper.getCTypeName(type.name)
 // Constant values.
     <#list helper.getAllConstFields() as entry>
         <#assign constField=entry.key>
-        <#assign parentType=entry.value>
-${helper.getLanguageTypeNameForField(constField)} ${helper.getCTypeName(parentType.name)?upper_case}_${helper.camelCaseToSnakeCase(constField.name)?upper_case}();
+        <#assign parentTypeName=entry.value>
+${helper.getLanguageTypeNameForField(constField)} ${helper.getCTypeName(parentTypeName)?upper_case}_${helper.camelCaseToSnakeCase(constField.name)?upper_case}();
     </#list>
 </#if>
 
diff --git a/code-generation/language/c/src/main/resources/templates/c/constants-template.c.ftlh b/code-generation/language/c/src/main/resources/templates/c/constants-template.c.ftlh
new file mode 100644
index 00000000000..4ef8ab18d5d
--- /dev/null
+++ b/code-generation/language/c/src/main/resources/templates/c/constants-template.c.ftlh
@@ -0,0 +1,76 @@
+<#--
+  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.
+-->
+<#-- Prevent freemarker from escaping stuff -->
+<#outputformat "undefined">
+<#-- Declare the name and type of variables passed in to the template -->
+<#-- @ftlvariable name="languageName" type="java.lang.String" -->
+<#-- @ftlvariable name="protocolName" type="java.lang.String" -->
+<#-- @ftlvariable name="outputFlavor" type="java.lang.String" -->
+<#-- @ftlvariable name="helper" type="org.apache.plc4x.language.c.CLanguageTemplateHelper" -->
+<#-- @ftlvariable name="tracer" type="org.apache.plc4x.plugins.codegenerator.protocol.freemarker.Tracer" -->
+<#-- @ftlvariable name="type" type="org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition" -->
+<#-- Declare the name and type of variables declared locally inside the template -->
+<#-- @ftlvariable name="field" type="org.apache.plc4x.plugins.codegenerator.types.fields.Field" -->
+${helper.getSourceDirectory()?replace(".", "/")}/${helper.camelCaseToSnakeCase(type.name)}.c
+/*
+ * 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.
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <plc4c/spi/context.h>
+#include <plc4c/spi/read_buffer.h>
+#include <plc4c/spi/write_buffer.h>
+#include <plc4c/utils/list.h>
+
+// Code generated by code-generation. DO NOT EDIT.
+
+<#--
+    When using const fields, output the constant reference values
+    as global const values so we can use them elsewhere.
+-->
+<#if helper.getAllConstFields()?has_content>
+
+// Constant values.
+    <#list helper.getAllConstFields() as entry>
+        <#assign constField=entry.key>
+        <#assign parentTypeName=entry.value>
+static const ${helper.getLanguageTypeNameForField(constField)} ${helper.getCTypeName(parentTypeName)?upper_case}_${helper.camelCaseToSnakeCase(constField.name)?upper_case}_const = ${helper.toParseExpression(type, constField, constField.referenceValue, parserArguments)};
+    ${helper.getLanguageTypeNameForField(constField)} ${helper.getCTypeName(parentTypeName)?upper_case}_${helper.camelCaseToSnakeCase(constField.name)?upper_case}() {
+    return ${helper.getCTypeName(parentTypeName)?upper_case}_${helper.camelCaseToSnakeCase(constField.name)?upper_case}_const;
+}
+    </#list>
+</#if>
+
+</#outputformat>
\ No newline at end of file
diff --git a/code-generation/language/c/src/main/resources/templates/c/constants-template.h.ftlh b/code-generation/language/c/src/main/resources/templates/c/constants-template.h.ftlh
new file mode 100644
index 00000000000..f363bd688f4
--- /dev/null
+++ b/code-generation/language/c/src/main/resources/templates/c/constants-template.h.ftlh
@@ -0,0 +1,84 @@
+<#--
+  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.
+-->
+<#-- Prevent freemarker from escaping stuff -->
+<#outputformat "undefined">
+<#-- Declare the name and type of variables passed in to the template -->
+<#-- @ftlvariable name="languageName" type="java.lang.String" -->
+<#-- @ftlvariable name="protocolName" type="java.lang.String" -->
+<#-- @ftlvariable name="outputFlavor" type="java.lang.String" -->
+<#-- @ftlvariable name="helper" type="org.apache.plc4x.language.c.CLanguageTemplateHelper" -->
+<#-- @ftlvariable name="tracer" type="org.apache.plc4x.plugins.codegenerator.protocol.freemarker.Tracer" -->
+<#-- @ftlvariable name="type" type="org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition" -->
+<#-- Declare the name and type of variables declared locally inside the template -->
+<#-- @ftlvariable name="field" type="org.apache.plc4x.plugins.codegenerator.types.fields.Field" -->
+${helper.getIncludesDirectory()?replace(".", "/")}/${helper.camelCaseToSnakeCase(type.name)}.h
+/*
+ * 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.
+ */
+
+#ifndef ${helper.getCTypeName(type.name)?upper_case}_H_
+#define ${helper.getCTypeName(type.name)?upper_case}_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <plc4c/spi/context.h>
+#include <plc4c/spi/read_buffer.h>
+#include <plc4c/spi/write_buffer.h>
+#include <plc4c/utils/list.h>
+
+// Code generated by code-generation. DO NOT EDIT.
+
+<#--#ifdef __cplusplus
+extern "C" {
+#endif-->
+
+<#--
+    When using const fields, output the constant reference values
+    as global const values so we can use them elsewhere.
+-->
+<#if helper.getAllConstFields()?has_content>
+
+// Constant values.
+    <#list helper.getAllConstFields() as entry>
+        <#assign constField=entry.key>
+        <#assign parentTypeName=entry.value>
+${helper.getLanguageTypeNameForField(constField)} ${helper.getCTypeName(parentTypeName)?upper_case}_${helper.camelCaseToSnakeCase(constField.name)?upper_case}();
+    </#list>
+</#if>
+
+<#--#ifdef __cplusplus
+}
+#endif-->
+#endif  // ${helper.getCTypeName(type.name)?upper_case}_H_
+</#outputformat>
\ No newline at end of file
diff --git a/code-generation/language/cs/src/main/java/org/apache/plc4x/language/cs/CsLanguageOutput.java b/code-generation/language/cs/src/main/java/org/apache/plc4x/language/cs/CsLanguageOutput.java
index be389ef7dce..a87d173b1d1 100644
--- a/code-generation/language/cs/src/main/java/org/apache/plc4x/language/cs/CsLanguageOutput.java
+++ b/code-generation/language/cs/src/main/java/org/apache/plc4x/language/cs/CsLanguageOutput.java
@@ -52,6 +52,11 @@ protected List<Template> getSpecTemplates(Configuration freemarkerConfiguration)
         return Collections.emptyList();
     }
 
+    @Override
+    protected List<Template> getConstantsTemplates(Configuration freemarkerConfiguration) throws IOException {
+        return Collections.emptyList();
+    }
+
     @Override
     protected List<Template> getComplexTypeTemplates(Configuration freemarkerConfiguration) throws IOException {
         return Collections.singletonList(
diff --git a/code-generation/language/go/src/main/java/org/apache/plc4x/language/go/GoLanguageOutput.java b/code-generation/language/go/src/main/java/org/apache/plc4x/language/go/GoLanguageOutput.java
index 2f6b4d96aea..390854b7c52 100644
--- a/code-generation/language/go/src/main/java/org/apache/plc4x/language/go/GoLanguageOutput.java
+++ b/code-generation/language/go/src/main/java/org/apache/plc4x/language/go/GoLanguageOutput.java
@@ -53,6 +53,11 @@ protected List<Template> getSpecTemplates(Configuration freemarkerConfiguration)
             freemarkerConfiguration.getTemplate("templates/go/xml-parser-factory-template.go.ftlh"));
     }
 
+    @Override
+    protected List<Template> getConstantsTemplates(Configuration freemarkerConfiguration) throws IOException {
+        return List.of(freemarkerConfiguration.getTemplate("templates/go/constants-template.go.ftlh"));
+    }
+
     @Override
     protected List<Template> getComplexTypeTemplates(Configuration freemarkerConfiguration) throws IOException {
         return Collections.singletonList(
diff --git a/code-generation/language/go/src/main/resources/templates/go/complex-type-template.go.ftlh b/code-generation/language/go/src/main/resources/templates/go/complex-type-template.go.ftlh
index 74cb97dc594..48f9b5ee10c 100644
--- a/code-generation/language/go/src/main/resources/templates/go/complex-type-template.go.ftlh
+++ b/code-generation/language/go/src/main/resources/templates/go/complex-type-template.go.ftlh
@@ -122,11 +122,6 @@ type ${type.name} interface {
 	Create${type.name}Builder() ${type.name}Builder
 }
 
-<#if parserArguments?has_content>
-	<#assign filteredParserArguments=parserArguments?filter(arg -> !type.isDiscriminatorField(arg.name) && !type.getPropertyFieldFromThisOrParentByName(arg.name).isPresent())>
-	<#assign filteredParserArgumentsLocalToType=filteredParserArguments?filter(arg->type.getParentType().isEmpty()||(type.getParentType().orElseThrow().getAllParserArguments().isEmpty()||!type.getParentType().orElseThrow().isParserArgument(arg.name)))>
-</#if>
-
 <#if type.isDiscriminatedParentTypeDefinition()>
 // ${type.name}Contract provides a set of functions which can be overwritten by a sub struct
 type ${type.name}Contract interface {
@@ -148,12 +143,6 @@ type ${type.name}Contract interface {
 	// Get${namedField.name?cap_first} returns ${namedField.name?cap_first} (abstract field)
 	Get${namedField.name?cap_first}() ${helper.getLanguageTypeNameForField(field)}
 	</#list>
-	<#if filteredParserArgumentsLocalToType?has_content>
-		<#list filteredParserArgumentsLocalToType as parserArgument>
-	// Get${parserArgument.name?cap_first}() returns a parser argument
-	Get${parserArgument.name?cap_first}() ${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}
-		</#list>
-	</#if>
 	<#if type.isDiscriminatedChildTypeDefinition()>
 		<#assign discriminatedChildType = type.asDiscriminatedComplexTypeDefinition().orElseThrow()>
 		<#list discriminatedChildType.getDiscriminatorMap() as discriminatorName, discriminatorType>
@@ -210,13 +199,6 @@ type _${type.name} struct {
         ${field.name?cap_first} <#if helper.needsPointerAccess(field)>*</#if>${helper.getLanguageTypeNameForField(field)}
     </#list>
 </#if>
-<#if filteredParserArgumentsLocalToType?has_content>
-
-	// Arguments.
-    <#list filteredParserArgumentsLocalToType as parserArgument>
-	${parserArgument.name?cap_first} ${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}
-    </#list>
-</#if>
 <#assign reservedFields=type.getFields()?filter(f->f.isReservedField())>
 <#if reservedFields?has_content>
 	// Reserved Fields
@@ -235,26 +217,13 @@ var _ ${type.name} = (*_${type.name})(nil)
 var _ ${type.getParentType().orElseThrow().name}Requirements = (*_${type.name})(nil)
 </#if>
 
-<#if type.parentType.isPresent() && type.parentType.orElseThrow().allParserArguments.isPresent()>
-	<#assign filteredParentParserArguments = type.parentType.orElseThrow().allParserArguments.orElseThrow()?filter(arg -> !type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().isDiscriminatorField(arg.name))>
-</#if>
-
 // New${type.name} factory function for _${type.name}
 <@compress single_line=true>
 	func New${type.name}(
-	<#assign needsSeparator = false>
 	<#list type.getAllPropertyFields() as field>
-		<#assign needsSeparator = true>
 		${field.name} <#if helper.needsPointerAccess(field)>*</#if>${helper.getLanguageTypeNameForField(field)}
 		<#sep>, </#sep>
 	</#list>
-	<#if filteredParserArguments?has_content>
-		<#if needsSeparator>, </#if>
-		<#list filteredParserArguments as parserArgument>
-			${parserArgument.name} ${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}
-			<#sep>, </#sep>
-		</#list>
-	</#if>
 	) *_${type.name} {
 </@compress>
 
@@ -266,6 +235,7 @@ var _ ${type.getParentType().orElseThrow().name}Requirements = (*_${type.name})(
 	&& !field.isCountArrayField()
 	&& !field.isLengthArrayField()
 	&& !field.isTerminatedArrayField()
+	&& !field.isStateField()
 	&& field.isNamedField()
 	&& field.isTypedField()
 	&& field.asTypedField().orElseThrow().type.isComplexTypeReference()>
@@ -279,23 +249,12 @@ var _ ${type.getParentType().orElseThrow().name}Requirements = (*_${type.name})(
 	_result := &_${type.name}{
 	<@compress single_line=true>
 		${type.parentType.orElseThrow().name}Contract:
-		<#assign needsSeparator = false>
 		New${type.parentType.orElseThrow().name}(
 		<#if type.parentPropertyFields?has_content>
 			<#list type.parentPropertyFields as parentField>
-				<#assign needsSeparator = true>
 				${parentField.name}<#sep>, </#sep>
 			</#list>
 		</#if>
-		<#if type.parentType.isPresent() && type.parentType.orElseThrow().allParserArguments.isPresent()>
-			<#assign filteredParentParserArguments = type.parentType.orElseThrow().allParserArguments.orElseThrow()?filter(arg -> !type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().isDiscriminatorField(arg.name))>
-			<#if filteredParentParserArguments?has_content>
-				<#if needsSeparator>, </#if>
-				<#list filteredParentParserArguments as parserArgument>
-					${parserArgument.name}<#sep>, </#sep>
-				</#list>
-			</#if>
-		</#if>
 		),
 	</@compress>
 
@@ -312,13 +271,6 @@ var _ ${type.getParentType().orElseThrow().name}Requirements = (*_${type.name})(
 			${field.name?cap_first}: ${field.name}
 			<#sep>, </#sep>
 		</#list>
-		<#if filteredParserArguments?has_content>
-			<#if type.propertyFields?has_content>, </#if>
-			<#list filteredParserArguments as parserArgument>
-				${parserArgument.name?cap_first}: ${parserArgument.name}
-				<#sep>, </#sep>
-			</#list>
-		</#if>
 		}
 	</@compress>
 
@@ -353,12 +305,6 @@ type ${type.name}Builder interface {
 	With<#if field.isOptionalField()>Optional</#if>${field.name?cap_first}Builder(func(${helper.getLanguageTypeNameForTypeReference(typeRef)}Builder)${helper.getLanguageTypeNameForTypeReference(typeRef)}Builder) ${type.name}Builder
 	</#if>
 </#list>
-<#if filteredParserArgumentsLocalToType?has_content>
-	<#list filteredParserArgumentsLocalToType as parserArgument>
-	// WithArg${parserArgument.name?cap_first} sets a parser argument
-	WithArg${parserArgument.name?cap_first}(${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}) ${type.name}Builder
-	</#list>
-</#if>
 <#if type.isAbstract()>
 	<#list type.switchField.orElseThrow().cases as case>
 	// As${case.name} converts this build to a subType of ${type.name}. It is always possible to return to current builder using Done()
@@ -456,15 +402,6 @@ func (b *_${type.name}Builder) With<#if field.isOptionalField()>Optional</#if>${
 	</#if>
 </#list>
 
-<#if filteredParserArgumentsLocalToType?has_content>
-	<#list filteredParserArgumentsLocalToType as parserArgument>
-func (b *_${type.name}Builder) WithArg${parserArgument.name?cap_first}(${parserArgument.name} ${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}) ${type.name}Builder {
-	b.${parserArgument.name?cap_first} = ${parserArgument.name}
-	return b
-}
-	</#list>
-</#if>
-
 func (b *_${type.name}Builder) <#if type.isAbstract()>Partial</#if>Build() (${type.name}<#if type.isAbstract()>Contract</#if>,error) {
 <#list type.propertyFields?filter(field->!field.isOptionalField()) as field>
 	<#if field.type.isComplexTypeReference() || helper.needsPointerAccess(field)>
@@ -1099,8 +1036,7 @@ func ${type.name}ParseWithBufferProducer<#if type.isDiscriminatedParentTypeDefin
 }
 
 func ${type.name}ParseWithBuffer<#if type.isDiscriminatedParentTypeDefinition()>[T ${type.name}]</#if>(ctx context.Context, readBuffer utils.ReadBuffer<#if hasParserArguments>, ${parserArgumentList}</#if>) (<#if type.isDiscriminatedParentTypeDefinition()>T<#else>${type.name}</#if>, error) {
-	<#assign filteredPartialTypeCreationArgumentList><#if filteredParserArgumentsLocalToType?has_content> <#list filteredParserArgumentsLocalToType as parserArgument>${parserArgument.name?cap_first}: ${parserArgument.name}<#sep>, </#sep></#list> </#if></#assign>
-	v,err:= (&_${type.name}{${filteredPartialTypeCreationArgumentList}}).parse(ctx , readBuffer<#if hasParserArguments>, ${parserArgumentNameList}</#if>)
+	v,err:= (new(_${type.name})).parse(ctx , readBuffer<#if hasParserArguments>, ${parserArgumentNameList}</#if>)
 	if err != nil {
 	<#if !type.isDiscriminatedParentTypeDefinition()>
 		return nil,err
@@ -1848,20 +1784,6 @@ func (m *_${type.name}) SerializeWithWriteBuffer(ctx context.Context, writeBuffe
 	</#if>
 }
 
-<#if filteredParserArgumentsLocalToType?has_content>
-
-////
-// Arguments Getter
-
-    <#list filteredParserArgumentsLocalToType as parserArgument>
-func (m *_${type.name}) Get${parserArgument.name?cap_first}() ${helper.getLanguageTypeNameForTypeReference(parserArgument.type)} {
-	return m.${parserArgument.name?cap_first}
-}
-    </#list>
-//
-////
-</#if>
-
 func (m *_${type.name}) Is${type.name}() {}
 
 func (m *_${type.name}) DeepCopy() any {
@@ -1892,11 +1814,6 @@ func (m *_${type.name}) deepCopy() *_${type.name} {
 		</#if>
 	</#list>
 </#if>
-<#if filteredParserArgumentsLocalToType?has_content>
-	<#list filteredParserArgumentsLocalToType as parserArgument>
-		m.${parserArgument.name?cap_first},
-	</#list>
-</#if>
 <#assign reservedFields=type.getFields()?filter(f->f.isReservedField())>
 <#if reservedFields?has_content>
 	<#list reservedFields as reservedField>
diff --git a/code-generation/language/go/src/main/resources/templates/go/constants-template.go.ftlh b/code-generation/language/go/src/main/resources/templates/go/constants-template.go.ftlh
new file mode 100644
index 00000000000..cb7f2698b5c
--- /dev/null
+++ b/code-generation/language/go/src/main/resources/templates/go/constants-template.go.ftlh
@@ -0,0 +1,84 @@
+<#--
+  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.
+-->
+<#-- Prevent freemarker from escaping stuff -->
+<#outputformat "undefined">
+<#-- Declare the name and type of variables passed in to the template -->
+<#-- @ftlvariable name="languageName" type="java.lang.String" -->
+<#-- @ftlvariable name="protocolName" type="java.lang.String" -->
+<#-- @ftlvariable name="outputFlavor" type="java.lang.String" -->
+<#-- @ftlvariable name="helper" type="org.apache.plc4x.language.go.GoLanguageTemplateHelper" -->
+<#-- @ftlvariable name="tracer" type="org.apache.plc4x.plugins.codegenerator.protocol.freemarker.Tracer" -->
+<#-- @ftlvariable name="type" type="org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition" -->
+<#-- Declare the name and type of variables declared locally inside the template -->
+${helper.fileName(protocolName, languageName, outputFlavor)?replace(".", "/")}/model/${type.name}.go
+/*
+ * 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 model
+
+<#macro importSectionWithContentBelow>
+	<#local sectionContent><#nested></#local>
+import (
+	<#if helper.getRequiredImports()?has_content>
+	<#list helper.getRequiredImports() as import>
+	${import}
+	</#list>
+	</#if>
+)
+
+	${sectionContent}
+</#macro>
+
+<#macro emitImport import>${helper.emitRequiredImport(import)}</#macro>
+<#macro emitImportWithAlias alias import>${helper.emitRequiredImport(alias, import)}</#macro>
+
+<@importSectionWithContentBelow>
+
+
+// Code generated by code-generation. DO NOT EDIT.
+
+<#-- TODO: the code below implies that parserArguments will be null if not present... not pretty  -->
+<#if type.parserArguments.isPresent()><#assign parserArguments=type.allParserArguments.orElseThrow()></#if>
+<#-- If the current type contains "const" fields, generate some go constants for holing their values -->
+<#if type.constFields?has_content>
+
+// Constant values.
+    <#list type.constFields as field>
+var Constant_${field.name?upper_case} ${helper.getLanguageTypeNameForTypeReference(field.type)} = ${helper.toParseExpression(field, field.type, field.referenceValue, parserArguments)};
+    </#list>
+</#if>
+
+</@importSectionWithContentBelow>
+
+</#outputformat>
\ No newline at end of file
diff --git a/code-generation/language/java/src/main/java/org/apache/plc4x/language/java/JavaLanguageOutput.java b/code-generation/language/java/src/main/java/org/apache/plc4x/language/java/JavaLanguageOutput.java
index a65f8b77658..aa3b2ddc5e2 100644
--- a/code-generation/language/java/src/main/java/org/apache/plc4x/language/java/JavaLanguageOutput.java
+++ b/code-generation/language/java/src/main/java/org/apache/plc4x/language/java/JavaLanguageOutput.java
@@ -68,6 +68,11 @@ protected List<Template> getSpecTemplates(Configuration freemarkerConfiguration)
         return Collections.emptyList();
     }
 
+    @Override
+    protected List<Template> getConstantsTemplates(Configuration freemarkerConfiguration) throws IOException {
+        return List.of(freemarkerConfiguration.getTemplate("templates/java/constants-template.java.ftlh"));
+    }
+
     @Override
     protected List<Template> getComplexTypeTemplates(Configuration freemarkerConfiguration) throws IOException {
         return List.of(freemarkerConfiguration.getTemplate("templates/java/complex-type-template.java.ftlh"));
diff --git a/code-generation/language/java/src/main/resources/templates/java/constants-template.java.ftlh b/code-generation/language/java/src/main/resources/templates/java/constants-template.java.ftlh
new file mode 100644
index 00000000000..66d0562191e
--- /dev/null
+++ b/code-generation/language/java/src/main/resources/templates/java/constants-template.java.ftlh
@@ -0,0 +1,84 @@
+<#--
+  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.
+-->
+<#-- Prevent freemarker from escaping stuff -->
+<#outputformat "undefined">
+<#-- Declare the name and type of variables passed in to the template -->
+<#-- @ftlvariable name="languageName" type="java.lang.String" -->
+<#-- @ftlvariable name="protocolName" type="java.lang.String" -->
+<#-- @ftlvariable name="outputFlavor" type="java.lang.String" -->
+<#-- @ftlvariable name="helper" type="org.apache.plc4x.language.java.JavaLanguageTemplateHelper" -->
+<#-- @ftlvariable name="tracer" type="org.apache.plc4x.plugins.codegenerator.protocol.freemarker.Tracer" -->
+<#-- @ftlvariable name="type" type="org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition" -->
+<#-- Declare the name and type of variables declared locally inside the template -->
+${helper.packageName(protocolName, languageName, outputFlavor)?replace(".", "/")}/${type.name}.java
+/*
+ * 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 ${helper.packageName(protocolName, languageName, outputFlavor)};
+
+import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
+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.codegen.fields.FieldReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
+
+import org.apache.plc4x.java.spi.codegen.*;
+import org.apache.plc4x.java.spi.codegen.io.*;
+import org.apache.plc4x.java.spi.codegen.fields.*;
+import org.apache.plc4x.java.api.exceptions.*;
+import org.apache.plc4x.java.spi.generation.*;
+import org.apache.plc4x.java.api.value.*;
+
+import java.time.*;
+import java.util.*;
+import java.math.BigInteger;
+${helper.getExternalTypeImports()}
+
+// Code generated by code-generation. DO NOT EDIT.
+
+<#-- TODO: the code below implies that parserArguments will be null if not present... not pretty  -->
+<#if type.parserArguments.isPresent()><#assign parserArguments=type.allParserArguments.orElseThrow()></#if>
+public class ${type.name} {
+
+<#-- If the current type contains "const" fields, generate some java constants for holing their values -->
+<#if type.constFields?has_content>
+
+    // Constant values.
+    <#list type.constFields as field>
+    public static final ${helper.getLanguageTypeNameForTypeReference(field.type)} ${field.name?upper_case} = ${helper.toParseExpression(field, field.type, field.referenceValue, parserArguments)};
+    </#list>
+</#if>
+
+}
+</#outputformat>
\ No newline at end of file
diff --git a/code-generation/language/python/src/main/java/org/apache/plc4x/language/python/PythonLanguageOutput.java b/code-generation/language/python/src/main/java/org/apache/plc4x/language/python/PythonLanguageOutput.java
index 4d70ac08dd0..fa265abc683 100644
--- a/code-generation/language/python/src/main/java/org/apache/plc4x/language/python/PythonLanguageOutput.java
+++ b/code-generation/language/python/src/main/java/org/apache/plc4x/language/python/PythonLanguageOutput.java
@@ -79,6 +79,11 @@ protected List<Template> getSpecTemplates(Configuration freemarkerConfiguration)
         return Collections.emptyList();
     }
 
+    @Override
+    protected List<Template> getConstantsTemplates(Configuration freemarkerConfiguration) throws IOException {
+        return List.of(freemarkerConfiguration.getTemplate("templates/python/constants-template.python.ftlh"));
+    }
+
     /**
      * Returns a list of templates that are used to generate code for a complex type.
      * A complex type is a type that is composed of multiple fields.
diff --git a/code-generation/language/python/src/main/resources/templates/python/constants-template.python.ftlh b/code-generation/language/python/src/main/resources/templates/python/constants-template.python.ftlh
new file mode 100644
index 00000000000..6898c2d34b8
--- /dev/null
+++ b/code-generation/language/python/src/main/resources/templates/python/constants-template.python.ftlh
@@ -0,0 +1,60 @@
+<#--
+  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.
+-->
+<#-- Prevent freemarker from escaping stuff -->
+<#outputformat "undefined">
+<#-- Declare the name and type of variables passed in to the template -->
+<#-- @ftlvariable name="languageName" type="java.lang.String" -->
+<#-- @ftlvariable name="protocolName" type="java.lang.String" -->
+<#-- @ftlvariable name="outputFlavor" type="java.lang.String" -->
+<#-- @ftlvariable name="helper" type="org.apache.plc4x.language.java.JavaLanguageTemplateHelper" -->
+<#-- @ftlvariable name="tracer" type="org.apache.plc4x.plugins.codegenerator.protocol.freemarker.Tracer" -->
+<#-- @ftlvariable name="type" type="org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition" -->
+<#-- Declare the name and type of variables declared locally inside the template -->
+${helper.packageName(protocolName, languageName, outputFlavor)?replace(".", "/")}/${type.name}.py
+#
+# 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.
+#
+
+from dataclasses import dataclass
+
+@dataclass
+class ${type.name}:
+    <#-- If the current type contains "const" fields, generate some Python constants for holing their values -->
+    <#if type.constFields?has_content>
+        <#list type.constFields as field>
+    ${helper.camelCaseToSnakeCase(field.name)?upper_case}: ${helper.getLanguageTypeNameForTypeReference(field.type)} = ${helper.toParseExpression(field, field.type, field.referenceValue, parserArguments)}
+        </#list>
+    </#if>
+
+</#outputformat>
\ No newline at end of file
diff --git a/code-generation/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4 b/code-generation/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4
index 404925638db..2659e08e3bd 100644
--- a/code-generation/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4
+++ b/code-generation/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4
@@ -19,7 +19,19 @@ grammar MSpec;
  */
 
 file
- : complexTypeDefinition* EOF
+ : contantsDefinition? globalsDefinition? contextDefintion? complexTypeDefinition* EOF
+ ;
+
+contantsDefinition
+ : LBRACKET CONSTANTS (LBRACKET constField RBRACKET)* RBRACKET
+ ;
+
+globalsDefinition
+ : LBRACKET GLOBALS fieldDefinition* RBRACKET
+ ;
+
+contextDefintion
+ : LBRACKET CONTEXT fieldDefinition* RBRACKET
  ;
 
 complexTypeDefinition
@@ -27,10 +39,10 @@ complexTypeDefinition
  ;
 
 complexType
- : 'type' name=idExpression (LRBRACKET params=argumentList RRBRACKET)? attributes=attributeList (fieldDefinition|batchSetDefinition)*
- | 'discriminatedType' name=idExpression (LRBRACKET params=argumentList RRBRACKET)? attributes=attributeList (fieldDefinition|batchSetDefinition)*
- | 'enum' (type=dataType)? name=idExpression (LRBRACKET params=argumentList RRBRACKET)? attributes=attributeList enumValues=enumValueDefinition*
- | 'dataIo' name=idExpression (LRBRACKET params=argumentList RRBRACKET)? (attributes=attributeList) dataIoTypeSwitch=dataIoDefinition
+ : TYPE name=idExpression (LRBRACKET params=argumentList RRBRACKET)? attributes=attributeList (fieldDefinition|batchSetDefinition)*
+ | DISCRIMINATEDTYPE name=idExpression (LRBRACKET params=argumentList RRBRACKET)? attributes=attributeList (fieldDefinition|batchSetDefinition)*
+ | ENUM (type=dataType)? name=idExpression (LRBRACKET params=argumentList RRBRACKET)? attributes=attributeList enumValues=enumValueDefinition*
+ | DATAIO name=idExpression (LRBRACKET params=argumentList RRBRACKET)? (attributes=attributeList) dataIoTypeSwitch=dataIoDefinition
  ;
 
 fieldDefinition
@@ -38,11 +50,11 @@ fieldDefinition
  ;
 
 batchSetDefinition
- : LBRACKET 'batchSet' attributes=attributeList fieldDefinition+ RBRACKET
+ : LBRACKET BATCHSET attributes=attributeList fieldDefinition+ RBRACKET
  ;
 
 dataIoDefinition
-// TODO: remove typeSwitchField as it's a unnecessary indirection
+// TODO: possibly alow more fields than just one typeSwitch field.
  : LBRACKET typeSwitchField (LBRACKET params=multipleExpressions RBRACKET)? RBRACKET
  ;
 
@@ -59,89 +71,94 @@ field
  | manualField
  | optionalField
  | paddingField
+ | peekField
  | reservedField
  | simpleField
+ | stateField
  | typeSwitchField
  | unknownField
- | virtualField
  | validationField
- | peekField
+ | virtualField
  ;
 
 abstractField
- : 'abstract' type=typeReference name=idExpression
+ : ABSTRACT type=typeReference name=idExpression
  ;
 
 arrayField
- : 'array' type=typeReference name=idExpression loopType=ARRAY_LOOP_TYPE loopExpression=expression
+ : ARRAY type=typeReference name=idExpression loopType=ARRAY_LOOP_TYPE loopExpression=expression
  ;
 
 assertField
- : 'assert' type=typeReference name=idExpression condition=expression
+ : ASSERT type=typeReference name=idExpression condition=expression
  ;
 
 checksumField
- : 'checksum' type=dataType name=idExpression checksumExpression=expression
+ : CHECKSUM type=dataType name=idExpression checksumExpression=expression
  ;
 
 constField
- : 'const' type=typeReference name=idExpression expected=valueLiteral
+ : CONST type=typeReference name=idExpression expected=valueLiteral
  ;
 
 discriminatorField
- : 'discriminator' type=typeReference name=idExpression
+ : DISCRIMINATOR type=typeReference name=idExpression
  ;
 
 enumField
- : 'enum' type=typeReference name=idExpression fieldName=idExpression
+ : ENUM type=typeReference name=idExpression fieldName=idExpression
  ;
 
 implicitField
- : 'implicit' type=dataType name=idExpression serializeExpression=expression
+ : IMPLICIT type=dataType name=idExpression serializeExpression=expression
  ;
 
 manualArrayField
- : 'manualArray' type=typeReference name=idExpression loopType=ARRAY_LOOP_TYPE loopExpression=expression parseExpression=expression serializeExpression=expression lengthExpression=expression
+ : MANUALARRAY type=typeReference name=idExpression loopType=ARRAY_LOOP_TYPE loopExpression=expression parseExpression=expression serializeExpression=expression lengthExpression=expression
  ;
 
 manualField
- : 'manual' type=typeReference name=idExpression parseExpression=expression serializeExpression=expression lengthExpression=expression
+ : MANUAL type=typeReference name=idExpression parseExpression=expression serializeExpression=expression lengthExpression=expression
  ;
 
 optionalField
- : 'optional' type=typeReference name=idExpression (condition=expression)?
+ : OPTIONAL type=typeReference name=idExpression (condition=expression)?
  ;
 
 paddingField
- : 'padding' type=dataType name=idExpression paddingValue=expression timesPadding=expression
+ : PADDING type=dataType name=idExpression paddingValue=expression timesPadding=expression
+ ;
+
+peekField
+ : PEEK type=typeReference name=idExpression (offset=expression)?
  ;
 
 reservedField
- : 'reserved' type=dataType expected=expression
+ : RESERVED type=dataType expected=expression
  ;
 
 simpleField
- : 'simple' type=typeReference name=idExpression
+ : SIMPLE type=typeReference name=idExpression
  ;
 
-typeSwitchField
- : 'typeSwitch' discriminators=multipleVariableLiterals caseStatement*
+stateField
+ : STATE name=idExpression
  ;
 
-unknownField
- : 'unknown' type=dataType
+typeSwitchField
+ : TYPESWITCH discriminators=multipleVariableLiterals caseStatement*
  ;
 
-virtualField
- : 'virtual' type=typeReference name=idExpression valueExpression=expression
+unknownField
+ : UNKNOWN type=dataType
  ;
 
 validationField
- : 'validation' validationExpression=expression (description=STRING_LITERAL)? ('shouldFail='shouldFail=BOOLEAN_LITERAL)?
+ : VALIDATION validationExpression=expression (description=STRING_LITERAL)? (SHOULD_FAIL '=' shouldFail=BOOLEAN_LITERAL)?
  ;
 
-peekField
- : 'peek' type=typeReference name=idExpression (offset=expression)?
+virtualField
+ : VIRTUAL type=typeReference name=idExpression valueExpression=expression
  ;
 
 enumValueDefinition
@@ -158,19 +175,19 @@ caseStatement
  ;
 
 dataType
- : base='bit'
- | base='byte'
- | base='int' size=INTEGER_LITERAL
- | base='vint'
- | base='uint' size=INTEGER_LITERAL
- | base='vuint'
- | base='float' size=INTEGER_LITERAL
- | base='ufloat' size=INTEGER_LITERAL
- | base='string' size=INTEGER_LITERAL
- | base='vstring' (length=expression)?
- | base='time'
- | base='date'
- | base='dateTime'
+ : base=BIT
+ | base=BYTE
+ | base=INT size=INTEGER_LITERAL
+ | base=VINT
+ | base=UINT size=INTEGER_LITERAL
+ | base=VUINT
+ | base=FLOAT size=INTEGER_LITERAL
+ | base=UFLOAT size=INTEGER_LITERAL
+ | base=STRING size=INTEGER_LITERAL
+ | base=VSTRING (length=expression)?
+ | base=TIME
+ | base=DATE
+ | base=DATETIME
  ;
 
 attribute
@@ -233,8 +250,16 @@ valueLiteral
 
 idExpression
  : id=IDENTIFIER_LITERAL
- // Explicitly allow the loop type keywords in id-expressions
+ // Explicitly allow keywords in id-expressions
  | id=ARRAY_LOOP_TYPE
+ | id=CONSTANTS | id=GLOBALS | id=CONTEXT | id=TYPE | id=DISCRIMINATEDTYPE | id=DATAIO
+ | id=ENUM | id=BATCHSET | id=ABSTRACT | id=ARRAY | id=ASSERT | id=CHECKSUM | id=CONST
+ | id=DISCRIMINATOR | id=IMPLICIT | id=MANUALARRAY | id=MANUAL | id=OPTIONAL | id=PADDING
+ | id=PEEK | id=RESERVED | id=SIMPLE | id=STATE | id=TYPESWITCH | id=UNKNOWN | id=VALIDATION
+ | id=VIRTUAL
+ | id=BIT | id=BYTE | id=INT | id=VINT | id=UINT | id=VUINT
+ | id=FLOAT | id=UFLOAT | id=STRING | id=VSTRING | id=TIME | id=DATE | id=DATETIME
+ | id=SHOULD_FAIL
  ;
 
 binaryOperator
@@ -268,6 +293,55 @@ RCBRACKET : '}';
 
 ASTERISK : '*';
 
+// Keywords used for higher level constructs
+CONSTANTS       : 'constants';
+GLOBALS         : 'globals';
+CONTEXT         : 'context';
+TYPE            : 'type';
+DISCRIMINATEDTYPE : 'discriminatedType';
+DATAIO          : 'dataIo';
+ENUM            : 'enum';
+BATCHSET        : 'batchSet';
+
+// Keywords used for fields
+ABSTRACT        : 'abstract';
+ARRAY           : 'array';
+ASSERT          : 'assert';
+CHECKSUM        : 'checksum';
+CONST           : 'const';
+DISCRIMINATOR   : 'discriminator';
+IMPLICIT        : 'implicit';
+MANUALARRAY     : 'manualArray';
+MANUAL          : 'manual';
+OPTIONAL        : 'optional';
+PADDING         : 'padding';
+PEEK            : 'peek';
+RESERVED        : 'reserved';
+SIMPLE          : 'simple';
+STATE           : 'state';
+TYPESWITCH      : 'typeSwitch';
+UNKNOWN         : 'unknown';
+VALIDATION      : 'validation';
+VIRTUAL         : 'virtual';
+
+// Keywords for types
+BIT             : 'bit';
+BYTE            : 'byte';
+INT             : 'int';
+VINT            : 'vint';
+UINT            : 'uint';
+VUINT           : 'vuint';
+FLOAT           : 'float';
+UFLOAT          : 'ufloat';
+STRING          : 'string';
+VSTRING         : 'vstring';
+TIME            : 'time';
+DATE            : 'date';
+DATETIME        : 'dateTime';
+
+// Keywords used elsewhere
+SHOULD_FAIL     : 'shouldFail';
+
 ARRAY_LOOP_TYPE
  : 'count'
  | 'length'
diff --git a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java
index a753d489f37..45d08d3ae3a 100644
--- a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java
+++ b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java
@@ -72,6 +72,14 @@ public List<SimpleField> getSimpleFields() {
             .collect(Collectors.toList());
     }
 
+    @Override
+    public List<StateField> getStateFields() {
+        return fields.stream()
+            .filter(StateField.class::isInstance)
+            .map(StateField.class::cast)
+            .collect(Collectors.toList());
+    }
+
     @Override
     public List<ConstField> getConstFields() {
         return fields.stream()
diff --git a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultConstantsTypeDefinition.java b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultConstantsTypeDefinition.java
new file mode 100644
index 00000000000..2b90e4430b3
--- /dev/null
+++ b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultConstantsTypeDefinition.java
@@ -0,0 +1,63 @@
+/*
+ * 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.plugins.codegenerator.language.mspec.model.definitions;
+
+import org.apache.plc4x.plugins.codegenerator.types.definitions.Argument;
+import org.apache.plc4x.plugins.codegenerator.types.definitions.ConstantsTypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.fields.ConstField;
+import org.apache.plc4x.plugins.codegenerator.types.fields.Field;
+import org.apache.plc4x.plugins.codegenerator.types.fields.PropertyField;
+import org.apache.plc4x.plugins.codegenerator.types.fields.VirtualField;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class DefaultConstantsTypeDefinition extends DefaultTypeDefinition implements ConstantsTypeDefinition {
+
+    private final List<Field> fields;
+
+    public DefaultConstantsTypeDefinition(String name, Map<String, Term> attributes, List<Argument> parserArguments, List<Field> fields) {
+        super(name, attributes, parserArguments);
+        this.fields = fields;
+    }
+
+    @Override
+    public List<Field> getFields() {
+        return fields;
+    }
+
+    @Override
+    public List<ConstField> getConstFields() {
+        return fields.stream()
+            .filter(ConstField.class::isInstance)
+            .map(ConstField.class::cast)
+            .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<PropertyField> getPropertyFields() {
+        return fields.stream()
+            .filter(PropertyField.class::isInstance)
+            .filter(field -> !(field instanceof ConstField) && !(field instanceof VirtualField))
+            .map(PropertyField.class::cast)
+            .collect(Collectors.toList());
+    }
+}
diff --git a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultStateField.java b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultStateField.java
new file mode 100644
index 00000000000..95b0f21096c
--- /dev/null
+++ b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultStateField.java
@@ -0,0 +1,60 @@
+/*
+ * 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.plugins.codegenerator.language.mspec.model.fields;
+
+import org.apache.plc4x.plugins.codegenerator.types.fields.StateField;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+
+import java.util.Map;
+import java.util.Objects;
+
+public class DefaultStateField extends DefaultTypedNamedField implements StateField {
+
+    private final Term valueExpression;
+
+    public DefaultStateField(Map<String, Term> attributes, String name, Term valueExpression) {
+        super(attributes, name);
+        this.valueExpression = Objects.requireNonNull(valueExpression);
+    }
+
+    public Term getValueExpression() {
+        return valueExpression;
+    }
+
+    @Override
+    public String toString() {
+        return "DefaultStateField{" +
+            "valueExpression=" + valueExpression +
+            "} " + super.toString();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        DefaultStateField that = (DefaultStateField) o;
+        return Objects.equals(valueExpression, that.valueExpression);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), valueExpression);
+    }
+}
diff --git a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
index 209bc7a656c..9dbb5ead03f 100644
--- a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
+++ b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
@@ -18,6 +18,7 @@
  */
 package org.apache.plc4x.plugins.codegenerator.language.mspec.parser;
 
+import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.RuleContext;
 import org.apache.commons.io.IOUtils;
 import org.apache.plc4x.plugins.codegenerator.language.mspec.LazyTypeDefinitionConsumer;
@@ -27,6 +28,7 @@
 import org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions.*;
 import org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields.*;
 import org.apache.plc4x.plugins.codegenerator.language.mspec.model.references.*;
+import org.apache.plc4x.plugins.codegenerator.language.mspec.model.terms.DefaultVariableLiteral;
 import org.apache.plc4x.plugins.codegenerator.language.mspec.model.terms.WildcardTerm;
 import org.apache.plc4x.plugins.codegenerator.protocol.TypeContext;
 import org.apache.plc4x.plugins.codegenerator.types.definitions.*;
@@ -91,6 +93,56 @@ public void enterFile(MSpecParser.FileContext ctx) {
         enumContexts = new LinkedList<>();
     }
 
+    @Override
+    public void enterContantsDefinition(MSpecParser.ContantsDefinitionContext ctx) {
+        currentTypeName.push("Constants");
+        // Set a map of attributes that should be set for all fields.
+        Map<String, Term> curBatchSetAttributes = new HashMap<>();
+        // Make the new Map the top of the stack.
+        batchSetAttributes.push(curBatchSetAttributes);
+
+        List<Field> parserContext = new LinkedList<>();
+        parserContexts.push(parserContext);
+        super.enterContantsDefinition(ctx);
+    }
+
+    @Override
+    public void exitContantsDefinition(MSpecParser.ContantsDefinitionContext ctx) {
+        String typeName = "Constants";
+
+        // If the type has subtypes, it's an abstract type.
+        final List<Field> fields = parserContexts.pop();
+        DefaultConstantsTypeDefinition type = new DefaultConstantsTypeDefinition(
+            typeName, Collections.emptyMap(), Collections.emptyList(), fields);
+        // Link the fields and the complex types.
+        if (fields != null) {
+            fields.forEach(field -> ((DefaultField) field).setOwner(type));
+        }
+        dispatchType(typeName, type);
+
+        currentTypeName.pop();
+    }
+
+    @Override
+    public void enterGlobalsDefinition(MSpecParser.GlobalsDefinitionContext ctx) {
+        super.enterGlobalsDefinition(ctx);
+    }
+
+    @Override
+    public void exitGlobalsDefinition(MSpecParser.GlobalsDefinitionContext ctx) {
+        super.exitGlobalsDefinition(ctx);
+    }
+
+    @Override
+    public void enterContextDefintion(MSpecParser.ContextDefintionContext ctx) {
+        super.enterContextDefintion(ctx);
+    }
+
+    @Override
+    public void exitContextDefintion(MSpecParser.ContextDefintionContext ctx) {
+        super.exitContextDefintion(ctx);
+    }
+
     @Override
     public void enterComplexType(MSpecParser.ComplexTypeContext ctx) {
         currentTypeName.push(getIdString(ctx.name));
@@ -240,6 +292,24 @@ public void enterArrayField(MSpecParser.ArrayFieldContext ctx) {
         }
     }
 
+    @Override
+    public void enterAssertField(MSpecParser.AssertFieldContext ctx) {
+        String name = getIdString(ctx.name);
+        Term conditionExpression = getExpressionTerm(ctx.condition);
+        DefaultAssertField field = new DefaultAssertField(getAttributes(ctx), name, conditionExpression);
+        getTypeReference(ctx.type).whenComplete((typeReference, throwable) -> {
+            if (throwable != null) {
+                // TODO: proper error collection in type context error bucket
+                LOGGER.debug("Error setting type for {}", field, throwable);
+                return;
+            }
+            field.setType(typeReference);
+        });
+        if (parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
     @Override
     public void enterChecksumField(MSpecParser.ChecksumFieldContext ctx) {
         SimpleTypeReference type = getSimpleTypeReference(ctx.type);
@@ -316,24 +386,6 @@ public void enterImplicitField(MSpecParser.ImplicitFieldContext ctx) {
         }
     }
 
-    @Override
-    public void enterAssertField(MSpecParser.AssertFieldContext ctx) {
-        String name = getIdString(ctx.name);
-        Term conditionExpression = getExpressionTerm(ctx.condition);
-        DefaultAssertField field = new DefaultAssertField(getAttributes(ctx), name, conditionExpression);
-        getTypeReference(ctx.type).whenComplete((typeReference, throwable) -> {
-            if (throwable != null) {
-                // TODO: proper error collection in type context error bucket
-                LOGGER.debug("Error setting type for {}", field, throwable);
-                return;
-            }
-            field.setType(typeReference);
-        });
-        if (parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
     @Override
     public void enterManualArrayField(MSpecParser.ManualArrayFieldContext ctx) {
         String name = getIdString(ctx.name);
@@ -400,6 +452,18 @@ public void enterOptionalField(MSpecParser.OptionalFieldContext ctx) {
         }
     }
 
+    @Override
+    public void enterPaddingField(MSpecParser.PaddingFieldContext ctx) {
+        SimpleTypeReference type = getSimpleTypeReference(ctx.type);
+        String name = getIdString(ctx.name);
+        Term paddingValue = getExpressionTerm(ctx.paddingValue);
+        Term timesPadding = getExpressionTerm(ctx.timesPadding);
+        Field field = new DefaultPaddingField(getAttributes(ctx), type, name, paddingValue, timesPadding);
+        if (parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
     @Override
     public void enterPeekField(MSpecParser.PeekFieldContext ctx) {
         String name = getIdString(ctx.name);
@@ -421,18 +485,6 @@ public void enterPeekField(MSpecParser.PeekFieldContext ctx) {
         }
     }
 
-    @Override
-    public void enterPaddingField(MSpecParser.PaddingFieldContext ctx) {
-        SimpleTypeReference type = getSimpleTypeReference(ctx.type);
-        String name = getIdString(ctx.name);
-        Term paddingValue = getExpressionTerm(ctx.paddingValue);
-        Term timesPadding = getExpressionTerm(ctx.timesPadding);
-        Field field = new DefaultPaddingField(getAttributes(ctx), type, name, paddingValue, timesPadding);
-        if (parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
     @Override
     public void enterReservedField(MSpecParser.ReservedFieldContext ctx) {
         SimpleTypeReference type = getSimpleTypeReference(ctx.type);
@@ -460,6 +512,46 @@ public void enterSimpleField(MSpecParser.SimpleFieldContext ctx) {
         }
     }
 
+    @Override
+    public void enterStateField(MSpecParser.StateFieldContext ctx) {
+        String name = getIdString(ctx.name);
+        // Get the type information from the parents arguments.
+        ParserRuleContext parent = ctx.getParent().getParent().getParent();
+        if (!(parent instanceof MSpecParser.ComplexTypeContext) && !(parent instanceof MSpecParser.CaseStatementContext)) {
+            throw new RuntimeException("state fields must only be defined in complex types");
+        }
+        Optional<MSpecParser.ArgumentContext> argumentContext;
+        if (parent instanceof MSpecParser.ComplexTypeContext) {
+            MSpecParser.ComplexTypeContext complexTypeContext = (MSpecParser.ComplexTypeContext) parent;
+            argumentContext = complexTypeContext.params.argument().stream().filter(argContext -> argContext.name.getText().equalsIgnoreCase(name)).findFirst();
+        } else {
+            RuleContext curContext = parent;
+            while((curContext.parent != null) && !(curContext.parent instanceof MSpecParser.ComplexTypeContext)) {
+                curContext = curContext.parent;
+            }
+            if (curContext.parent == null) {
+                throw new RuntimeException("state fields must refer to arguments by using the same name. Parent context is null.");
+            }
+            MSpecParser.ComplexTypeContext complexTypeContext = (MSpecParser.ComplexTypeContext) curContext.parent;
+            argumentContext = complexTypeContext.params.argument().stream().filter(argContext -> argContext.name.getText().equalsIgnoreCase(name)).findFirst();
+        }
+        MSpecParser.TypeReferenceContext type = argumentContext.orElseThrow(() -> new RuntimeException("state fields must refer to arguments by using the same name.")).type;
+        // The variable term is always just a direct reference to the parser argument.
+        Term valueExpression = new DefaultVariableLiteral(name, null, null, null);
+        DefaultStateField field = new DefaultStateField(getAttributes(ctx), name, valueExpression);
+        getTypeReference(type).whenComplete((typeReference, throwable) -> {
+            if (throwable != null) {
+                // TODO: proper error collection in type context error bucket
+                LOGGER.debug("Error setting type for {}", field, throwable);
+                return;
+            }
+            field.setType(typeReference);
+        });
+        if (parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
     @Override
     public void enterTypeSwitchField(MSpecParser.TypeSwitchFieldContext ctx) {
         List<VariableLiteral> variableLiterals = ctx.discriminators.variableLiteral().stream()
@@ -480,6 +572,23 @@ public void enterUnknownField(MSpecParser.UnknownFieldContext ctx) {
         }
     }
 
+    @Override
+    public void enterValidationField(MSpecParser.ValidationFieldContext ctx) {
+        Term validationExpression = getExpressionTerm(ctx.validationExpression);
+        boolean shouldFail = true;
+        if (ctx.shouldFail != null) {
+            shouldFail = "true".equalsIgnoreCase(ctx.shouldFail.getText());
+        }
+        String description = null;
+        if (ctx.description != null) {
+            description = ctx.description.getText();
+        }
+        Field field = new DefaultValidationField(getAttributes(ctx), validationExpression, description, shouldFail);
+        if (parserContexts.peek() != null) {
+            parserContexts.peek().add(field);
+        }
+    }
+
     @Override
     public void enterVirtualField(MSpecParser.VirtualFieldContext ctx) {
         String name = getIdString(ctx.name);
@@ -498,23 +607,6 @@ public void enterVirtualField(MSpecParser.VirtualFieldContext ctx) {
         }
     }
 
-    @Override
-    public void enterValidationField(MSpecParser.ValidationFieldContext ctx) {
-        Term validationExpression = getExpressionTerm(ctx.validationExpression);
-        boolean shouldFail = true;
-        if (ctx.shouldFail != null) {
-            shouldFail = "true".equalsIgnoreCase(ctx.shouldFail.getText());
-        }
-        String description = null;
-        if (ctx.description != null) {
-            description = ctx.description.getText();
-        }
-        Field field = new DefaultValidationField(getAttributes(ctx), validationExpression, description, shouldFail);
-        if (parserContexts.peek() != null) {
-            parserContexts.peek().add(field);
-        }
-    }
-
     @Override
     public void enterCaseStatement(MSpecParser.CaseStatementContext ctx) {
         List<Field> parserContext = new LinkedList<>();
diff --git a/plc4c/generated-sources/modbus/include/constants.h b/plc4c/generated-sources/modbus/include/constants.h
new file mode 100644
index 00000000000..18a36c04bf0
--- /dev/null
+++ b/plc4c/generated-sources/modbus/include/constants.h
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+#ifndef PLC4C_MODBUS_READ_WRITE_CONSTANTS_H_
+#define PLC4C_MODBUS_READ_WRITE_CONSTANTS_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <plc4c/spi/context.h>
+#include <plc4c/spi/read_buffer.h>
+#include <plc4c/spi/write_buffer.h>
+#include <plc4c/utils/list.h>
+
+// Code generated by code-generation. DO NOT EDIT.
+
+
+// Constant values.
+uint16_t PLC4C_MODBUS_READ_WRITE_CONSTANTS_MODBUS_TCP_DEFAULT_PORT();
+
+#endif  // PLC4C_MODBUS_READ_WRITE_CONSTANTS_H_
diff --git a/plc4c/generated-sources/modbus/include/modbus_constants.h b/plc4c/generated-sources/modbus/include/modbus_constants.h
deleted file mode 100644
index 25ba237fede..00000000000
--- a/plc4c/generated-sources/modbus/include/modbus_constants.h
+++ /dev/null
@@ -1,53 +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.
- */
-
-#ifndef PLC4C_MODBUS_READ_WRITE_MODBUS_CONSTANTS_H_
-#define PLC4C_MODBUS_READ_WRITE_MODBUS_CONSTANTS_H_
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <plc4c/spi/context.h>
-#include <plc4c/spi/read_buffer.h>
-#include <plc4c/spi/write_buffer.h>
-#include <plc4c/utils/list.h>
-
-// Code generated by code-generation. DO NOT EDIT.
-
-
-// Constant values.
-uint16_t PLC4C_MODBUS_READ_WRITE_MODBUS_CONSTANTS_MODBUS_TCP_DEFAULT_PORT();
-
-struct plc4c_modbus_read_write_modbus_constants {
-  /* Properties */
-  uint16_t modbus_tcp_default_port;
-};
-typedef struct plc4c_modbus_read_write_modbus_constants plc4c_modbus_read_write_modbus_constants;
-
-// Create an empty NULL-struct
-plc4c_modbus_read_write_modbus_constants plc4c_modbus_read_write_modbus_constants_null();
-
-plc4c_return_code plc4c_modbus_read_write_modbus_constants_parse(plc4x_spi_context ctx, plc4c_spi_read_buffer* readBuffer, plc4c_modbus_read_write_modbus_constants** message);
-
-plc4c_return_code plc4c_modbus_read_write_modbus_constants_serialize(plc4x_spi_context ctx, plc4c_spi_write_buffer* writeBuffer, plc4c_modbus_read_write_modbus_constants* message);
-
-uint16_t plc4c_modbus_read_write_modbus_constants_length_in_bytes(plc4x_spi_context ctx, plc4c_modbus_read_write_modbus_constants* message);
-
-uint16_t plc4c_modbus_read_write_modbus_constants_length_in_bits(plc4x_spi_context ctx, plc4c_modbus_read_write_modbus_constants* message);
-
-#endif  // PLC4C_MODBUS_READ_WRITE_MODBUS_CONSTANTS_H_
diff --git a/plc4c/generated-sources/modbus/src/constants.c b/plc4c/generated-sources/modbus/src/constants.c
new file mode 100644
index 00000000000..1d9460d7112
--- /dev/null
+++ b/plc4c/generated-sources/modbus/src/constants.c
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <plc4c/spi/context.h>
+#include <plc4c/spi/read_buffer.h>
+#include <plc4c/spi/write_buffer.h>
+#include <plc4c/utils/list.h>
+
+// Code generated by code-generation. DO NOT EDIT.
+
+
+// Constant values.
+static const uint16_t PLC4C_MODBUS_READ_WRITE_CONSTANTS_MODBUS_TCP_DEFAULT_PORT_const = 502;
+    uint16_t PLC4C_MODBUS_READ_WRITE_CONSTANTS_MODBUS_TCP_DEFAULT_PORT() {
+    return PLC4C_MODBUS_READ_WRITE_CONSTANTS_MODBUS_TCP_DEFAULT_PORT_const;
+}
+
diff --git a/plc4c/generated-sources/modbus/src/modbus_constants.c b/plc4c/generated-sources/modbus/src/modbus_constants.c
deleted file mode 100644
index d82f9594a92..00000000000
--- a/plc4c/generated-sources/modbus/src/modbus_constants.c
+++ /dev/null
@@ -1,82 +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.
- */
-
-#include <stdio.h>
-#include <plc4c/spi/context.h>
-#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_modbus_static.h>
-
-#include "modbus_constants.h"
-
-// Code generated by code-generation. DO NOT EDIT.
-
-
-// Constant values.
-static const uint16_t PLC4C_MODBUS_READ_WRITE_MODBUS_CONSTANTS_MODBUS_TCP_DEFAULT_PORT_const = 502;
-uint16_t PLC4C_MODBUS_READ_WRITE_MODBUS_CONSTANTS_MODBUS_TCP_DEFAULT_PORT() {
-  return PLC4C_MODBUS_READ_WRITE_MODBUS_CONSTANTS_MODBUS_TCP_DEFAULT_PORT_const;
-}
-
-// Parse function.
-plc4c_return_code plc4c_modbus_read_write_modbus_constants_parse(plc4x_spi_context ctx, plc4c_spi_read_buffer* readBuffer, plc4c_modbus_read_write_modbus_constants** _message) {
-  uint16_t startPos = plc4c_spi_read_get_pos(readBuffer);
-  plc4c_return_code _res = OK;
-
-  // Allocate enough memory to contain this data structure.
-  (*_message) = malloc(sizeof(plc4c_modbus_read_write_modbus_constants));
-  if(*_message == NULL) {
-    return NO_MEMORY;
-  }
-
-  // Const Field (modbusTcpDefaultPort)
-  uint16_t modbusTcpDefaultPort = 0;
-  _res = plc4c_spi_read_unsigned_short(readBuffer, 16, (uint16_t*) &modbusTcpDefaultPort);
-  if(_res != OK) {
-    return _res;
-  }
-  if(modbusTcpDefaultPort != PLC4C_MODBUS_READ_WRITE_MODBUS_CONSTANTS_MODBUS_TCP_DEFAULT_PORT()) {
-    return PARSE_ERROR;
-    // throw new ParseException("Expected constant value " + PLC4C_MODBUS_READ_WRITE_MODBUS_CONSTANTS_MODBUS_TCP_DEFAULT_PORT + " but got " + modbusTcpDefaultPort);
-  }
-
-  return OK;
-}
-
-plc4c_return_code plc4c_modbus_read_write_modbus_constants_serialize(plc4x_spi_context ctx, plc4c_spi_write_buffer* writeBuffer, plc4c_modbus_read_write_modbus_constants* _message) {
-  plc4c_return_code _res = OK;
-
-  // Const Field (modbusTcpDefaultPort)
-  plc4c_spi_write_unsigned_short(writeBuffer, 16, PLC4C_MODBUS_READ_WRITE_MODBUS_CONSTANTS_MODBUS_TCP_DEFAULT_PORT());
-
-  return OK;
-}
-
-uint16_t plc4c_modbus_read_write_modbus_constants_length_in_bytes(plc4x_spi_context ctx, plc4c_modbus_read_write_modbus_constants* _message) {
-  return plc4c_modbus_read_write_modbus_constants_length_in_bits(ctx, _message) / 8;
-}
-
-uint16_t plc4c_modbus_read_write_modbus_constants_length_in_bits(plc4x_spi_context ctx, plc4c_modbus_read_write_modbus_constants* _message) {
-  uint16_t lengthInBits = 0;
-
-  // Const Field (modbusTcpDefaultPort)
-  lengthInBits += 16;
-
-  return lengthInBits;
-}
-
diff --git a/plc4c/generated-sources/plc4x/include/constants.h b/plc4c/generated-sources/plc4x/include/constants.h
new file mode 100644
index 00000000000..ba03c781a02
--- /dev/null
+++ b/plc4c/generated-sources/plc4x/include/constants.h
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+#ifndef PLC4C_PLC4X_READ_WRITE_CONSTANTS_H_
+#define PLC4C_PLC4X_READ_WRITE_CONSTANTS_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <plc4c/spi/context.h>
+#include <plc4c/spi/read_buffer.h>
+#include <plc4c/spi/write_buffer.h>
+#include <plc4c/utils/list.h>
+
+// Code generated by code-generation. DO NOT EDIT.
+
+
+// Constant values.
+uint16_t PLC4C_PLC4X_READ_WRITE_CONSTANTS_PLC4X_TCP_DEFAULT_PORT();
+
+#endif  // PLC4C_PLC4X_READ_WRITE_CONSTANTS_H_
diff --git a/plc4c/generated-sources/plc4x/include/plc4x_constants.h b/plc4c/generated-sources/plc4x/include/plc4x_constants.h
deleted file mode 100644
index 14b252f31cd..00000000000
--- a/plc4c/generated-sources/plc4x/include/plc4x_constants.h
+++ /dev/null
@@ -1,53 +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.
- */
-
-#ifndef PLC4C_PLC4X_READ_WRITE_PLC4X_CONSTANTS_H_
-#define PLC4C_PLC4X_READ_WRITE_PLC4X_CONSTANTS_H_
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <plc4c/spi/context.h>
-#include <plc4c/spi/read_buffer.h>
-#include <plc4c/spi/write_buffer.h>
-#include <plc4c/utils/list.h>
-
-// Code generated by code-generation. DO NOT EDIT.
-
-
-// Constant values.
-uint16_t PLC4C_PLC4X_READ_WRITE_PLC4X_CONSTANTS_PLC4X_TCP_DEFAULT_PORT();
-
-struct plc4c_plc4x_read_write_plc4x_constants {
-  /* Properties */
-  uint16_t plc4x_tcp_default_port;
-};
-typedef struct plc4c_plc4x_read_write_plc4x_constants plc4c_plc4x_read_write_plc4x_constants;
-
-// Create an empty NULL-struct
-plc4c_plc4x_read_write_plc4x_constants plc4c_plc4x_read_write_plc4x_constants_null();
-
-plc4c_return_code plc4c_plc4x_read_write_plc4x_constants_parse(plc4x_spi_context ctx, plc4c_spi_read_buffer* readBuffer, plc4c_plc4x_read_write_plc4x_constants** message);
-
-plc4c_return_code plc4c_plc4x_read_write_plc4x_constants_serialize(plc4x_spi_context ctx, plc4c_spi_write_buffer* writeBuffer, plc4c_plc4x_read_write_plc4x_constants* message);
-
-uint16_t plc4c_plc4x_read_write_plc4x_constants_length_in_bytes(plc4x_spi_context ctx, plc4c_plc4x_read_write_plc4x_constants* message);
-
-uint16_t plc4c_plc4x_read_write_plc4x_constants_length_in_bits(plc4x_spi_context ctx, plc4c_plc4x_read_write_plc4x_constants* message);
-
-#endif  // PLC4C_PLC4X_READ_WRITE_PLC4X_CONSTANTS_H_
diff --git a/plc4c/generated-sources/plc4x/src/constants.c b/plc4c/generated-sources/plc4x/src/constants.c
new file mode 100644
index 00000000000..c9c54316895
--- /dev/null
+++ b/plc4c/generated-sources/plc4x/src/constants.c
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <plc4c/spi/context.h>
+#include <plc4c/spi/read_buffer.h>
+#include <plc4c/spi/write_buffer.h>
+#include <plc4c/utils/list.h>
+
+// Code generated by code-generation. DO NOT EDIT.
+
+
+// Constant values.
+static const uint16_t PLC4C_PLC4X_READ_WRITE_CONSTANTS_PLC4X_TCP_DEFAULT_PORT_const = 59837;
+    uint16_t PLC4C_PLC4X_READ_WRITE_CONSTANTS_PLC4X_TCP_DEFAULT_PORT() {
+    return PLC4C_PLC4X_READ_WRITE_CONSTANTS_PLC4X_TCP_DEFAULT_PORT_const;
+}
+
diff --git a/plc4c/generated-sources/plc4x/src/plc4x_constants.c b/plc4c/generated-sources/plc4x/src/plc4x_constants.c
deleted file mode 100644
index 72a5bcca30e..00000000000
--- a/plc4c/generated-sources/plc4x/src/plc4x_constants.c
+++ /dev/null
@@ -1,82 +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.
- */
-
-#include <stdio.h>
-#include <plc4c/spi/context.h>
-#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_plc4x_static.h>
-
-#include "plc4x_constants.h"
-
-// Code generated by code-generation. DO NOT EDIT.
-
-
-// Constant values.
-static const uint16_t PLC4C_PLC4X_READ_WRITE_PLC4X_CONSTANTS_PLC4X_TCP_DEFAULT_PORT_const = 59837;
-uint16_t PLC4C_PLC4X_READ_WRITE_PLC4X_CONSTANTS_PLC4X_TCP_DEFAULT_PORT() {
-  return PLC4C_PLC4X_READ_WRITE_PLC4X_CONSTANTS_PLC4X_TCP_DEFAULT_PORT_const;
-}
-
-// Parse function.
-plc4c_return_code plc4c_plc4x_read_write_plc4x_constants_parse(plc4x_spi_context ctx, plc4c_spi_read_buffer* readBuffer, plc4c_plc4x_read_write_plc4x_constants** _message) {
-  uint16_t startPos = plc4c_spi_read_get_pos(readBuffer);
-  plc4c_return_code _res = OK;
-
-  // Allocate enough memory to contain this data structure.
-  (*_message) = malloc(sizeof(plc4c_plc4x_read_write_plc4x_constants));
-  if(*_message == NULL) {
-    return NO_MEMORY;
-  }
-
-  // Const Field (plc4xTcpDefaultPort)
-  uint16_t plc4xTcpDefaultPort = 0;
-  _res = plc4c_spi_read_unsigned_short(readBuffer, 16, (uint16_t*) &plc4xTcpDefaultPort);
-  if(_res != OK) {
-    return _res;
-  }
-  if(plc4xTcpDefaultPort != PLC4C_PLC4X_READ_WRITE_PLC4X_CONSTANTS_PLC4X_TCP_DEFAULT_PORT()) {
-    return PARSE_ERROR;
-    // throw new ParseException("Expected constant value " + PLC4C_PLC4X_READ_WRITE_PLC4X_CONSTANTS_PLC4X_TCP_DEFAULT_PORT + " but got " + plc4xTcpDefaultPort);
-  }
-
-  return OK;
-}
-
-plc4c_return_code plc4c_plc4x_read_write_plc4x_constants_serialize(plc4x_spi_context ctx, plc4c_spi_write_buffer* writeBuffer, plc4c_plc4x_read_write_plc4x_constants* _message) {
-  plc4c_return_code _res = OK;
-
-  // Const Field (plc4xTcpDefaultPort)
-  plc4c_spi_write_unsigned_short(writeBuffer, 16, PLC4C_PLC4X_READ_WRITE_PLC4X_CONSTANTS_PLC4X_TCP_DEFAULT_PORT());
-
-  return OK;
-}
-
-uint16_t plc4c_plc4x_read_write_plc4x_constants_length_in_bytes(plc4x_spi_context ctx, plc4c_plc4x_read_write_plc4x_constants* _message) {
-  return plc4c_plc4x_read_write_plc4x_constants_length_in_bits(ctx, _message) / 8;
-}
-
-uint16_t plc4c_plc4x_read_write_plc4x_constants_length_in_bits(plc4x_spi_context ctx, plc4c_plc4x_read_write_plc4x_constants* _message) {
-  uint16_t lengthInBits = 0;
-
-  // Const Field (plc4xTcpDefaultPort)
-  lengthInBits += 16;
-
-  return lengthInBits;
-}
-
diff --git a/plc4c/tools/plc4x-server/src/plc4x_server.c b/plc4c/tools/plc4x-server/src/plc4x_server.c
index f8f992a5edf..e39cc7edd62 100644
--- a/plc4c/tools/plc4x-server/src/plc4x_server.c
+++ b/plc4c/tools/plc4x-server/src/plc4x_server.c
@@ -30,7 +30,7 @@
 #define MSG_DONTWAIT 0
 #endif
 
-#include "plc4x_constants.h"
+#include "constants.h"
 
 #define MAX 80
 
@@ -88,7 +88,7 @@ int main(int argc, char** argv) {
   serverAddress.sin_family = AF_INET;
   serverAddress.sin_addr.s_addr = htonl(INADDR_ANY);
   serverAddress.sin_port =
-      htons(PLC4C_PLC4X_READ_WRITE_PLC4X_CONSTANTS_PLC4X_TCP_DEFAULT_PORT());
+      htons(PLC4C_PLC4X_READ_WRITE_CONSTANTS_PLC4X_TCP_DEFAULT_PORT());
 
   // Binding newly created socket to given IP and verification
   if ((bind(sockFd, (struct sockaddr*)&serverAddress, sizeof(serverAddress))) !=
diff --git a/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go b/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go
index 4ce001a8925..a96285b8199 100644
--- a/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go
+++ b/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go
@@ -203,9 +203,7 @@ func (m *ApplicationLayerMessageCodec) SendRequest(ctx context.Context, message
 					nil,
 					nil,
 					response.GetRootMessage().(model.APDU),
-					0,
 				),
-				0,
 			)
 			if acceptsMessage(tempBVLC) {
 				if err := handleMessage(
diff --git a/plc4go/internal/bacnetip/Discoverer.go b/plc4go/internal/bacnetip/Discoverer.go
index 6206555a902..7c52d29e830 100644
--- a/plc4go/internal/bacnetip/Discoverer.go
+++ b/plc4go/internal/bacnetip/Discoverer.go
@@ -106,12 +106,12 @@ func (d *Discoverer) broadcastAndDiscover(ctx context.Context, communicationChan
 				lowLimit = driverModel.CreateBACnetContextTagUnsignedInteger(0, whoIsOptions.limits.low)
 				highLimit = driverModel.CreateBACnetContextTagUnsignedInteger(1, whoIsOptions.limits.high)
 			}
-			requestWhoIs := driverModel.NewBACnetUnconfirmedServiceRequestWhoIs(lowLimit, highLimit, 0)
-			apdu := driverModel.NewAPDUUnconfirmedRequest(requestWhoIs, 0)
+			requestWhoIs := driverModel.NewBACnetUnconfirmedServiceRequestWhoIs(lowLimit, highLimit)
+			apdu := driverModel.NewAPDUUnconfirmedRequest(requestWhoIs)
 
 			control := driverModel.NewNPDUControl(false, false, false, false, driverModel.NPDUNetworkPriority_NORMAL_MESSAGE)
-			npdu := driverModel.NewNPDU(1, control, nil, nil, nil, nil, nil, nil, nil, nil, apdu, 0)
-			bvlc := driverModel.NewBVLCOriginalUnicastNPDU(npdu, 0)
+			npdu := driverModel.NewNPDU(1, control, nil, nil, nil, nil, nil, nil, nil, nil, apdu)
+			bvlc := driverModel.NewBVLCOriginalUnicastNPDU(npdu)
 
 			// Send the search request.
 			theBytes, err := bvlc.Serialize()
@@ -150,12 +150,12 @@ func (d *Discoverer) broadcastAndDiscover(ctx context.Context, communicationChan
 			} else {
 				panic("Invalid state")
 			}
-			requestWhoHas := driverModel.NewBACnetUnconfirmedServiceRequestWhoHas(lowLimit, highLimit, object, 0)
-			apdu := driverModel.NewAPDUUnconfirmedRequest(requestWhoHas, 0)
+			requestWhoHas := driverModel.NewBACnetUnconfirmedServiceRequestWhoHas(lowLimit, highLimit, object)
+			apdu := driverModel.NewAPDUUnconfirmedRequest(requestWhoHas)
 
 			control := driverModel.NewNPDUControl(false, false, false, false, driverModel.NPDUNetworkPriority_NORMAL_MESSAGE)
-			npdu := driverModel.NewNPDU(1, control, nil, nil, nil, nil, nil, nil, nil, nil, apdu, 0)
-			bvlc := driverModel.NewBVLCOriginalUnicastNPDU(npdu, 0)
+			npdu := driverModel.NewNPDU(1, control, nil, nil, nil, nil, nil, nil, nil, nil, apdu)
+			bvlc := driverModel.NewBVLCOriginalUnicastNPDU(npdu)
 
 			// Send the search request.
 			theBytes, err := bvlc.Serialize()
diff --git a/plc4go/internal/bacnetip/Reader.go b/plc4go/internal/bacnetip/Reader.go
index 94cbf454d8b..447fc727e9b 100644
--- a/plc4go/internal/bacnetip/Reader.go
+++ b/plc4go/internal/bacnetip/Reader.go
@@ -91,7 +91,7 @@ func (m *Reader) Read(ctx context.Context, readRequest apiModel.PlcReadRequest)
 			if value := singleTag.GetProperties()[0].ArrayIndex; value != nil {
 				arrayIndex = readWriteModel.CreateBACnetContextTagUnsignedInteger(2, *value)
 			}
-			serviceRequest = readWriteModel.NewBACnetConfirmedServiceRequestReadProperty(objectIdentifier, propertyIdentifier, arrayIndex, 0)
+			serviceRequest = readWriteModel.NewBACnetConfirmedServiceRequestReadProperty(0, objectIdentifier, propertyIdentifier, arrayIndex)
 		} else {
 			// Multi request
 			var data []readWriteModel.BACnetReadAccessSpecification
@@ -116,7 +116,7 @@ func (m *Reader) Read(ctx context.Context, readRequest apiModel.PlcReadRequest)
 				data = append(data, specification)
 			}
 
-			serviceRequest = readWriteModel.NewBACnetConfirmedServiceRequestReadPropertyMultiple(data, 0, 0)
+			serviceRequest = readWriteModel.NewBACnetConfirmedServiceRequestReadPropertyMultiple(0, data)
 		}
 
 		invokeId := m.invokeIdGenerator.getAndIncrement()
@@ -134,7 +134,6 @@ func (m *Reader) Read(ctx context.Context, readRequest apiModel.PlcReadRequest)
 			serviceRequest,
 			nil,
 			nil,
-			serviceRequest.GetLengthInBytes(context.Background()),
 		)
 
 		// Start a new request-transaction (Is ended in the response-handler)
diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_APDU.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_APDU.go
index 6e3d2628ae5..6824446046e 100644
--- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_APDU.go
+++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_APDU.go
@@ -126,15 +126,6 @@ func (a *__APDU) GetApduType() readWriteModel.ApduType {
 	}
 }
 
-func (a *__APDU) GetApduLength() uint16 {
-	switch rm := a.GetRootMessage().(type) {
-	case readWriteModel.APDU:
-		return rm.GetApduLength()
-	default:
-		return 0 // TODO: what is a good fallback
-	}
-}
-
 func (a *__APDU) IsAPDU() {
 }
 
diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedPrivateTransferRequest.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedPrivateTransferRequest.go
index 7b843a4b879..cbbd663396f 100644
--- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedPrivateTransferRequest.go
+++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedPrivateTransferRequest.go
@@ -47,10 +47,10 @@ func NewConfirmedPrivateTransferRequest(args Args, kwArgs KWArgs, options ...Opt
 		},
 	}
 	options = AddRootMessageIfAbundant(options, readWriteModel.NewBACnetConfirmedServiceRequestConfirmedPrivateTransfer(
+		0,
 		readWriteModel.CreateBACnetVendorIdContextTagged(0, 0),     // TODO: get right values
 		readWriteModel.CreateBACnetContextTagUnsignedInteger(1, 0), // TODO: get right values
 		nil,
-		0,
 	))
 	options = AddLeafTypeIfAbundant(options, c)
 	var err error
diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedRequestPDU.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedRequestPDU.go
index f756ed695ac..ca73c8e369c 100644
--- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedRequestPDU.go
+++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedRequestPDU.go
@@ -82,7 +82,6 @@ func (c *ConfirmedRequestPDU) buildConfirmedRequest(serviceRequest readWriteMode
 		serviceRequest,
 		nil, // TODO: where to get from
 		nil, // TODO: where to get from
-		0,
 	)
 }
 
diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedRequestSequence.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedRequestSequence.go
index c2d2910655f..dca86d26964 100644
--- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedRequestSequence.go
+++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedRequestSequence.go
@@ -71,7 +71,7 @@ func NewConfirmedRequestSequence(args Args, kwArgs KWArgs, options ...Option) (*
 		panic("this should be set by NewConfirmedRequestPDU")
 		serviceRequest, _ := GAO[model.BACnetConfirmedServiceRequest](args, 0, nil)
 		if serviceRequest != nil {
-			apduConfirmedRequest := model.NewAPDUConfirmedRequest(false, false, false, model.MaxSegmentsAccepted_MORE_THAN_64_SEGMENTS, model.MaxApduLengthAccepted_NUM_OCTETS_1476, 0, nil, nil, serviceRequest, nil, nil, 0)
+			apduConfirmedRequest := model.NewAPDUConfirmedRequest(false, false, false, model.MaxSegmentsAccepted_MORE_THAN_64_SEGMENTS, model.MaxApduLengthAccepted_NUM_OCTETS_1476, 0, nil, nil, serviceRequest, nil, nil)
 			u.SetRootMessage(apduConfirmedRequest)
 		}
 	}
diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ErrorPDU.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ErrorPDU.go
index cc55cfd36a1..788231f6f8d 100644
--- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ErrorPDU.go
+++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ErrorPDU.go
@@ -84,7 +84,6 @@ func (e *ErrorPDU) buildConfirmedRequest(bacnetError readWriteModel.BACnetError)
 		invokeID,
 		e.GetErrorChoice(),
 		e.bacnetError,
-		0,
 	)
 }
 
diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_IAmRequest.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_IAmRequest.go
index 2a9e5a9c108..dc88a584ffa 100644
--- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_IAmRequest.go
+++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_IAmRequest.go
@@ -47,11 +47,10 @@ func NewIAmRequest(args Args, kwArgs KWArgs, options ...Option) (*IAmRequest, er
 		},
 	}
 	options = AddRootMessageIfAbundant(options, readWriteModel.NewBACnetUnconfirmedServiceRequestIAm(
-		readWriteModel.CreateBACnetApplicationTagObjectIdentifier(0, 0),                                                // TODO: get right values
-		readWriteModel.CreateBACnetApplicationTagUnsignedInteger(0),                                                    // TODO: get right values
-		readWriteModel.NewBACnetSegmentationTagged(readWriteModel.CreateBACnetTagHeaderBalanced(false, 0, 0), 0, 0, 0), // TODO: get right values
-		readWriteModel.CreateBACnetVendorIdApplicationTagged(0),                                                        // TODO: get right values
-		0,
+		readWriteModel.CreateBACnetApplicationTagObjectIdentifier(0, 0),                                          // TODO: get right values
+		readWriteModel.CreateBACnetApplicationTagUnsignedInteger(0),                                              // TODO: get right values
+		readWriteModel.NewBACnetSegmentationTagged(readWriteModel.CreateBACnetTagHeaderBalanced(false, 0, 0), 0), // TODO: get right values
+		readWriteModel.CreateBACnetVendorIdApplicationTagged(0),                                                  // TODO: get right values
 	))
 	options = AddLeafTypeIfAbundant(options, w)
 	var err error
diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestPDU.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestPDU.go
index c068e1975bd..11025dfd5c8 100644
--- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestPDU.go
+++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestPDU.go
@@ -65,7 +65,7 @@ func (u *UnconfirmedRequestPDU) buildUnconfirmedServiceRequest(serviceRequest re
 	if serviceRequest == nil {
 		return nil
 	}
-	return readWriteModel.NewAPDUUnconfirmedRequest(serviceRequest, 0)
+	return readWriteModel.NewAPDUUnconfirmedRequest(serviceRequest)
 }
 
 func (u *UnconfirmedRequestPDU) CreateAPDUUnconfirmedRequestBuilder() readWriteModel.APDUUnconfirmedRequestBuilder {
diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestSequence.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestSequence.go
index ad6f8781216..a5ea1645ab1 100644
--- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestSequence.go
+++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestSequence.go
@@ -74,7 +74,7 @@ func NewUnconfirmedRequestSequence(args Args, kwArgs KWArgs, options ...Option)
 		panic("this should be set by NewConfirmedRequestPDU")
 		serviceRequest, _ := GAO[model.BACnetConfirmedServiceRequest](args, 0, nil)
 		if serviceRequest != nil {
-			apduConfirmedRequest := model.NewAPDUConfirmedRequest(false, false, false, model.MaxSegmentsAccepted_MORE_THAN_64_SEGMENTS, model.MaxApduLengthAccepted_NUM_OCTETS_1476, 0, nil, nil, serviceRequest, nil, nil, 0)
+			apduConfirmedRequest := model.NewAPDUConfirmedRequest(false, false, false, model.MaxSegmentsAccepted_MORE_THAN_64_SEGMENTS, model.MaxApduLengthAccepted_NUM_OCTETS_1476, 0, nil, nil, serviceRequest, nil, nil)
 			u.SetRootMessage(apduConfirmedRequest)
 		}
 	}
diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_WhoIsRequest.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_WhoIsRequest.go
index e0da4397bc5..626d9143718 100644
--- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_WhoIsRequest.go
+++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_WhoIsRequest.go
@@ -48,7 +48,6 @@ func NewWhoIsRequest(args Args, kwArgs KWArgs, options ...Option) (*WhoIsRequest
 	options = AddRootMessageIfAbundant(options, readWriteModel.NewBACnetUnconfirmedServiceRequestWhoIs(
 		readWriteModel.CreateBACnetContextTagUnsignedInteger(0, 0), // TODO: set the right values
 		readWriteModel.CreateBACnetContextTagUnsignedInteger(1, 0), // TODO: set the right values
-		0,
 	))
 	options = AddLeafTypeIfAbundant(options, w)
 	var err error
@@ -60,7 +59,6 @@ func NewWhoIsRequest(args Args, kwArgs KWArgs, options ...Option) (*WhoIsRequest
 		w.SetRootMessage(readWriteModel.NewBACnetUnconfirmedServiceRequestWhoIs(
 			readWriteModel.CreateBACnetContextTagUnsignedInteger(0, 0), // TODO: set the right values
 			readWriteModel.CreateBACnetContextTagUnsignedInteger(1, 0), // TODO: set the right values
-			0,
 		))
 	}
 	return w, nil
diff --git a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ApplicationServiceAccessPoint.go b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ApplicationServiceAccessPoint.go
index 366f38c707f..e5ccc1127fd 100644
--- a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ApplicationServiceAccessPoint.go
+++ b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ApplicationServiceAccessPoint.go
@@ -122,7 +122,7 @@ func (a *ApplicationServiceAccessPoint) Indication(args Args, kwArgs KWArgs) err
 			a.log.Debug().Err(errorFound).Msg("got error")
 
 			// TODO: map it to a error... code temporary placeholder
-			return a.Response(NA(NewPDU(NoArgs, NoKWArgs(), WithRootMessage(readWriteModel.NewAPDUReject(_apdu.GetInvokeId(), nil, 0)))), NoKWArgs())
+			return a.Response(NA(NewPDU(NoArgs, NoKWArgs(), WithRootMessage(readWriteModel.NewAPDUReject(_apdu.GetInvokeId(), nil)))), NoKWArgs())
 		}
 	case readWriteModel.APDUUnconfirmedRequest:
 		var apduService readWriteModel.BACnetUnconfirmedServiceChoice
diff --git a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ClientSSM.go b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ClientSSM.go
index 8d9a6aff1a7..e230304d3a8 100644
--- a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ClientSSM.go
+++ b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ClientSSM.go
@@ -262,7 +262,7 @@ func (c *ClientSSM) abort(reason readWriteModel.BACnetAbortReason) (PDU, error)
 	}
 
 	// build an abort _PDU to return
-	abortApdu := readWriteModel.NewAPDUAbort(false, c.invokeId, readWriteModel.NewBACnetAbortReasonTagged(reason, uint32(reason), 0), 0)
+	abortApdu := readWriteModel.NewAPDUAbort(false, c.invokeId, readWriteModel.NewBACnetAbortReasonTagged(0, reason, uint32(reason)))
 	// return it
 	return NewPDU(NoArgs, NoKWArgs(), WithRootMessage(abortApdu)), nil
 }
@@ -465,7 +465,7 @@ func (c *ClientSSM) awaitConfirmation(apdu PDU) error {
 			}
 
 			// send back a segment ack
-			segmentAck := readWriteModel.NewAPDUSegmentAck(false, false, c.invokeId, c.initialSequenceNumber, *c.actualWindowSize, 0)
+			segmentAck := readWriteModel.NewAPDUSegmentAck(false, false, c.invokeId, c.initialSequenceNumber, *c.actualWindowSize)
 			if err := c.Request(NA(NewPDU(NoArgs, NoKWArgs(), WithRootMessage(segmentAck))), NoKWArgs()); err != nil {
 				c.log.Debug().Err(err).Msg("error sending request")
 			}
@@ -569,7 +569,7 @@ func (c *ClientSSM) segmentedConfirmation(apdu PDU) error {
 
 		// segment received out of order
 		c.RestartTimer(c.segmentTimeout)
-		segmentAck := readWriteModel.NewAPDUSegmentAck(true, false, c.invokeId, c.initialSequenceNumber, *c.actualWindowSize, 0)
+		segmentAck := readWriteModel.NewAPDUSegmentAck(true, false, c.invokeId, c.initialSequenceNumber, *c.actualWindowSize)
 		if err := c.Request(NA(NewPDU(NoArgs, NoKWArgs()), WithRootMessage(segmentAck)), NoKWArgs()); err != nil {
 			c.log.Debug().Err(err).Msg("error sending request")
 		}
@@ -589,7 +589,7 @@ func (c *ClientSSM) segmentedConfirmation(apdu PDU) error {
 		c.log.Debug().Msg("No more follows")
 
 		// send final ack
-		segmentAck := readWriteModel.NewAPDUSegmentAck(false, false, c.invokeId, c.lastSequenceNumber, *c.actualWindowSize, 0)
+		segmentAck := readWriteModel.NewAPDUSegmentAck(false, false, c.invokeId, c.lastSequenceNumber, *c.actualWindowSize)
 		if err := c.Request(NA(NewPDU(NoArgs, NoKWArgs()), WithRootMessage(segmentAck)), NoKWArgs()); err != nil {
 			c.log.Debug().Err(err).Msg("error sending request")
 		}
@@ -612,7 +612,7 @@ func (c *ClientSSM) segmentedConfirmation(apdu PDU) error {
 
 		c.initialSequenceNumber = c.lastSequenceNumber
 		c.RestartTimer(c.segmentTimeout)
-		segmentAck := readWriteModel.NewAPDUSegmentAck(false, false, c.invokeId, c.lastSequenceNumber, *c.actualWindowSize, 0)
+		segmentAck := readWriteModel.NewAPDUSegmentAck(false, false, c.invokeId, c.lastSequenceNumber, *c.actualWindowSize)
 		if err := c.Request(NA(NewPDU(NoArgs, NoKWArgs(), WithRootMessage(segmentAck))), NoKWArgs()); err != nil { // send it ot the device
 			c.log.Debug().Err(err).Msg("error sending request")
 		}
diff --git a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_SSM.go b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_SSM.go
index a510e450849..43dedcef6b9 100644
--- a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_SSM.go
+++ b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_SSM.go
@@ -321,7 +321,6 @@ func (s *SSM) getSegment(index uint8) (segmentAPDU PDU, moreFollows bool, err er
 			nil,
 			serviceChoice,
 			segmentBytes,
-			0,
 		)))
 	} else {
 		s.log.Debug().Msg("complex ack context")
@@ -334,7 +333,6 @@ func (s *SSM) getSegment(index uint8) (segmentAPDU PDU, moreFollows bool, err er
 			nil,
 			serviceChoice,
 			segmentBytes,
-			0,
 		)))
 	}
 	return segmentAPDU, moreFollows, nil
diff --git a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ServerSSM.go b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ServerSSM.go
index a28f5305184..07fe02e0d8d 100644
--- a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ServerSSM.go
+++ b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ServerSSM.go
@@ -284,7 +284,7 @@ func (s *ServerSSM) abort(reason readWriteModel.BACnetAbortReason) (PDU, error)
 	}
 
 	// build an abort _PDU to return
-	abortApdu := readWriteModel.NewAPDUAbort(true, s.invokeId, readWriteModel.NewBACnetAbortReasonTagged(reason, uint32(reason), 0), 0)
+	abortApdu := readWriteModel.NewAPDUAbort(true, s.invokeId, readWriteModel.NewBACnetAbortReasonTagged(0, reason, uint32(reason)))
 	// return it
 	return NewPDU(NoArgs, NoKWArgs(), WithRootMessage(abortApdu)), nil
 }
@@ -388,7 +388,7 @@ func (s *ServerSSM) idle(apdu PDU) error {
 	}
 
 	// send back a segment ack
-	segack := readWriteModel.NewAPDUSegmentAck(false, true, s.invokeId, s.initialSequenceNumber, *s.actualWindowSize, 0)
+	segack := readWriteModel.NewAPDUSegmentAck(false, true, s.invokeId, s.initialSequenceNumber, *s.actualWindowSize)
 	s.log.Debug().Stringer("segack", segack).Msg("segAck")
 	return s.Response(NA(NewPDU(NoArgs, NoKWArgs(), WithRootMessage(segack))), NoKWArgs())
 }
@@ -446,7 +446,7 @@ func (s *ServerSSM) segmentedRequest(apdu PDU) error {
 		s.RestartTimer(s.segmentTimeout)
 
 		// send back a segment ack
-		segack := readWriteModel.NewAPDUSegmentAck(true, true, s.invokeId, s.initialSequenceNumber, *s.actualWindowSize, 0)
+		segack := readWriteModel.NewAPDUSegmentAck(true, true, s.invokeId, s.initialSequenceNumber, *s.actualWindowSize)
 		return s.Response(NA(NewPDU(NoArgs, NoKWArgs(), WithRootMessage(segack))), NoKWArgs())
 	}
 
@@ -463,7 +463,7 @@ func (s *ServerSSM) segmentedRequest(apdu PDU) error {
 		s.log.Debug().Msg("No more follows")
 
 		// send back the final segment ack
-		segack := readWriteModel.NewAPDUSegmentAck(false, true, s.invokeId, s.lastSequenceNumber, *s.actualWindowSize, 0)
+		segack := readWriteModel.NewAPDUSegmentAck(false, true, s.invokeId, s.lastSequenceNumber, *s.actualWindowSize)
 		if err := s.Response(NA(NewPDU(NoArgs, NoKWArgs(), WithRootMessage(segack))), NoKWArgs()); err != nil {
 			s.log.Debug().Err(err).Msg("error sending response")
 		}
@@ -491,7 +491,7 @@ func (s *ServerSSM) segmentedRequest(apdu PDU) error {
 		s.RestartTimer(s.segmentTimeout)
 
 		// send back a segment ack
-		segack := readWriteModel.NewAPDUSegmentAck(false, true, s.invokeId, s.initialSequenceNumber, *s.actualWindowSize, 0)
+		segack := readWriteModel.NewAPDUSegmentAck(false, true, s.invokeId, s.initialSequenceNumber, *s.actualWindowSize)
 		if err := s.Response(NA(NewPDU(NoArgs, NoKWArgs(), WithRootMessage(segack))), NoKWArgs()); err != nil {
 			s.log.Debug().Err(err).Msg("error sending response")
 		}
diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_DistributeBroadcastToNetwork.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_DistributeBroadcastToNetwork.go
index 8b113009916..3906a38563b 100644
--- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_DistributeBroadcastToNetwork.go
+++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_DistributeBroadcastToNetwork.go
@@ -49,7 +49,7 @@ func NewDistributeBroadcastToNetwork(args Args, kwArgs KWArgs, options ...Option
 	return d, nil
 }
 
-func (d *DistributeBroadcastToNetwork) produceInnerNPDU(inNpdu readWriteModel.NPDU) (npdu readWriteModel.NPDU, bvlcPayloadLength uint16) {
+func (d *DistributeBroadcastToNetwork) produceInnerNPDU(inNpdu readWriteModel.NPDU) (npdu readWriteModel.NPDU) {
 	npdu = inNpdu
 	return
 }
diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ForwardedNPDU.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ForwardedNPDU.go
index b1fa11204ae..39fbca08530 100644
--- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ForwardedNPDU.go
+++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ForwardedNPDU.go
@@ -71,7 +71,7 @@ func (f *ForwardedNPDU) GetBvlciAddress() *Address {
 	return f.bvlciAddress
 }
 
-func (f *ForwardedNPDU) produceInnerNPDU(inNpdu readWriteModel.NPDU) (ip []uint8, port uint16, npdu readWriteModel.NPDU, bvlcPayloadLength uint16) {
+func (f *ForwardedNPDU) produceInnerNPDU(inNpdu readWriteModel.NPDU) (ip []uint8, port uint16, npdu readWriteModel.NPDU) {
 	ip = f.bvlciAddress.AddrAddress[:4]
 	port = uint16(47808)
 	if f.bvlciAddress.AddrPort != nil {
diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalBroadcastNPDU.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalBroadcastNPDU.go
index fd5f566b593..99947e025a9 100644
--- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalBroadcastNPDU.go
+++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalBroadcastNPDU.go
@@ -49,7 +49,7 @@ func NewOriginalBroadcastNPDU(args Args, kwArgs KWArgs, options ...Option) (*Ori
 	return o, nil
 }
 
-func (o *OriginalBroadcastNPDU) produceInnerNPDU(inNpdu readWriteModel.NPDU) (npdu readWriteModel.NPDU, bvlcPayloadLength uint16) {
+func (o *OriginalBroadcastNPDU) produceInnerNPDU(inNpdu readWriteModel.NPDU) (npdu readWriteModel.NPDU) {
 	npdu = inNpdu
 	return
 }
diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalUnicastNPDU.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalUnicastNPDU.go
index 60fa1a80f74..2ff6a210120 100644
--- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalUnicastNPDU.go
+++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalUnicastNPDU.go
@@ -52,7 +52,7 @@ func NewOriginalUnicastNPDU(args Args, kwArgs KWArgs, options ...Option) (*Origi
 	return o, nil
 }
 
-func (o *OriginalUnicastNPDU) produceInnerNPDU(inNpdu readWriteModel.NPDU) (npdu readWriteModel.NPDU, bvlcPayloadLength uint16) {
+func (o *OriginalUnicastNPDU) produceInnerNPDU(inNpdu readWriteModel.NPDU) (npdu readWriteModel.NPDU) {
 	npdu = inNpdu
 	return
 }
diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadBroadcastDistributionTableAck.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadBroadcastDistributionTableAck.go
index b3230210ca3..3c9227669ce 100644
--- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadBroadcastDistributionTableAck.go
+++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadBroadcastDistributionTableAck.go
@@ -69,7 +69,7 @@ func (r *ReadBroadcastDistributionTableAck) GetBvlciBDT() []*Address {
 	return r.bvlciBDT
 }
 
-func (r *ReadBroadcastDistributionTableAck) produceBroadcastDistributionTable() (entries []readWriteModel.BVLCBroadcastDistributionTableEntry, _ uint16) {
+func (r *ReadBroadcastDistributionTableAck) produceBroadcastDistributionTable() (entries []readWriteModel.BVLCBroadcastDistributionTableEntry) {
 	for _, address := range r.bvlciBDT {
 		addr := address.AddrAddress[:4]
 		port := uint16(47808)
diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadForeignDeviceTableAck.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadForeignDeviceTableAck.go
index a96c18d0d69..f3287180469 100644
--- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadForeignDeviceTableAck.go
+++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadForeignDeviceTableAck.go
@@ -69,7 +69,7 @@ func (r *ReadForeignDeviceTableAck) GetBvlciFDT() []*FDTEntry {
 	return r.bvlciFDT
 }
 
-func (r *ReadForeignDeviceTableAck) produceForeignDeviceTable() (entries []readWriteModel.BVLCForeignDeviceTableEntry, _ uint16) {
+func (r *ReadForeignDeviceTableAck) produceForeignDeviceTable() (entries []readWriteModel.BVLCForeignDeviceTableEntry) {
 	for _, entry := range r.bvlciFDT {
 		address := entry.FDAddress
 		addr := address.AddrAddress[:4]
diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_WriteBroadcastDistributionTable.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_WriteBroadcastDistributionTable.go
index 3d45be9484f..82535d10a9a 100644
--- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_WriteBroadcastDistributionTable.go
+++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_WriteBroadcastDistributionTable.go
@@ -69,7 +69,7 @@ func (w *WriteBroadcastDistributionTable) GetBvlciBDT() []*Address {
 	return w.bvlciBDT
 }
 
-func (w *WriteBroadcastDistributionTable) produceBroadcastDistributionTable() (entries []readWriteModel.BVLCBroadcastDistributionTableEntry, _ uint16) {
+func (w *WriteBroadcastDistributionTable) produceBroadcastDistributionTable() (entries []readWriteModel.BVLCBroadcastDistributionTableEntry) {
 	for _, address := range w.bvlciBDT {
 		addr := address.AddrAddress[:4]
 		port := uint16(47808)
diff --git a/plc4go/internal/bacnetip/bacgopes/netservice/netservice_NetworkServiceAccessPoint.go b/plc4go/internal/bacnetip/bacgopes/netservice/netservice_NetworkServiceAccessPoint.go
index b5f6c176392..294505e9325 100644
--- a/plc4go/internal/bacnetip/bacgopes/netservice/netservice_NetworkServiceAccessPoint.go
+++ b/plc4go/internal/bacnetip/bacgopes/netservice/netservice_NetworkServiceAccessPoint.go
@@ -785,7 +785,7 @@ func (n *NetworkServiceAccessPoint) ProcessNPDU(adapter *NetworkAdapter, npdu NP
 		}
 
 		// try to find a path to the network
-		xnpdu := model.NewNLMWhoIsRouterToNetwork(dnet, 0)
+		xnpdu := model.NewNLMWhoIsRouterToNetwork(dnet)
 		pduDestination := NewLocalBroadcast(nil)
 
 		// send it to all the connected adapters
diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_DisconnectConnectionToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_DisconnectConnectionToNetwork.go
index fb1ce152888..677e905abdd 100644
--- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_DisconnectConnectionToNetwork.go
+++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_DisconnectConnectionToNetwork.go
@@ -41,7 +41,7 @@ func NewDisconnectConnectionToNetwork(args Args, kwArgs KWArgs, options ...Optio
 	}
 	ApplyAppliers(options, i)
 	options = AddLeafTypeIfAbundant(options, i)
-	options = AddNLMIfAbundant(options, model.NewNLMDisconnectConnectionToNetwork(i.dctnDNET, 0))
+	options = AddNLMIfAbundant(options, model.NewNLMDisconnectConnectionToNetwork(i.dctnDNET))
 	npdu, err := NewNPDU(args, kwArgs, options...)
 	if err != nil {
 		return nil, errors.Wrap(err, "error creating NPDU")
diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_EstablishConnectionToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_EstablishConnectionToNetwork.go
index 1095db164e1..9d14391c404 100644
--- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_EstablishConnectionToNetwork.go
+++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_EstablishConnectionToNetwork.go
@@ -42,7 +42,7 @@ func NewEstablishConnectionToNetwork(args Args, kwArgs KWArgs, options ...Option
 	}
 	ApplyAppliers(options, e)
 	options = AddLeafTypeIfAbundant(options, e)
-	options = AddNLMIfAbundant(options, model.NewNLMEstablishConnectionToNetwork(e.ectnDNET, e.ectnTerminationTime, 0))
+	options = AddNLMIfAbundant(options, model.NewNLMEstablishConnectionToNetwork(e.ectnDNET, e.ectnTerminationTime))
 	npdu, err := NewNPDU(args, kwArgs, options...)
 	if err != nil {
 		return nil, errors.Wrap(err, "error creating NPDU")
diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_IAmRouterToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_IAmRouterToNetwork.go
index d30a1646317..8177de3d28c 100644
--- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_IAmRouterToNetwork.go
+++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_IAmRouterToNetwork.go
@@ -41,7 +41,7 @@ func NewIAmRouterToNetwork(args Args, kwArgs KWArgs, options ...Option) (*IAmRou
 	}
 	ApplyAppliers(options, i)
 	options = AddLeafTypeIfAbundant(options, i)
-	options = AddNLMIfAbundant(options, model.NewNLMIAmRouterToNetwork(i.iartnNetworkList, 0))
+	options = AddNLMIfAbundant(options, model.NewNLMIAmRouterToNetwork(i.iartnNetworkList))
 	npdu, err := NewNPDU(args, kwArgs, options...)
 	if err != nil {
 		return nil, errors.Wrap(err, "error creating NPDU")
diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_ICouldBeRouterToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_ICouldBeRouterToNetwork.go
index 5da0d57636c..98556ef81d2 100644
--- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_ICouldBeRouterToNetwork.go
+++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_ICouldBeRouterToNetwork.go
@@ -42,7 +42,7 @@ func NewICouldBeRouterToNetwork(args Args, kwArgs KWArgs, options ...Option) (*I
 	}
 	ApplyAppliers(options, i)
 	options = AddLeafTypeIfAbundant(options, i)
-	options = AddNLMIfAbundant(options, model.NewNLMICouldBeRouterToNetwork(i.icbrtnNetwork, i.icbrtnPerformanceIndex, 0))
+	options = AddNLMIfAbundant(options, model.NewNLMICouldBeRouterToNetwork(i.icbrtnNetwork, i.icbrtnPerformanceIndex))
 	npdu, err := NewNPDU(args, kwArgs, options...)
 	if err != nil {
 		return nil, errors.Wrap(err, "error creating NPDU")
diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTable.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTable.go
index 347bfddbd4a..d5746308d76 100644
--- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTable.go
+++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTable.go
@@ -70,7 +70,7 @@ func (i *InitializeRoutingTable) GetIrtTable() []*RoutingTableEntry {
 	return i.irtTable
 }
 
-func (i *InitializeRoutingTable) produceNLMInitializeRoutingTablePortMapping() (numberOfPorts uint8, mappings []model.NLMInitializeRoutingTablePortMapping, _ uint16) {
+func (i *InitializeRoutingTable) produceNLMInitializeRoutingTablePortMapping() (numberOfPorts uint8, mappings []model.NLMInitializeRoutingTablePortMapping) {
 	numberOfPorts = uint8(len(i.irtTable))
 	mappings = make([]model.NLMInitializeRoutingTablePortMapping, numberOfPorts)
 	for i, entry := range i.irtTable {
diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTableAck.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTableAck.go
index 5a831bfca70..8f6ccbc074f 100644
--- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTableAck.go
+++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTableAck.go
@@ -70,7 +70,7 @@ func (i *InitializeRoutingTableAck) GetIrtaTable() []*RoutingTableEntry {
 	return i.irtaTable
 }
 
-func (i *InitializeRoutingTableAck) produceNLMInitializeRoutingTableAckPortMapping() (numberOfPorts uint8, mappings []model.NLMInitializeRoutingTablePortMapping, _ uint16) {
+func (i *InitializeRoutingTableAck) produceNLMInitializeRoutingTableAckPortMapping() (numberOfPorts uint8, mappings []model.NLMInitializeRoutingTablePortMapping) {
 	numberOfPorts = uint8(len(i.irtaTable))
 	mappings = make([]model.NLMInitializeRoutingTablePortMapping, numberOfPorts)
 	for i, entry := range i.irtaTable {
diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NPCI.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NPCI.go
index 14109ab2cac..c2c2a87cdc8 100644
--- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NPCI.go
+++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NPCI.go
@@ -501,7 +501,7 @@ func (n *_NPCI) buildNPDU(hopCount uint8, source *Address, destination *Address,
 		destinationHopCount = &hopCount
 	}
 	control := readWriteModel.NewNPDUControl(nlm != nil, destinationSpecified, sourceSpecified, expectingReply, networkPriority)
-	return readWriteModel.NewNPDU(1, control, destinationNetworkAddress, destinationLength, destinationAddress, sourceNetworkAddress, sourceLength, sourceAddress, destinationHopCount, nlm, apdu, 0), nil
+	return readWriteModel.NewNPDU(1, control, destinationNetworkAddress, destinationLength, destinationAddress, sourceNetworkAddress, sourceLength, sourceAddress, destinationHopCount, nlm, apdu), nil
 }
 
 func (n *_NPCI) deepCopy() *_NPCI {
diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NetworkNumberIs.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NetworkNumberIs.go
index 6ed928348fc..b646065b9a0 100644
--- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NetworkNumberIs.go
+++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NetworkNumberIs.go
@@ -42,7 +42,7 @@ func NewNetworkNumberIs(args Args, kwArgs KWArgs, options ...Option) (*NetworkNu
 	}
 	ApplyAppliers(options, n)
 	options = AddLeafTypeIfAbundant(options, n)
-	options = AddNLMIfAbundant(options, model.NewNLMNetworkNumberIs(n.nniNet, n.nniFlag, 0))
+	options = AddNLMIfAbundant(options, model.NewNLMNetworkNumberIs(n.nniNet, n.nniFlag))
 	npdu, err := NewNPDU(args, kwArgs, options...)
 	if err != nil {
 		return nil, errors.Wrap(err, "error creating NPDU")
diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RejectMessageToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RejectMessageToNetwork.go
index 1dc57f92330..8835072b995 100644
--- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RejectMessageToNetwork.go
+++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RejectMessageToNetwork.go
@@ -42,7 +42,7 @@ func NewRejectMessageToNetwork(args Args, kwArgs KWArgs, options ...Option) (*Re
 	}
 	ApplyAppliers(options, r)
 	options = AddLeafTypeIfAbundant(options, r)
-	options = AddNLMIfAbundant(options, model.NewNLMRejectMessageToNetwork(r.rmtnRejectionReason, r.rmtnDNET, 0))
+	options = AddNLMIfAbundant(options, model.NewNLMRejectMessageToNetwork(r.rmtnRejectionReason, r.rmtnDNET))
 	npdu, err := NewNPDU(args, kwArgs, options...)
 	if err != nil {
 		return nil, errors.Wrap(err, "error creating NPDU")
diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterAvailableToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterAvailableToNetwork.go
index 8d938a41a14..7fc88469d2f 100644
--- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterAvailableToNetwork.go
+++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterAvailableToNetwork.go
@@ -41,7 +41,7 @@ func NewRouterAvailableToNetwork(args Args, kwArgs KWArgs, options ...Option) (*
 	}
 	ApplyAppliers(options, r)
 	options = AddLeafTypeIfAbundant(options, r)
-	options = AddNLMIfAbundant(options, model.NewNLMRouterAvailableToNetwork(r.ratnNetworkList, 0))
+	options = AddNLMIfAbundant(options, model.NewNLMRouterAvailableToNetwork(r.ratnNetworkList))
 	npdu, err := NewNPDU(args, kwArgs, options...)
 	if err != nil {
 		return nil, errors.Wrap(err, "error creating NPDU")
diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterBusyToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterBusyToNetwork.go
index 6253f3a74ac..2c240d8a565 100644
--- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterBusyToNetwork.go
+++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterBusyToNetwork.go
@@ -41,7 +41,7 @@ func NewRouterBusyToNetwork(args Args, kwArgs KWArgs, options ...Option) (*Route
 	}
 	ApplyAppliers(options, r)
 	options = AddLeafTypeIfAbundant(options, r)
-	options = AddNLMIfAbundant(options, model.NewNLMRouterBusyToNetwork(r.rbtnNetworkList, 0))
+	options = AddNLMIfAbundant(options, model.NewNLMRouterBusyToNetwork(r.rbtnNetworkList))
 	npdu, err := NewNPDU(args, kwArgs, options...)
 	if err != nil {
 		return nil, errors.Wrap(err, "error creating NPDU")
diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhatIsNetworkNumber.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhatIsNetworkNumber.go
index e1bee2e2e93..37d7b893ccb 100644
--- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhatIsNetworkNumber.go
+++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhatIsNetworkNumber.go
@@ -39,7 +39,7 @@ func NewWhatIsNetworkNumber(args Args, kwArgs KWArgs, options ...Option) (*WhatI
 	}
 	ApplyAppliers(options, i)
 	options = AddLeafTypeIfAbundant(options, i)
-	options = AddNLMIfAbundant(options, model.NewNLMWhatIsNetworkNumber(0))
+	options = AddNLMIfAbundant(options, model.NewNLMWhatIsNetworkNumber())
 	npdu, err := NewNPDU(args, kwArgs, options...)
 	if err != nil {
 		return nil, errors.Wrap(err, "error creating NPDU")
diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhoIsRouterToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhoIsRouterToNetwork.go
index 8f62e401a46..c3ea675a1e2 100644
--- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhoIsRouterToNetwork.go
+++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhoIsRouterToNetwork.go
@@ -41,7 +41,7 @@ func NewWhoIsRouterToNetwork(args Args, kwArgs KWArgs, options ...Option) (*WhoI
 	}
 	ApplyAppliers(options, w)
 	options = AddLeafTypeIfAbundant(options, w)
-	options = AddNLMIfAbundant(options, model.NewNLMWhoIsRouterToNetwork(w.wirtnNetwork, 0))
+	options = AddNLMIfAbundant(options, model.NewNLMWhoIsRouterToNetwork(w.wirtnNetwork))
 	npdu, err := NewNPDU(args, kwArgs, options...)
 	if err != nil {
 		return nil, errors.Wrap(err, "error creating NPDU")
diff --git a/plc4go/internal/cbus/CBusMessageMapper.go b/plc4go/internal/cbus/CBusMessageMapper.go
index cb58eeab8fb..accb148913e 100644
--- a/plc4go/internal/cbus/CBusMessageMapper.go
+++ b/plc4go/internal/cbus/CBusMessageMapper.go
@@ -56,7 +56,7 @@ func TagToCBusMessage(
 			statusRequest = readWriteModel.NewStatusRequestLevel(0x73, tagType.application, *tagType.startingGroupAddressLabel)
 		}
 		var cbusCommand readWriteModel.CBusCommand
-		cbusCommand, err = producePointToMultiPointCommandStatus(tagType.bridgeAddresses, tagType.application, statusRequest, cbusOptions)
+		cbusCommand, err = producePointToMultiPointCommandStatus(tagType.bridgeAddresses, tagType.application, statusRequest)
 		if err != nil {
 			return nil, false, false, false, errors.Wrap(err, "error producing point to multipoint command")
 		}
@@ -66,24 +66,24 @@ func TagToCBusMessage(
 			nil,
 			readWriteModel.RequestType_EMPTY,
 			readWriteModel.NewRequestTermination(),
+			cbusOptions,
 			cbusCommand,
 			nil,
 			readWriteModel.NewAlpha(alphaGenerator.getAndIncrement()),
-			cbusOptions,
 		)
 
-		cBusMessage, supportsRead, supportsSubscribe = readWriteModel.NewCBusMessageToServer(request, requestContext, cbusOptions), true, true
+		cBusMessage, supportsRead, supportsSubscribe = readWriteModel.NewCBusMessageToServer(request), true, true
 		return
 	case *calRecallTag:
 		calData := readWriteModel.NewCALDataRecall(
+			requestContext,
 			readWriteModel.CALCommandTypeContainer_CALCommandRecall,
 			nil,
 			tagType.parameter,
 			tagType.count,
-			requestContext,
 		)
 		var command readWriteModel.CBusCommand
-		command, err = producePointToPointCommand(tagType.unitAddress, tagType.bridgeAddresses, calData, cbusOptions)
+		command, err = producePointToPointCommand(tagType.unitAddress, tagType.bridgeAddresses, calData)
 		if err != nil {
 			return nil, false, false, false, errors.Wrap(err, "error producing cal command")
 		}
@@ -93,23 +93,23 @@ func TagToCBusMessage(
 			nil,
 			readWriteModel.RequestType_EMPTY,
 			readWriteModel.NewRequestTermination(),
+			cbusOptions,
 			command,
 			nil,
 			readWriteModel.NewAlpha(alphaGenerator.getAndIncrement()),
-			cbusOptions,
 		)
 
-		cBusMessage, supportsRead = readWriteModel.NewCBusMessageToServer(request, requestContext, cbusOptions), true
+		cBusMessage, supportsRead = readWriteModel.NewCBusMessageToServer(request), true
 		return
 	case *calIdentifyTag:
 		calData := readWriteModel.NewCALDataIdentify(
+			requestContext,
 			readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 			nil,
 			tagType.attribute,
-			requestContext,
 		)
 		var command readWriteModel.CBusCommand
-		command, err = producePointToPointCommand(tagType.unitAddress, tagType.bridgeAddresses, calData, cbusOptions)
+		command, err = producePointToPointCommand(tagType.unitAddress, tagType.bridgeAddresses, calData)
 		if err != nil {
 			return nil, false, false, false, errors.Wrap(err, "error producing cal command")
 		}
@@ -119,24 +119,24 @@ func TagToCBusMessage(
 			nil,
 			readWriteModel.RequestType_EMPTY,
 			readWriteModel.NewRequestTermination(),
+			cbusOptions,
 			command,
 			nil,
 			readWriteModel.NewAlpha(alphaGenerator.getAndIncrement()),
-			cbusOptions,
 		)
 
-		cBusMessage, supportsRead = readWriteModel.NewCBusMessageToServer(request, requestContext, cbusOptions), true
+		cBusMessage, supportsRead = readWriteModel.NewCBusMessageToServer(request), true
 		return
 	case *calGetStatusTag:
 		calData := readWriteModel.NewCALDataGetStatus(
+			requestContext,
 			readWriteModel.CALCommandTypeContainer_CALCommandGetStatus,
 			nil,
 			tagType.parameter,
 			tagType.count,
-			requestContext,
 		)
 		var command readWriteModel.CBusCommand
-		command, err = producePointToPointCommand(tagType.unitAddress, tagType.bridgeAddresses, calData, cbusOptions)
+		command, err = producePointToPointCommand(tagType.unitAddress, tagType.bridgeAddresses, calData)
 		if err != nil {
 			return nil, false, false, false, errors.Wrap(err, "error producing cal command")
 		}
@@ -146,13 +146,13 @@ func TagToCBusMessage(
 			nil,
 			readWriteModel.RequestType_EMPTY,
 			readWriteModel.NewRequestTermination(),
+			cbusOptions,
 			command,
 			nil,
 			readWriteModel.NewAlpha(alphaGenerator.getAndIncrement()),
-			cbusOptions,
 		)
 
-		cBusMessage, supportsRead = readWriteModel.NewCBusMessageToServer(request, requestContext, cbusOptions), true
+		cBusMessage, supportsRead = readWriteModel.NewCBusMessageToServer(request), true
 		return
 	case *salTag:
 		var salCommand = tagType.salCommand
@@ -290,19 +290,19 @@ func TagToCBusMessage(
 			nil,
 			readWriteModel.RequestType_EMPTY,
 			readWriteModel.NewRequestTermination(),
+			cbusOptions,
 			cbusCommand,
 			nil,
 			readWriteModel.NewAlpha(alphaGenerator.getAndIncrement()),
-			cbusOptions,
 		)
-		cBusMessage = readWriteModel.NewCBusMessageToServer(request, requestContext, cbusOptions)
+		cBusMessage = readWriteModel.NewCBusMessageToServer(request)
 		return
 	default:
 		return nil, false, false, false, errors.Errorf("Unsupported type %T", tagType)
 	}
 }
 
-func producePointToPointCommand(unitAddress readWriteModel.UnitAddress, bridgeAddresses []readWriteModel.BridgeAddress, calData readWriteModel.CALData, cbusOptions readWriteModel.CBusOptions) (readWriteModel.CBusCommand, error) {
+func producePointToPointCommand(unitAddress readWriteModel.UnitAddress, bridgeAddresses []readWriteModel.BridgeAddress, calData readWriteModel.CALData) (readWriteModel.CBusCommand, error) {
 	if calData == nil {
 		return nil, errors.New("cal data required")
 	}
@@ -314,29 +314,29 @@ func producePointToPointCommand(unitAddress readWriteModel.UnitAddress, bridgeAd
 		}
 		networkRoute := readWriteModel.NewNetworkRoute(readWriteModel.NewNetworkProtocolControlInformation(uint8(numberOfBridgeAddresses), uint8(numberOfBridgeAddresses)), bridgeAddresses[1:])
 
-		command = readWriteModel.NewCBusPointToPointCommandIndirect(0x0000, calData, bridgeAddresses[0], networkRoute, unitAddress, cbusOptions)
+		command = readWriteModel.NewCBusPointToPointCommandIndirect(0x0000, calData, bridgeAddresses[0], networkRoute, unitAddress)
 	} else {
-		command = readWriteModel.NewCBusPointToPointCommandDirect(0x0000, calData, unitAddress, cbusOptions)
+		command = readWriteModel.NewCBusPointToPointCommandDirect(0x0000, calData, unitAddress)
 	}
 
 	header := readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint)
-	return readWriteModel.NewCBusCommandPointToPoint(header, command, cbusOptions), nil
+	return readWriteModel.NewCBusCommandPointToPoint(header, command), nil
 }
 
-func producePointToMultiPointCommandStatus(bridgeAddresses []readWriteModel.BridgeAddress, application readWriteModel.ApplicationIdContainer, statusRequest readWriteModel.StatusRequest, cbusOptions readWriteModel.CBusOptions) (readWriteModel.CBusCommand, error) {
+func producePointToMultiPointCommandStatus(bridgeAddresses []readWriteModel.BridgeAddress, application readWriteModel.ApplicationIdContainer, statusRequest readWriteModel.StatusRequest) (readWriteModel.CBusCommand, error) {
 	numberOfBridgeAddresses := len(bridgeAddresses)
 	if numberOfBridgeAddresses > 0 {
 		if numberOfBridgeAddresses > 6 {
 			return nil, errors.Errorf("Can't have a path longer than 6. Actuall path length = %d", numberOfBridgeAddresses)
 		}
 		networkRoute := readWriteModel.NewNetworkRoute(readWriteModel.NewNetworkProtocolControlInformation(uint8(numberOfBridgeAddresses), uint8(numberOfBridgeAddresses)), bridgeAddresses[1:])
-		command := readWriteModel.NewCBusPointToPointToMultiPointCommandStatus(bridgeAddresses[0], networkRoute, byte(application), statusRequest, cbusOptions)
+		command := readWriteModel.NewCBusPointToPointToMultiPointCommandStatus(bridgeAddresses[0], networkRoute, byte(application), statusRequest)
 		header := readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPointToMultiPoint)
-		return readWriteModel.NewCBusCommandPointToPointToMultiPoint(header, command, cbusOptions), nil
+		return readWriteModel.NewCBusCommandPointToPointToMultiPoint(header, command), nil
 	}
-	command := readWriteModel.NewCBusPointToMultiPointCommandStatus(byte(application), statusRequest, cbusOptions)
+	command := readWriteModel.NewCBusPointToMultiPointCommandStatus(byte(application), statusRequest)
 	header := readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToMultiPoint)
-	return readWriteModel.NewCBusCommandPointToMultiPoint(header, command, cbusOptions), nil
+	return readWriteModel.NewCBusCommandPointToMultiPoint(header, command), nil
 }
 
 func producePointToMultiPointCommandNormal(bridgeAddresses []readWriteModel.BridgeAddress, application readWriteModel.ApplicationIdContainer, salData readWriteModel.SALData, cbusOptions readWriteModel.CBusOptions) (readWriteModel.CBusCommand, error) {
@@ -346,14 +346,14 @@ func producePointToMultiPointCommandNormal(bridgeAddresses []readWriteModel.Brid
 			return nil, errors.Errorf("Can't have a path longer than 6. Actuall path length = %d", numberOfBridgeAddresses)
 		}
 		networkRoute := readWriteModel.NewNetworkRoute(readWriteModel.NewNetworkProtocolControlInformation(uint8(numberOfBridgeAddresses), uint8(numberOfBridgeAddresses)), bridgeAddresses[1:])
-		command := readWriteModel.NewCBusPointToPointToMultiPointCommandNormal(bridgeAddresses[0], networkRoute, byte(application), application, salData, cbusOptions)
+		command := readWriteModel.NewCBusPointToPointToMultiPointCommandNormal(bridgeAddresses[0], networkRoute, byte(application), application, salData)
 		header := readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPointToMultiPoint)
-		return readWriteModel.NewCBusCommandPointToPointToMultiPoint(header, command, cbusOptions), nil
+		return readWriteModel.NewCBusCommandPointToPointToMultiPoint(header, command), nil
 	}
 
-	command := readWriteModel.NewCBusPointToMultiPointCommandNormal(0x00, application, salData, cbusOptions)
+	command := readWriteModel.NewCBusPointToMultiPointCommandNormal(0x00, application, salData)
 	header := readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint)
-	return readWriteModel.NewCBusCommandPointToMultiPoint(header, command, cbusOptions), nil
+	return readWriteModel.NewCBusCommandPointToMultiPoint(header, command), nil
 }
 
 func MapEncodedReply(localLog zerolog.Logger, transaction transactions.RequestTransaction, encodedReply readWriteModel.EncodedReply, tagName string, addResponseCode func(name string, responseCode apiModel.PlcResponseCode), addPlcValue func(name string, plcValue apiValues.PlcValue)) error {
diff --git a/plc4go/internal/cbus/CBusMessageMapper_test.go b/plc4go/internal/cbus/CBusMessageMapper_test.go
index a07835bf214..31833fe0e82 100644
--- a/plc4go/internal/cbus/CBusMessageMapper_test.go
+++ b/plc4go/internal/cbus/CBusMessageMapper_test.go
@@ -75,6 +75,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToMultiPoint(
 						readWriteModel.NewCBusHeader(
 							readWriteModel.PriorityClass_Class4,
@@ -88,16 +89,11 @@ func TestTagToCBusMessage(t *testing.T) {
 								122,
 								readWriteModel.ApplicationIdContainer_LIGHTING_3A,
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      true,
 			wantSupportsSubscribe: true,
@@ -122,6 +118,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToMultiPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToMultiPoint),
 						readWriteModel.NewCBusPointToMultiPointCommandStatus(
@@ -131,16 +128,11 @@ func TestTagToCBusMessage(t *testing.T) {
 								readWriteModel.ApplicationIdContainer_LIGHTING_3A,
 								13,
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      true,
 			wantSupportsSubscribe: true,
@@ -162,6 +154,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToPointToMultiPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPointToMultiPoint),
 						readWriteModel.NewCBusPointToPointToMultiPointCommandStatus(
@@ -172,16 +165,11 @@ func TestTagToCBusMessage(t *testing.T) {
 								122,
 								readWriteModel.ApplicationIdContainer_LIGHTING_3A,
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      true,
 			wantSupportsSubscribe: true,
@@ -203,6 +191,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToPointToMultiPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPointToMultiPoint),
 						readWriteModel.NewCBusPointToPointToMultiPointCommandStatus(
@@ -213,16 +202,11 @@ func TestTagToCBusMessage(t *testing.T) {
 								122,
 								readWriteModel.ApplicationIdContainer_LIGHTING_3A,
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      true,
 			wantSupportsSubscribe: true,
@@ -244,6 +228,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToPointToMultiPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPointToMultiPoint),
 						readWriteModel.NewCBusPointToPointToMultiPointCommandStatus(
@@ -254,16 +239,11 @@ func TestTagToCBusMessage(t *testing.T) {
 								122,
 								readWriteModel.ApplicationIdContainer_LIGHTING_3A,
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      true,
 			wantSupportsSubscribe: true,
@@ -297,28 +277,24 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 						readWriteModel.NewCBusPointToPointCommandDirect(
 							0,
 							readWriteModel.NewCALDataRecall(
+								requestContext,
 								readWriteModel.CALCommandTypeContainer_CALCommandRecall,
 								nil,
 								readWriteModel.Parameter_BAUD_RATE_SELECTOR,
 								1,
-								requestContext,
 							),
 							readWriteModel.NewUnitAddress(1),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      true,
 			wantSupportsSubscribe: false,
@@ -340,27 +316,23 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 						readWriteModel.NewCBusPointToPointCommandDirect(
 							0,
 							readWriteModel.NewCALDataIdentify(
+								requestContext,
 								readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 								nil,
 								readWriteModel.Attribute_Manufacturer,
-								requestContext,
 							),
 							readWriteModel.NewUnitAddress(1),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      true,
 			wantSupportsSubscribe: false,
@@ -382,28 +354,24 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 						readWriteModel.NewCBusPointToPointCommandDirect(
 							0,
 							readWriteModel.NewCALDataGetStatus(
+								requestContext,
 								readWriteModel.CALCommandTypeContainer_CALCommandGetStatus,
 								nil,
 								readWriteModel.Parameter_BAUD_RATE_SELECTOR,
 								1,
-								requestContext,
 							),
 							readWriteModel.NewUnitAddress(1),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      true,
 			wantSupportsSubscribe: false,
@@ -470,6 +438,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToMultiPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 						readWriteModel.NewCBusPointToMultiPointCommandNormal(
@@ -483,16 +452,11 @@ func TestTagToCBusMessage(t *testing.T) {
 									3,
 								),
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      false,
 			wantSupportsWrite:     true,
@@ -643,6 +607,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToMultiPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 						readWriteModel.NewCBusPointToMultiPointCommandNormal(
@@ -655,16 +620,11 @@ func TestTagToCBusMessage(t *testing.T) {
 									2,
 								),
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      false,
 			wantSupportsWrite:     true,
@@ -688,6 +648,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToMultiPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 						readWriteModel.NewCBusPointToMultiPointCommandNormal(
@@ -700,16 +661,11 @@ func TestTagToCBusMessage(t *testing.T) {
 									2,
 								),
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      false,
 			wantSupportsWrite:     true,
@@ -737,6 +693,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToMultiPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 						readWriteModel.NewCBusPointToMultiPointCommandNormal(
@@ -750,16 +707,11 @@ func TestTagToCBusMessage(t *testing.T) {
 									3,
 								),
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      false,
 			wantSupportsWrite:     true,
@@ -783,6 +735,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToMultiPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 						readWriteModel.NewCBusPointToMultiPointCommandNormal(
@@ -795,16 +748,11 @@ func TestTagToCBusMessage(t *testing.T) {
 									2,
 								),
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      false,
 			wantSupportsWrite:     true,
@@ -829,6 +777,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToMultiPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 						readWriteModel.NewCBusPointToMultiPointCommandNormal(
@@ -841,16 +790,11 @@ func TestTagToCBusMessage(t *testing.T) {
 									2,
 								),
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      false,
 			wantSupportsWrite:     true,
@@ -874,6 +818,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToMultiPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 						readWriteModel.NewCBusPointToMultiPointCommandNormal(
@@ -886,16 +831,11 @@ func TestTagToCBusMessage(t *testing.T) {
 									2,
 								),
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      false,
 			wantSupportsWrite:     true,
@@ -919,6 +859,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToMultiPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 						readWriteModel.NewCBusPointToMultiPointCommandNormal(
@@ -931,16 +872,11 @@ func TestTagToCBusMessage(t *testing.T) {
 									2,
 								),
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      false,
 			wantSupportsWrite:     true,
@@ -964,6 +900,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToMultiPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 						readWriteModel.NewCBusPointToMultiPointCommandNormal(
@@ -976,16 +913,11 @@ func TestTagToCBusMessage(t *testing.T) {
 									2,
 								),
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      false,
 			wantSupportsWrite:     true,
@@ -1009,6 +941,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToMultiPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 						readWriteModel.NewCBusPointToMultiPointCommandNormal(
@@ -1021,16 +954,11 @@ func TestTagToCBusMessage(t *testing.T) {
 									2,
 								),
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      false,
 			wantSupportsWrite:     true,
@@ -1054,6 +982,7 @@ func TestTagToCBusMessage(t *testing.T) {
 					nil,
 					readWriteModel.RequestType_EMPTY,
 					readWriteModel.NewRequestTermination(),
+					cbusOptions,
 					readWriteModel.NewCBusCommandPointToMultiPoint(
 						readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 						readWriteModel.NewCBusPointToMultiPointCommandNormal(
@@ -1066,16 +995,11 @@ func TestTagToCBusMessage(t *testing.T) {
 									2,
 								),
 							),
-							cbusOptions,
 						),
-						cbusOptions,
 					),
 					nil,
 					readWriteModel.NewAlpha(0),
-					cbusOptions,
 				),
-				requestContext,
-				cbusOptions,
 			),
 			wantSupportsRead:      false,
 			wantSupportsWrite:     true,
@@ -1124,7 +1048,6 @@ func Test_producePointToPointCommand(t *testing.T) {
 		unitAddress     readWriteModel.UnitAddress
 		bridgeAddresses []readWriteModel.BridgeAddress
 		calData         readWriteModel.CALData
-		cbusOptions     readWriteModel.CBusOptions
 	}
 	tests := []struct {
 		name    string
@@ -1136,17 +1059,15 @@ func Test_producePointToPointCommand(t *testing.T) {
 			name: "no bridge",
 			args: args{
 				unitAddress: readWriteModel.NewUnitAddress(0),
-				calData:     readWriteModel.NewCALDataReset(readWriteModel.CALCommandTypeContainer_CALCommandReset, nil, nil),
+				calData:     readWriteModel.NewCALDataReset(readWriteModel.NewRequestContext(false), readWriteModel.CALCommandTypeContainer_CALCommandReset, nil),
 			},
 			want: readWriteModel.NewCBusCommandPointToPoint(
 				readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 				readWriteModel.NewCBusPointToPointCommandDirect(
 					0,
-					readWriteModel.NewCALDataReset(readWriteModel.CALCommandTypeContainer_CALCommandReset, nil, nil),
+					readWriteModel.NewCALDataReset(readWriteModel.NewRequestContext(false), readWriteModel.CALCommandTypeContainer_CALCommandReset, nil),
 					readWriteModel.NewUnitAddress(0),
-					nil,
 				),
-				nil,
 			),
 			wantErr: assert.NoError,
 		},
@@ -1157,22 +1078,20 @@ func Test_producePointToPointCommand(t *testing.T) {
 				bridgeAddresses: []readWriteModel.BridgeAddress{
 					readWriteModel.NewBridgeAddress(1),
 				},
-				calData: readWriteModel.NewCALDataReset(readWriteModel.CALCommandTypeContainer_CALCommandReset, nil, nil),
+				calData: readWriteModel.NewCALDataReset(readWriteModel.NewRequestContext(false), readWriteModel.CALCommandTypeContainer_CALCommandReset, nil),
 			},
 			want: readWriteModel.NewCBusCommandPointToPoint(
 				readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 				readWriteModel.NewCBusPointToPointCommandIndirect(
 					0,
-					readWriteModel.NewCALDataReset(readWriteModel.CALCommandTypeContainer_CALCommandReset, nil, nil),
+					readWriteModel.NewCALDataReset(readWriteModel.NewRequestContext(false), readWriteModel.CALCommandTypeContainer_CALCommandReset, nil),
 					readWriteModel.NewBridgeAddress(1),
 					readWriteModel.NewNetworkRoute(
 						readWriteModel.NewNetworkProtocolControlInformation(1, 1),
 						[]readWriteModel.BridgeAddress{},
 					),
 					readWriteModel.NewUnitAddress(0),
-					nil,
 				),
-				nil,
 			),
 			wantErr: assert.NoError,
 		},
@@ -1188,13 +1107,13 @@ func Test_producePointToPointCommand(t *testing.T) {
 					readWriteModel.NewBridgeAddress(5),
 					readWriteModel.NewBridgeAddress(6),
 				},
-				calData: readWriteModel.NewCALDataReset(readWriteModel.CALCommandTypeContainer_CALCommandReset, nil, nil),
+				calData: readWriteModel.NewCALDataReset(readWriteModel.NewRequestContext(false), readWriteModel.CALCommandTypeContainer_CALCommandReset, nil),
 			},
 			want: readWriteModel.NewCBusCommandPointToPoint(
 				readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToPoint),
 				readWriteModel.NewCBusPointToPointCommandIndirect(
 					0,
-					readWriteModel.NewCALDataReset(readWriteModel.CALCommandTypeContainer_CALCommandReset, nil, nil),
+					readWriteModel.NewCALDataReset(readWriteModel.NewRequestContext(false), readWriteModel.CALCommandTypeContainer_CALCommandReset, nil),
 					readWriteModel.NewBridgeAddress(1),
 					readWriteModel.NewNetworkRoute(
 						readWriteModel.NewNetworkProtocolControlInformation(6, 6),
@@ -1207,9 +1126,7 @@ func Test_producePointToPointCommand(t *testing.T) {
 						},
 					),
 					readWriteModel.NewUnitAddress(0),
-					nil,
 				),
-				nil,
 			),
 			wantErr: assert.NoError,
 		},
@@ -1232,11 +1149,11 @@ func Test_producePointToPointCommand(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := producePointToPointCommand(tt.args.unitAddress, tt.args.bridgeAddresses, tt.args.calData, tt.args.cbusOptions)
-			if !tt.wantErr(t, err, fmt.Sprintf("producePointToPointCommand(%v, %v, %v, %v)", tt.args.unitAddress, tt.args.bridgeAddresses, tt.args.calData, tt.args.cbusOptions)) {
+			got, err := producePointToPointCommand(tt.args.unitAddress, tt.args.bridgeAddresses, tt.args.calData)
+			if !tt.wantErr(t, err, fmt.Sprintf("producePointToPointCommand(%v, %v, %v)", tt.args.unitAddress, tt.args.bridgeAddresses, tt.args.calData)) {
 				return
 			}
-			assert.Equalf(t, tt.want, got, "producePointToPointCommand(%v, %v, %v, %v)", tt.args.unitAddress, tt.args.bridgeAddresses, tt.args.calData, tt.args.cbusOptions)
+			assert.Equalf(t, tt.want, got, "producePointToPointCommand(%v, %v, %v)", tt.args.unitAddress, tt.args.bridgeAddresses, tt.args.calData)
 		})
 	}
 }
@@ -1246,7 +1163,6 @@ func Test_producePointToMultiPointCommandStatus(t *testing.T) {
 		bridgeAddresses []readWriteModel.BridgeAddress
 		application     readWriteModel.ApplicationIdContainer
 		statusRequest   readWriteModel.StatusRequest
-		cbusOptions     readWriteModel.CBusOptions
 	}
 	tests := []struct {
 		name    string
@@ -1267,9 +1183,7 @@ func Test_producePointToMultiPointCommandStatus(t *testing.T) {
 						9,
 						readWriteModel.ApplicationIdContainer_RESERVED_00,
 					),
-					nil,
 				),
-				nil,
 			),
 			wantErr: assert.NoError,
 		},
@@ -1291,9 +1205,7 @@ func Test_producePointToMultiPointCommandStatus(t *testing.T) {
 					),
 					0,
 					readWriteModel.NewStatusRequestBinaryState(9, readWriteModel.ApplicationIdContainer_RESERVED_00),
-					nil,
 				),
-				nil,
 			),
 			wantErr: assert.NoError,
 		},
@@ -1326,9 +1238,7 @@ func Test_producePointToMultiPointCommandStatus(t *testing.T) {
 					),
 					0,
 					readWriteModel.NewStatusRequestBinaryState(9, readWriteModel.ApplicationIdContainer_RESERVED_00),
-					nil,
 				),
-				nil,
 			),
 			wantErr: assert.NoError,
 		},
@@ -1351,11 +1261,11 @@ func Test_producePointToMultiPointCommandStatus(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := producePointToMultiPointCommandStatus(tt.args.bridgeAddresses, tt.args.application, tt.args.statusRequest, tt.args.cbusOptions)
-			if !tt.wantErr(t, err, fmt.Sprintf("producePointToMultiPointCommandStatus(%v, %v, %v, %v)", tt.args.bridgeAddresses, tt.args.application, tt.args.statusRequest, tt.args.cbusOptions)) {
+			got, err := producePointToMultiPointCommandStatus(tt.args.bridgeAddresses, tt.args.application, tt.args.statusRequest)
+			if !tt.wantErr(t, err, fmt.Sprintf("producePointToMultiPointCommandStatus(%v, %v, %v)", tt.args.bridgeAddresses, tt.args.application, tt.args.statusRequest)) {
 				return
 			}
-			assert.Equalf(t, tt.want, got, "producePointToMultiPointCommandStatus(%v, %v, %v, %v)", tt.args.bridgeAddresses, tt.args.application, tt.args.statusRequest, tt.args.cbusOptions)
+			assert.Equalf(t, tt.want, got, "producePointToMultiPointCommandStatus(%v, %v, %v)", tt.args.bridgeAddresses, tt.args.application, tt.args.statusRequest)
 		})
 	}
 }
@@ -1384,9 +1294,7 @@ func Test_producePointToMultiPointCommandNormal(t *testing.T) {
 					0,
 					0,
 					readWriteModel.NewSALDataFreeUsage(nil),
-					nil,
 				),
-				nil,
 			),
 			wantErr: assert.NoError,
 		},
@@ -1409,9 +1317,7 @@ func Test_producePointToMultiPointCommandNormal(t *testing.T) {
 					0,
 					0,
 					readWriteModel.NewSALDataFreeUsage(nil),
-					nil,
 				),
-				nil,
 			),
 			wantErr: assert.NoError,
 		},
@@ -1445,9 +1351,7 @@ func Test_producePointToMultiPointCommandNormal(t *testing.T) {
 					0,
 					0,
 					readWriteModel.NewSALDataFreeUsage(nil),
-					nil,
 				),
-				nil,
 			),
 			wantErr: assert.NoError,
 		},
@@ -1535,15 +1439,15 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewStatusByte(readWriteModel.GAVState_ON, readWriteModel.GAVState_ERROR, readWriteModel.GAVState_DOES_NOT_EXIST, readWriteModel.GAVState_OFF),
 					}
 					calDataStatus := readWriteModel.NewCALDataStatus(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandStatus_0Bytes,
 						nil,
 						readWriteModel.ApplicationIdContainer_LIGHTING_3A,
 						0,
 						statusBytes,
-						nil,
 					)
-					calReplyShort := readWriteModel.NewCALReplyShort(0, calDataStatus, nil, nil)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyShort, nil, nil)
+					calReplyShort := readWriteModel.NewCALReplyShort(0, calDataStatus)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyShort)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -1614,6 +1518,7 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewStatusByte(readWriteModel.GAVState_ON, readWriteModel.GAVState_ERROR, readWriteModel.GAVState_DOES_NOT_EXIST, readWriteModel.GAVState_OFF),
 					}
 					calDataStatus := readWriteModel.NewCALDataStatusExtended(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandStatus_0Bytes,
 						nil,
 						readWriteModel.StatusCoding_BINARY_BY_THIS_SERIAL_INTERFACE,
@@ -1621,7 +1526,6 @@ func TestMapEncodedReply(t *testing.T) {
 						0,
 						statusBytes,
 						nil,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -1632,14 +1536,11 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
 					return readWriteModel.NewEncodedReplyCALReply(
+						readWriteModel.NewRequestContext(false),
 						0,
 						calReplyLong,
-						nil,
-						nil,
 					)
 				}(),
 				tagName: "someTag",
@@ -1713,6 +1614,7 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewLevelInformationCorrupted(13, 14, 15, 16, 17),
 					}
 					calDataStatus := readWriteModel.NewCALDataStatusExtended(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandStatus_0Bytes,
 						nil,
 						readWriteModel.StatusCoding_LEVEL_BY_THIS_SERIAL_INTERFACE,
@@ -1720,7 +1622,6 @@ func TestMapEncodedReply(t *testing.T) {
 						0,
 						nil,
 						levelInformation,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -1731,10 +1632,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -1788,13 +1687,13 @@ func TestMapEncodedReply(t *testing.T) {
 			name: "CALDataIdentifyReply (sense levels)",
 			args: args{
 				encodedReply: func() readWriteModel.EncodedReplyCALReply {
-					command := readWriteModel.NewIdentifyReplyCommandCurrentSenseLevels([]byte{1, 2, 3, 4}, 4)
+					command := readWriteModel.NewIdentifyReplyCommandCurrentSenseLevels([]byte{1, 2, 3, 4})
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_CurrentSenseLevels,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -1805,10 +1704,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -1856,13 +1753,13 @@ func TestMapEncodedReply(t *testing.T) {
 			name: "CALDataIdentifyReply (delays)",
 			args: args{
 				encodedReply: func() readWriteModel.EncodedReplyCALReply {
-					command := readWriteModel.NewIdentifyReplyCommandDelays([]byte{1, 2, 3, 4}, 5, 5)
+					command := readWriteModel.NewIdentifyReplyCommandDelays([]byte{1, 2, 3, 4}, 5)
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_Delays,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -1873,10 +1770,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -1938,14 +1833,13 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.ChannelStatus_OK,
 						readWriteModel.UnitStatus_OK,
 						12,
-						9,
 					)
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -1956,10 +1850,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -2038,14 +1930,13 @@ func TestMapEncodedReply(t *testing.T) {
 						true,
 						true,
 						true,
-						8,
 					)
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -2056,10 +1947,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -2127,13 +2016,13 @@ func TestMapEncodedReply(t *testing.T) {
 			name: "CALDataIdentifyReply (summary)",
 			args: args{
 				encodedReply: func() readWriteModel.EncodedReplyCALReply {
-					command := readWriteModel.NewIdentifyReplyCommandSummary("pineapple", 1, "13", 3)
+					command := readWriteModel.NewIdentifyReplyCommandSummary("pineapple", 1, "13")
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -2144,10 +2033,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -2199,13 +2086,13 @@ func TestMapEncodedReply(t *testing.T) {
 			name: "CALDataIdentifyReply (firmware version)",
 			args: args{
 				encodedReply: func() readWriteModel.EncodedReplyCALReply {
-					command := readWriteModel.NewIdentifyReplyCommandFirmwareVersion("13", 1)
+					command := readWriteModel.NewIdentifyReplyCommandFirmwareVersion("13")
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -2216,10 +2103,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -2267,13 +2152,13 @@ func TestMapEncodedReply(t *testing.T) {
 			name: "CALDataIdentifyReplyExactly (GAV physical addresses)",
 			args: args{
 				encodedReply: func() readWriteModel.EncodedReplyCALReply {
-					command := readWriteModel.NewIdentifyReplyCommandGAVPhysicalAddresses([]byte{1, 2, 3, 4}, 4)
+					command := readWriteModel.NewIdentifyReplyCommandGAVPhysicalAddresses([]byte{1, 2, 3, 4})
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -2284,10 +2169,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -2335,13 +2218,13 @@ func TestMapEncodedReply(t *testing.T) {
 			name: "CALDataIdentifyReplyExactly (GAV values current)",
 			args: args{
 				encodedReply: func() readWriteModel.EncodedReplyCALReply {
-					command := readWriteModel.NewIdentifyReplyCommandGAVValuesCurrent([]byte{1, 2, 3, 4}, 4)
+					command := readWriteModel.NewIdentifyReplyCommandGAVValuesCurrent([]byte{1, 2, 3, 4})
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -2352,10 +2235,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -2403,13 +2284,13 @@ func TestMapEncodedReply(t *testing.T) {
 			name: "CALDataIdentifyReplyExactly (GAV values stored)",
 			args: args{
 				encodedReply: func() readWriteModel.EncodedReplyCALReply {
-					command := readWriteModel.NewIdentifyReplyCommandGAVValuesStored([]byte{1, 2, 3, 4}, 4)
+					command := readWriteModel.NewIdentifyReplyCommandGAVValuesStored([]byte{1, 2, 3, 4})
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -2420,10 +2301,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -2474,13 +2353,13 @@ func TestMapEncodedReply(t *testing.T) {
 					command := readWriteModel.NewIdentifyReplyCommandLogicalAssignment([]readWriteModel.LogicAssignment{
 						readWriteModel.NewLogicAssignment(true, true, true, true, true, true),
 						readWriteModel.NewLogicAssignment(true, true, true, true, true, true),
-					}, 4)
+					})
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -2491,10 +2370,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -2559,13 +2436,13 @@ func TestMapEncodedReply(t *testing.T) {
 			name: "CALDataIdentifyReplyExactly (manufacturer)",
 			args: args{
 				encodedReply: func() readWriteModel.EncodedReplyCALReply {
-					command := readWriteModel.NewIdentifyReplyCommandManufacturer("Apache", 13)
+					command := readWriteModel.NewIdentifyReplyCommandManufacturer("Apache")
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -2576,10 +2453,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -2627,13 +2502,13 @@ func TestMapEncodedReply(t *testing.T) {
 			name: "CALDataIdentifyReplyExactly (maximum levels)",
 			args: args{
 				encodedReply: func() readWriteModel.EncodedReplyCALReply {
-					command := readWriteModel.NewIdentifyReplyCommandMaximumLevels([]byte{1, 2, 3, 4}, 1)
+					command := readWriteModel.NewIdentifyReplyCommandMaximumLevels([]byte{1, 2, 3, 4})
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -2644,10 +2519,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -2695,13 +2568,13 @@ func TestMapEncodedReply(t *testing.T) {
 			name: "CALDataIdentifyReplyExactly (minimum levels)",
 			args: args{
 				encodedReply: func() readWriteModel.EncodedReplyCALReply {
-					command := readWriteModel.NewIdentifyReplyCommandMinimumLevels([]byte{1, 2, 3, 4}, 1)
+					command := readWriteModel.NewIdentifyReplyCommandMinimumLevels([]byte{1, 2, 3, 4})
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -2712,10 +2585,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -2763,13 +2634,13 @@ func TestMapEncodedReply(t *testing.T) {
 			name: "CALDataIdentifyReplyExactly (network terminal levels)",
 			args: args{
 				encodedReply: func() readWriteModel.EncodedReplyCALReply {
-					command := readWriteModel.NewIdentifyReplyCommandNetworkTerminalLevels([]byte{1, 2, 3, 4}, 1)
+					command := readWriteModel.NewIdentifyReplyCommandNetworkTerminalLevels([]byte{1, 2, 3, 4})
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -2780,10 +2651,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -2831,13 +2700,13 @@ func TestMapEncodedReply(t *testing.T) {
 			name: "CALDataIdentifyReplyExactly (network voltage)",
 			args: args{
 				encodedReply: func() readWriteModel.EncodedReplyCALReply {
-					command := readWriteModel.NewIdentifyReplyCommandNetworkVoltage("13.3", "3", 3)
+					command := readWriteModel.NewIdentifyReplyCommandNetworkVoltage("13.3", "3")
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -2848,10 +2717,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -2901,13 +2768,13 @@ func TestMapEncodedReply(t *testing.T) {
 				encodedReply: func() readWriteModel.EncodedReplyCALReply {
 					gavStoreEnabledByte1 := byte(2)
 					gavStoreEnabledByte2 := byte(3)
-					command := readWriteModel.NewIdentifyReplyCommandOutputUnitSummary(readWriteModel.NewIdentifyReplyCommandUnitSummary(true, true, true, true, true, true, true, true), &gavStoreEnabledByte1, &gavStoreEnabledByte2, 13, 13)
+					command := readWriteModel.NewIdentifyReplyCommandOutputUnitSummary(readWriteModel.NewIdentifyReplyCommandUnitSummary(true, true, true, true, true, true, true, true), &gavStoreEnabledByte1, &gavStoreEnabledByte2, 13)
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -2918,10 +2785,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -2983,13 +2848,13 @@ func TestMapEncodedReply(t *testing.T) {
 			name: "CALDataIdentifyReplyExactly (terminal levels)",
 			args: args{
 				encodedReply: func() readWriteModel.EncodedReplyCALReply {
-					command := readWriteModel.NewIdentifyReplyCommandTerminalLevels([]byte{1, 2, 3, 4}, 4)
+					command := readWriteModel.NewIdentifyReplyCommandTerminalLevels([]byte{1, 2, 3, 4})
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -3000,10 +2865,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
@@ -3051,13 +2914,13 @@ func TestMapEncodedReply(t *testing.T) {
 			name: "CALDataIdentifyReplyExactly (type)",
 			args: args{
 				encodedReply: func() readWriteModel.EncodedReplyCALReply {
-					command := readWriteModel.NewIdentifyReplyCommandType("chonkers", 4)
+					command := readWriteModel.NewIdentifyReplyCommandType("chonkers")
 					calDataIdentify := readWriteModel.NewCALDataIdentifyReply(
+						readWriteModel.NewRequestContext(false),
 						readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 						nil,
 						readWriteModel.Attribute_DSIStatus,
 						command,
-						nil,
 					)
 					calReplyLong := readWriteModel.NewCALReplyLong(
 						0,
@@ -3068,10 +2931,8 @@ func TestMapEncodedReply(t *testing.T) {
 						readWriteModel.NewSerialInterfaceAddress(3),
 						nil,
 						nil,
-						nil,
-						nil,
 					)
-					return readWriteModel.NewEncodedReplyCALReply(0, calReplyLong, nil, nil)
+					return readWriteModel.NewEncodedReplyCALReply(readWriteModel.NewRequestContext(false), 0, calReplyLong)
 				}(),
 				tagName: "someTag",
 				addResponseCode: func(t *testing.T) func(string, apiModel.PlcResponseCode) {
diff --git a/plc4go/internal/cbus/Connection.go b/plc4go/internal/cbus/Connection.go
index 163aa75bddd..d2ae5a53788 100644
--- a/plc4go/internal/cbus/Connection.go
+++ b/plc4go/internal/cbus/Connection.go
@@ -368,9 +368,8 @@ func (c *Connection) sendReset(ctx context.Context, ch chan plc4go.PlcConnection
 		&requestTypeReset,
 		requestTypeReset,
 		&requestTypeReset,
-		*cbusOptions,
 	)
-	cBusMessage := readWriteModel.NewCBusMessageToServer(requestReset, *requestContext, *cbusOptions)
+	cBusMessage := readWriteModel.NewCBusMessageToServer(requestReset)
 
 	receivedResetEchoChan := make(chan bool, 1)
 	receivedResetEchoErrorChan := make(chan error, 1)
@@ -473,11 +472,11 @@ func (c *Connection) sendReset(ctx context.Context, ch chan plc4go.PlcConnection
 
 func (c *Connection) setApplicationFilter(ctx context.Context, ch chan plc4go.PlcConnectionConnectResult, requestContext *readWriteModel.RequestContext, cbusOptions *readWriteModel.CBusOptions) (ok bool) {
 	c.log.Debug().Msg("Set application filter to all")
-	applicationAddress1 := readWriteModel.NewParameterValueApplicationAddress1(readWriteModel.NewApplicationAddress1(c.configuration.MonitoredApplication1), nil, 1)
+	applicationAddress1 := readWriteModel.NewParameterValueApplicationAddress1(readWriteModel.NewApplicationAddress1(c.configuration.MonitoredApplication1), nil)
 	if !c.sendCalDataWrite(ctx, ch, readWriteModel.Parameter_APPLICATION_ADDRESS_1, applicationAddress1, requestContext, cbusOptions) {
 		return false
 	}
-	applicationAddress2 := readWriteModel.NewParameterValueApplicationAddress2(readWriteModel.NewApplicationAddress2(c.configuration.MonitoredApplication2), nil, 1)
+	applicationAddress2 := readWriteModel.NewParameterValueApplicationAddress2(readWriteModel.NewApplicationAddress2(c.configuration.MonitoredApplication2), nil)
 	if !c.sendCalDataWrite(ctx, ch, readWriteModel.Parameter_APPLICATION_ADDRESS_2, applicationAddress2, requestContext, cbusOptions) {
 		return false
 	}
@@ -487,7 +486,7 @@ func (c *Connection) setApplicationFilter(ctx context.Context, ch chan plc4go.Pl
 
 func (c *Connection) setInterfaceOptions3(ctx context.Context, ch chan plc4go.PlcConnectionConnectResult, requestContext *readWriteModel.RequestContext, cbusOptions *readWriteModel.CBusOptions) (ok bool) {
 	c.log.Debug().Msg("Set interface options 3")
-	interfaceOptions3 := readWriteModel.NewParameterValueInterfaceOptions3(readWriteModel.NewInterfaceOptions3(c.configuration.Exstat, c.configuration.Pun, c.configuration.LocalSal, c.configuration.Pcn), nil, 1)
+	interfaceOptions3 := readWriteModel.NewParameterValueInterfaceOptions3(readWriteModel.NewInterfaceOptions3(c.configuration.Exstat, c.configuration.Pun, c.configuration.LocalSal, c.configuration.Pcn), nil)
 	if !c.sendCalDataWrite(ctx, ch, readWriteModel.Parameter_INTERFACE_OPTIONS_3, interfaceOptions3, requestContext, cbusOptions) {
 		return false
 	}
@@ -499,7 +498,7 @@ func (c *Connection) setInterfaceOptions3(ctx context.Context, ch chan plc4go.Pl
 
 func (c *Connection) setInterface1PowerUpSettings(ctx context.Context, ch chan plc4go.PlcConnectionConnectResult, requestContext *readWriteModel.RequestContext, cbusOptions *readWriteModel.CBusOptions) (ok bool) {
 	c.log.Debug().Msg("Set interface options 1 power up settings")
-	interfaceOptions1PowerUpSettings := readWriteModel.NewParameterValueInterfaceOptions1PowerUpSettings(readWriteModel.NewInterfaceOptions1PowerUpSettings(readWriteModel.NewInterfaceOptions1(c.configuration.Idmon, c.configuration.Monitor, c.configuration.Smart, c.configuration.Srchk, c.configuration.XonXoff, c.configuration.Connect)), 1)
+	interfaceOptions1PowerUpSettings := readWriteModel.NewParameterValueInterfaceOptions1PowerUpSettings(readWriteModel.NewInterfaceOptions1PowerUpSettings(readWriteModel.NewInterfaceOptions1(c.configuration.Idmon, c.configuration.Monitor, c.configuration.Smart, c.configuration.Srchk, c.configuration.XonXoff, c.configuration.Connect)))
 	if !c.sendCalDataWrite(ctx, ch, readWriteModel.Parameter_INTERFACE_OPTIONS_1_POWER_UP_SETTINGS, interfaceOptions1PowerUpSettings, requestContext, cbusOptions) {
 		return false
 	}
@@ -511,7 +510,7 @@ func (c *Connection) setInterface1PowerUpSettings(ctx context.Context, ch chan p
 
 func (c *Connection) setInterfaceOptions1(ctx context.Context, ch chan plc4go.PlcConnectionConnectResult, requestContext *readWriteModel.RequestContext, cbusOptions *readWriteModel.CBusOptions) bool {
 	c.log.Debug().Msg("Set interface options 1")
-	interfaceOptions1 := readWriteModel.NewParameterValueInterfaceOptions1(readWriteModel.NewInterfaceOptions1(c.configuration.Idmon, c.configuration.Monitor, c.configuration.Smart, c.configuration.Srchk, c.configuration.XonXoff, c.configuration.Connect), nil, 1)
+	interfaceOptions1 := readWriteModel.NewParameterValueInterfaceOptions1(readWriteModel.NewInterfaceOptions1(c.configuration.Idmon, c.configuration.Monitor, c.configuration.Smart, c.configuration.Srchk, c.configuration.XonXoff, c.configuration.Connect), nil)
 	if !c.sendCalDataWrite(ctx, ch, readWriteModel.Parameter_INTERFACE_OPTIONS_1, interfaceOptions1, requestContext, cbusOptions) {
 		return false
 	}
@@ -525,12 +524,12 @@ func (c *Connection) setInterfaceOptions1(ctx context.Context, ch chan plc4go.Pl
 func (c *Connection) sendCalDataWrite(ctx context.Context, ch chan plc4go.PlcConnectionConnectResult, paramNo readWriteModel.Parameter, parameterValue readWriteModel.ParameterValue, requestContext *readWriteModel.RequestContext, cbusOptions *readWriteModel.CBusOptions) bool {
 	calCommandTypeContainer := readWriteModel.CALCommandTypeContainer_CALCommandWrite_2Bytes + readWriteModel.CALCommandTypeContainer(parameterValue.GetLengthInBytes(ctx))
 	calData := readWriteModel.NewCALDataWrite(
+		*requestContext,
 		calCommandTypeContainer,
 		nil,
 		paramNo,
 		0x0,
 		parameterValue,
-		*requestContext,
 	)
 	directCommand := readWriteModel.NewRequestDirectCommandAccess(
 		0x40,
@@ -540,9 +539,8 @@ func (c *Connection) sendCalDataWrite(ctx context.Context, ch chan plc4go.PlcCon
 		readWriteModel.NewRequestTermination(),
 		calData,
 		/*we don't want an alpha otherwise the PCI will auto-switch*/ nil,
-		*cbusOptions,
 	)
-	cBusMessage := readWriteModel.NewCBusMessageToServer(directCommand, *requestContext, *cbusOptions)
+	cBusMessage := readWriteModel.NewCBusMessageToServer(directCommand)
 
 	directCommandAckChan := make(chan bool, 1)
 	directCommandAckErrorChan := make(chan error, 1)
diff --git a/plc4go/internal/cbus/Connection_test.go b/plc4go/internal/cbus/Connection_test.go
index 90833935a8c..f77bbd3c57d 100644
--- a/plc4go/internal/cbus/Connection_test.go
+++ b/plc4go/internal/cbus/Connection_test.go
@@ -823,7 +823,7 @@ func TestConnection_sendCalDataWrite(t *testing.T) {
 				ctx:            context.Background(),
 				ch:             make(chan plc4go.PlcConnectionConnectResult, 1),
 				paramNo:        readWriteModel.Parameter_APPLICATION_ADDRESS_2,
-				parameterValue: readWriteModel.NewParameterValueApplicationAddress2(readWriteModel.NewApplicationAddress2(1), nil, 0),
+				parameterValue: readWriteModel.NewParameterValueApplicationAddress2(readWriteModel.NewApplicationAddress2(1), nil),
 				requestContext: func() *readWriteModel.RequestContext {
 					var requestContext readWriteModel.RequestContext = readWriteModel.NewRequestContext(false)
 					return &requestContext
@@ -1689,7 +1689,7 @@ func TestConnection_startSubscriptionHandler(t *testing.T) {
 				t.Cleanup(dispatchWg.Wait)
 				go func() {
 					defer dispatchWg.Done()
-					codec.monitoredMMIs <- readWriteModel.NewCALReplyShort(0, nil, nil, nil)
+					codec.monitoredMMIs <- readWriteModel.NewCALReplyShort(0, nil)
 					codec.monitoredSALs <- readWriteModel.NewMonitoredSALShortFormBasicMode(
 						0,
 						0,
@@ -1698,7 +1698,6 @@ func TestConnection_startSubscriptionHandler(t *testing.T) {
 						nil,
 						readWriteModel.ApplicationIdContainer_ACCESS_CONTROL_D5,
 						nil,
-						nil,
 					)
 				}()
 				t.Cleanup(func() {
@@ -1723,7 +1722,7 @@ func TestConnection_startSubscriptionHandler(t *testing.T) {
 				t.Cleanup(dispatchWg.Wait)
 				go func() {
 					defer dispatchWg.Done()
-					codec.monitoredMMIs <- readWriteModel.NewCALReplyShort(0, nil, nil, nil)
+					codec.monitoredMMIs <- readWriteModel.NewCALReplyShort(0, nil)
 					codec.monitoredSALs <- readWriteModel.NewMonitoredSALShortFormBasicMode(
 						0,
 						0,
@@ -1732,7 +1731,6 @@ func TestConnection_startSubscriptionHandler(t *testing.T) {
 						nil,
 						readWriteModel.ApplicationIdContainer_ACCESS_CONTROL_D5,
 						nil,
-						nil,
 					)
 					close(written)
 				}()
diff --git a/plc4go/internal/cbus/MessageCodec_test.go b/plc4go/internal/cbus/MessageCodec_test.go
index 699c789484a..fdfd1c97b34 100644
--- a/plc4go/internal/cbus/MessageCodec_test.go
+++ b/plc4go/internal/cbus/MessageCodec_test.go
@@ -68,11 +68,7 @@ func TestMessageCodec_Send(t *testing.T) {
 						readWriteModel.ConfirmationType_CHECKSUM_FAILURE,
 					),
 					nil,
-					nil,
-					nil,
 				),
-				nil,
-				nil,
 			)},
 			setup: func(t *testing.T, fields *fields, args *args) {
 				_options := testutils.EnrichOptionsWithOptionsForTesting(t)
@@ -157,9 +153,8 @@ func TestMessageCodec_Receive(t *testing.T) {
 			},
 			want: readWriteModel.NewCBusMessageToClient(
 				readWriteModel.NewServerErrorReply(
-					33, cbusOptions, requestContext,
+					33,
 				),
-				requestContext, cbusOptions,
 			),
 			setup: func(t *testing.T, fields *fields) {
 				_options := testutils.EnrichOptionsWithOptionsForTesting(t)
@@ -248,9 +243,8 @@ func TestMessageCodec_Receive(t *testing.T) {
 			},
 			want: readWriteModel.NewCBusMessageToClient(
 				readWriteModel.NewServerErrorReply(
-					33, cbusOptions, requestContext,
+					33,
 				),
-				requestContext, cbusOptions,
 			),
 			wantErr: assert.NoError,
 		},
@@ -274,16 +268,14 @@ func TestMessageCodec_Receive(t *testing.T) {
 					readWriteModel.RequestType_DIRECT_COMMAND,
 					readWriteModel.NewRequestTermination(),
 					readWriteModel.NewCALDataRecall(
+						nil,
 						readWriteModel.CALCommandTypeContainer_CALCommandRecall,
 						nil,
 						readWriteModel.Parameter_UNKNOWN_33,
 						1,
-						nil,
 					),
 					nil,
-					cbusOptions,
 				),
-				requestContext, cbusOptions,
 			),
 			setup: func(t *testing.T, fields *fields) {
 				_options := testutils.EnrichOptionsWithOptionsForTesting(t)
@@ -330,11 +322,14 @@ func TestMessageCodec_Receive(t *testing.T) {
 					56,
 					readWriteModel.NewReplyEncodedReply(
 						56,
+						cbusOptions,
 						readWriteModel.NewEncodedReplyCALReply(
+							requestContext,
 							134,
 							readWriteModel.NewCALReplyLong(
 								134,
 								readWriteModel.NewCALDataStatusExtended(
+									requestContext,
 									249,
 									nil,
 									64,
@@ -475,7 +470,6 @@ func TestMessageCodec_Receive(t *testing.T) {
 										),
 									},
 									nil,
-									requestContext,
 								),
 								262656,
 								readWriteModel.NewUnitAddress(4),
@@ -483,21 +477,12 @@ func TestMessageCodec_Receive(t *testing.T) {
 								readWriteModel.NewSerialInterfaceAddress(2),
 								utils.ToPtr(byte(0)),
 								nil,
-								cbusOptions,
-								requestContext,
 							),
-							cbusOptions,
-							requestContext,
 						),
 						nil,
-						cbusOptions,
-						requestContext,
 					),
 					readWriteModel.NewResponseTermination(),
-					cbusOptions,
-					requestContext,
 				),
-				requestContext, cbusOptions,
 			),
 			wantErr: assert.NoError,
 		},
@@ -531,7 +516,9 @@ func TestMessageCodec_Receive(t *testing.T) {
 					48,
 					readWriteModel.NewReplyEncodedReply(
 						48,
+						cbusOptions,
 						readWriteModel.NewMonitoredSALReply(
+							requestContext,
 							5,
 							readWriteModel.NewMonitoredSALLongFormSmartMode(
 								5,
@@ -560,20 +547,12 @@ func TestMessageCodec_Receive(t *testing.T) {
 										4,
 									),
 								),
-								cbusOptions,
 							),
-							cbusOptions,
-							requestContext,
 						),
 						nil,
-						cbusOptions,
-						requestContext,
 					),
 					readWriteModel.NewResponseTermination(),
-					cbusOptions,
-					requestContext,
 				),
-				requestContext, cbusOptions,
 			),
 			wantErr: assert.NoError,
 		},
@@ -782,7 +761,9 @@ func Test_extractMMIAndSAL(t *testing.T) {
 						0,
 						readWriteModel.NewReplyEncodedReply(
 							0,
+							readWriteModel.NewCBusOptionsBuilder().MustBuild(),
 							readWriteModel.NewMonitoredSALReply(
+								readWriteModel.NewRequestContext(false),
 								0,
 								readWriteModel.NewMonitoredSALShortFormBasicMode(
 									0,
@@ -792,21 +773,12 @@ func Test_extractMMIAndSAL(t *testing.T) {
 									nil,
 									readWriteModel.ApplicationIdContainer_RESERVED_00,
 									nil,
-									nil,
 								),
-								nil,
-								nil,
 							),
 							nil,
-							nil,
-							nil,
 						),
 						readWriteModel.NewResponseTermination(),
-						nil,
-						nil,
 					),
-					nil,
-					nil,
 				),
 			},
 			setup: func(t *testing.T, args *args) {
diff --git a/plc4go/internal/cbus/Reader_test.go b/plc4go/internal/cbus/Reader_test.go
index 1107310501b..9b815eed567 100644
--- a/plc4go/internal/cbus/Reader_test.go
+++ b/plc4go/internal/cbus/Reader_test.go
@@ -486,10 +486,7 @@ func TestReader_sendMessageOverTheWire(t *testing.T) {
 						nil,
 						0,
 						nil,
-						nil,
 					),
-					nil,
-					nil,
 				),
 				addResponseCode: func(t *testing.T) func(name string, responseCode apiModel.PlcResponseCode) {
 					return func(name string, responseCode apiModel.PlcResponseCode) {
@@ -566,10 +563,7 @@ func TestReader_sendMessageOverTheWire(t *testing.T) {
 						nil,
 						0,
 						nil,
-						nil,
 					),
-					nil,
-					nil,
 				),
 				addResponseCode: func(t *testing.T) func(name string, responseCode apiModel.PlcResponseCode) {
 					return func(name string, responseCode apiModel.PlcResponseCode) {
@@ -644,16 +638,13 @@ func TestReader_sendMessageOverTheWire(t *testing.T) {
 						readWriteModel.RequestType_EMPTY,
 						readWriteModel.NewRequestTermination(),
 						readWriteModel.NewCALDataIdentify(
+							readWriteModel.NewRequestContext(false),
 							readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 							nil,
 							readWriteModel.Attribute_CurrentSenseLevels,
-							nil,
 						),
 						readWriteModel.NewAlpha('g'),
-						nil,
 					),
-					nil,
-					nil,
 				),
 				addResponseCode: func(t *testing.T) func(name string, responseCode apiModel.PlcResponseCode) {
 					return func(name string, responseCode apiModel.PlcResponseCode) {
@@ -727,16 +718,13 @@ func TestReader_sendMessageOverTheWire(t *testing.T) {
 						readWriteModel.RequestType_EMPTY,
 						readWriteModel.NewRequestTermination(),
 						readWriteModel.NewCALDataIdentify(
+							readWriteModel.NewRequestContext(false),
 							readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 							nil,
 							readWriteModel.Attribute_CurrentSenseLevels,
-							nil,
 						),
 						readWriteModel.NewAlpha('g'),
-						nil,
 					),
-					nil,
-					nil,
 				),
 				addResponseCode: func(t *testing.T) func(name string, responseCode apiModel.PlcResponseCode) {
 					return func(name string, responseCode apiModel.PlcResponseCode) {
@@ -810,16 +798,13 @@ func TestReader_sendMessageOverTheWire(t *testing.T) {
 						readWriteModel.RequestType_EMPTY,
 						readWriteModel.NewRequestTermination(),
 						readWriteModel.NewCALDataIdentify(
+							readWriteModel.NewRequestContext(false),
 							readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 							nil,
 							readWriteModel.Attribute_CurrentSenseLevels,
-							nil,
 						),
 						readWriteModel.NewAlpha('g'),
-						nil,
 					),
-					nil,
-					nil,
 				),
 				addResponseCode: func(t *testing.T) func(name string, responseCode apiModel.PlcResponseCode) {
 					return func(name string, responseCode apiModel.PlcResponseCode) {
@@ -893,16 +878,13 @@ func TestReader_sendMessageOverTheWire(t *testing.T) {
 						readWriteModel.RequestType_EMPTY,
 						readWriteModel.NewRequestTermination(),
 						readWriteModel.NewCALDataIdentify(
+							readWriteModel.NewRequestContext(false),
 							readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 							nil,
 							readWriteModel.Attribute_CurrentSenseLevels,
-							nil,
 						),
 						readWriteModel.NewAlpha('g'),
-						nil,
 					),
-					nil,
-					nil,
 				),
 				addResponseCode: func(t *testing.T) func(name string, responseCode apiModel.PlcResponseCode) {
 					return func(name string, responseCode apiModel.PlcResponseCode) {
@@ -976,16 +958,13 @@ func TestReader_sendMessageOverTheWire(t *testing.T) {
 						readWriteModel.RequestType_EMPTY,
 						readWriteModel.NewRequestTermination(),
 						readWriteModel.NewCALDataIdentify(
+							readWriteModel.NewRequestContext(false),
 							readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 							nil,
 							readWriteModel.Attribute_CurrentSenseLevels,
-							nil,
 						),
 						readWriteModel.NewAlpha('g'),
-						nil,
 					),
-					nil,
-					nil,
 				),
 				addResponseCode: func(t *testing.T) func(name string, responseCode apiModel.PlcResponseCode) {
 					return func(name string, responseCode apiModel.PlcResponseCode) {
@@ -1059,16 +1038,13 @@ func TestReader_sendMessageOverTheWire(t *testing.T) {
 						readWriteModel.RequestType_EMPTY,
 						readWriteModel.NewRequestTermination(),
 						readWriteModel.NewCALDataIdentify(
+							readWriteModel.NewRequestContext(false),
 							readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 							nil,
 							readWriteModel.Attribute_CurrentSenseLevels,
-							nil,
 						),
 						readWriteModel.NewAlpha('g'),
-						nil,
 					),
-					nil,
-					nil,
 				),
 				addResponseCode: func(t *testing.T) func(name string, responseCode apiModel.PlcResponseCode) {
 					return func(name string, responseCode apiModel.PlcResponseCode) {
diff --git a/plc4go/internal/cbus/Subscriber_test.go b/plc4go/internal/cbus/Subscriber_test.go
index c576030d94f..9f991ebbdef 100644
--- a/plc4go/internal/cbus/Subscriber_test.go
+++ b/plc4go/internal/cbus/Subscriber_test.go
@@ -166,9 +166,7 @@ func TestSubscriber_handleMonitoredMMI(t *testing.T) {
 			args: args{
 				calReply: readWriteModel.NewCALReplyShort(
 					1,
-					readWriteModel.NewCALDataReset(readWriteModel.CALCommandTypeContainer_CALCommandReset, nil, nil),
-					nil,
-					nil,
+					readWriteModel.NewCALDataReset(readWriteModel.NewRequestContext(false), readWriteModel.CALCommandTypeContainer_CALCommandReset, nil),
 				),
 			},
 		},
@@ -189,9 +187,7 @@ func TestSubscriber_handleMonitoredMMI(t *testing.T) {
 			args: args{
 				calReply: readWriteModel.NewCALReplyShort(
 					1,
-					readWriteModel.NewCALDataReset(readWriteModel.CALCommandTypeContainer_CALCommandReset, nil, nil),
-					nil,
-					nil,
+					readWriteModel.NewCALDataReset(readWriteModel.NewRequestContext(false), readWriteModel.CALCommandTypeContainer_CALCommandReset, nil),
 				),
 			},
 		},
@@ -200,15 +196,13 @@ func TestSubscriber_handleMonitoredMMI(t *testing.T) {
 			args: args{
 				calReply: readWriteModel.NewCALReplyLong(
 					0,
-					readWriteModel.NewCALDataReset(readWriteModel.CALCommandTypeContainer_CALCommandReset, nil, nil),
+					readWriteModel.NewCALDataReset(readWriteModel.NewRequestContext(false), readWriteModel.CALCommandTypeContainer_CALCommandReset, nil),
 					0,
 					readWriteModel.NewUnitAddress(0),
 					nil,
 					readWriteModel.NewSerialInterfaceAddress(0),
 					nil,
 					nil,
-					nil,
-					nil,
 				),
 			},
 		},
@@ -217,7 +211,7 @@ func TestSubscriber_handleMonitoredMMI(t *testing.T) {
 			args: args{
 				calReply: readWriteModel.NewCALReplyLong(
 					0,
-					readWriteModel.NewCALDataReset(readWriteModel.CALCommandTypeContainer_CALCommandReset, nil, nil),
+					readWriteModel.NewCALDataReset(readWriteModel.NewRequestContext(false), readWriteModel.CALCommandTypeContainer_CALCommandReset, nil),
 					1,
 					readWriteModel.NewUnitAddress(0),
 					readWriteModel.NewBridgeAddress(1),
@@ -233,8 +227,6 @@ func TestSubscriber_handleMonitoredMMI(t *testing.T) {
 						),
 						readWriteModel.NewUnitAddress(1),
 					),
-					nil,
-					nil,
 				),
 			},
 		},
@@ -329,7 +321,7 @@ func TestSubscriber_offerMMI(t *testing.T) {
 			name: "valid monitor tag cal unrelated",
 			args: args{
 				unitAddressString: "u13",
-				calData:           readWriteModel.NewCALDataReset(readWriteModel.CALCommandTypeContainer_CALCommandGetStatus, nil, nil),
+				calData:           readWriteModel.NewCALDataReset(readWriteModel.NewRequestContext(false), readWriteModel.CALCommandTypeContainer_CALCommandGetStatus, nil),
 				subscriptionHandle: NewSubscriptionHandle(
 					nil,
 					"tag",
@@ -354,6 +346,7 @@ func TestSubscriber_offerMMI(t *testing.T) {
 			args: args{
 				unitAddressString: "u13",
 				calData: readWriteModel.NewCALDataStatus(
+					readWriteModel.NewRequestContext(false),
 					readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 					nil,
 					readWriteModel.ApplicationIdContainer_LIGHTING_3A,
@@ -361,7 +354,6 @@ func TestSubscriber_offerMMI(t *testing.T) {
 					[]readWriteModel.StatusByte{
 						readWriteModel.NewStatusByte(readWriteModel.GAVState_DOES_NOT_EXIST, readWriteModel.GAVState_OFF, readWriteModel.GAVState_ON, readWriteModel.GAVState_ERROR),
 					},
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(
 					nil,
@@ -387,6 +379,7 @@ func TestSubscriber_offerMMI(t *testing.T) {
 			args: args{
 				unitAddressString: "u13",
 				calData: readWriteModel.NewCALDataStatus(
+					readWriteModel.NewRequestContext(false),
 					readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 					nil,
 					readWriteModel.ApplicationIdContainer_LIGHTING_3A,
@@ -394,7 +387,6 @@ func TestSubscriber_offerMMI(t *testing.T) {
 					[]readWriteModel.StatusByte{
 						readWriteModel.NewStatusByte(readWriteModel.GAVState_DOES_NOT_EXIST, readWriteModel.GAVState_OFF, readWriteModel.GAVState_ON, readWriteModel.GAVState_ERROR),
 					},
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(
 					nil,
@@ -423,6 +415,7 @@ func TestSubscriber_offerMMI(t *testing.T) {
 			args: args{
 				unitAddressString: "u13",
 				calData: readWriteModel.NewCALDataStatusExtended(
+					readWriteModel.NewRequestContext(false),
 					readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 					nil,
 					readWriteModel.StatusCoding_BINARY_BY_THIS_SERIAL_INTERFACE,
@@ -432,7 +425,6 @@ func TestSubscriber_offerMMI(t *testing.T) {
 						readWriteModel.NewStatusByte(readWriteModel.GAVState_DOES_NOT_EXIST, readWriteModel.GAVState_OFF, readWriteModel.GAVState_ON, readWriteModel.GAVState_ERROR),
 					},
 					nil,
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(
 					nil,
@@ -458,6 +450,7 @@ func TestSubscriber_offerMMI(t *testing.T) {
 			args: args{
 				unitAddressString: "u13",
 				calData: readWriteModel.NewCALDataStatusExtended(
+					readWriteModel.NewRequestContext(false),
 					readWriteModel.CALCommandTypeContainer_CALCommandIdentify,
 					nil,
 					readWriteModel.StatusCoding_LEVEL_BY_THIS_SERIAL_INTERFACE,
@@ -473,7 +466,6 @@ func TestSubscriber_offerMMI(t *testing.T) {
 							readWriteModel.LevelInformationNibblePair_Value_2,
 						),
 					},
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(
 					nil,
@@ -545,7 +537,6 @@ func TestSubscriber_handleMonitoredSAL(t *testing.T) {
 					nil,
 					nil,
 					nil,
-					nil,
 				),
 			},
 		},
@@ -602,7 +593,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 						nil,
 						readWriteModel.NewLightingDataOn(readWriteModel.LightingCommandTypeContainer_LightingCommandOn, 2),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -627,7 +617,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 						nil,
 						readWriteModel.NewAccessControlDataAccessPointClosed(readWriteModel.AccessControlCommandTypeContainer_AccessControlCommandAccessPointClosed, 0, 0),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -652,7 +641,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 						nil,
 						readWriteModel.NewAirConditioningDataRefresh(readWriteModel.AirConditioningCommandTypeContainer_AirConditioningCommandRefresh, 0),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -677,7 +665,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 						nil,
 						readWriteModel.NewLightingDataOff(readWriteModel.LightingCommandTypeContainer_LightingCommandOn, 0),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -705,7 +692,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 							0,
 						),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -730,7 +716,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 						nil,
 						readWriteModel.NewEnableControlData(0, 0, 0),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -771,7 +756,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 							4,
 						),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -793,7 +777,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 					nil,
 					readWriteModel.ApplicationIdContainer_HVAC_ACTUATOR_74,
 					readWriteModel.NewSALDataFreeUsage(nil),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -818,7 +801,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 						nil,
 						readWriteModel.NewLightingDataOn(readWriteModel.LightingCommandTypeContainer_LightingCommandOn, 2),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -843,7 +825,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 						nil,
 						readWriteModel.NewLightingDataOn(readWriteModel.LightingCommandTypeContainer_LightingCommandOn, 2),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -868,7 +849,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 						nil,
 						readWriteModel.NewLightingDataOn(readWriteModel.LightingCommandTypeContainer_LightingCommandOn, 2),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -893,7 +873,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 						nil,
 						readWriteModel.NewLightingDataOn(readWriteModel.LightingCommandTypeContainer_LightingCommandOn, 2),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -926,7 +905,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 							0,
 						),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -955,7 +933,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 							0,
 						),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -984,7 +961,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 							0,
 						),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -1012,7 +988,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 							0,
 						),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -1036,7 +1011,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 					readWriteModel.NewSALDataReserved(
 						nil,
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -1060,7 +1034,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 					readWriteModel.NewSALDataRoomControlSystem(
 						nil,
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -1088,7 +1061,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 							0,
 						),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -1117,7 +1089,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 							"1234",
 						),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -1146,7 +1117,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 							0,
 						),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -1170,7 +1140,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 					readWriteModel.NewSALDataTesting(
 						nil,
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -1199,7 +1168,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 							0,
 						),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -1227,7 +1195,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 							0,
 						),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -1252,7 +1219,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 						nil,
 						readWriteModel.NewLightingDataOn(readWriteModel.LightingCommandTypeContainer_LightingCommandOn, 2),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(
 					nil,
@@ -1287,7 +1253,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 						nil,
 						readWriteModel.NewLightingDataOn(readWriteModel.LightingCommandTypeContainer_LightingCommandOn, 2),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(
 					nil,
@@ -1326,7 +1291,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 						nil,
 						readWriteModel.NewLightingDataOn(readWriteModel.LightingCommandTypeContainer_LightingCommandOn, 2),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
@@ -1360,7 +1324,6 @@ func TestSubscriber_offerSAL(t *testing.T) {
 						nil,
 						readWriteModel.NewLightingDataOn(readWriteModel.LightingCommandTypeContainer_LightingCommandOn, 2),
 					),
-					nil,
 				),
 				subscriptionHandle: NewSubscriptionHandle(nil, "", NewSALMonitorTag(nil, nil, 1), apiModel.SubscriptionEvent, 0),
 				consumerProvider: func(t *testing.T) apiModel.PlcSubscriptionEventConsumer {
diff --git a/plc4go/internal/cbus/Util_test.go b/plc4go/internal/cbus/Util_test.go
index 62d08ae9861..7968c9768fc 100644
--- a/plc4go/internal/cbus/Util_test.go
+++ b/plc4go/internal/cbus/Util_test.go
@@ -80,12 +80,9 @@ func TestCreateRequestContextWithInfoCallback(t *testing.T) {
 						nil,
 						0,
 						readWriteModel.NewRequestTermination(),
-						readWriteModel.NewCALDataReset(readWriteModel.CALCommandTypeContainer_CALCommandReset, nil, nil),
-						nil,
+						readWriteModel.NewCALDataReset(readWriteModel.NewRequestContext(false), readWriteModel.CALCommandTypeContainer_CALCommandReset, nil),
 						nil,
 					),
-					nil,
-					nil,
 				),
 			},
 			want: readWriteModel.NewRequestContext(false),
@@ -101,16 +98,13 @@ func TestCreateRequestContextWithInfoCallback(t *testing.T) {
 						0,
 						readWriteModel.NewRequestTermination(),
 						readWriteModel.NewCALDataIdentify(
+							readWriteModel.NewRequestContext(false),
 							0,
 							nil,
 							0,
-							nil,
 						),
 						nil,
-						nil,
 					),
-					nil,
-					nil,
 				),
 			},
 			want: readWriteModel.NewRequestContext(true),
@@ -125,22 +119,18 @@ func TestCreateRequestContextWithInfoCallback(t *testing.T) {
 						nil,
 						0,
 						readWriteModel.NewRequestTermination(),
+						readWriteModel.NewCBusOptionsBuilder().MustBuild(),
 						readWriteModel.NewCBusCommandPointToPoint(
 							readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class2, false, 0, readWriteModel.DestinationAddressType_PointToMultiPoint),
 							readWriteModel.NewCBusPointToPointCommandDirect(
 								0,
-								readWriteModel.NewCALDataReset(readWriteModel.CALCommandTypeContainer_CALCommandReset, nil, nil),
+								readWriteModel.NewCALDataReset(readWriteModel.NewRequestContext(false), readWriteModel.CALCommandTypeContainer_CALCommandReset, nil),
 								readWriteModel.NewUnitAddress(0),
-								nil,
 							),
-							nil,
 						),
 						nil,
 						nil,
-						nil,
 					),
-					nil,
-					nil,
 				),
 			},
 			want: readWriteModel.NewRequestContext(false),
@@ -155,27 +145,23 @@ func TestCreateRequestContextWithInfoCallback(t *testing.T) {
 						nil,
 						0,
 						readWriteModel.NewRequestTermination(),
+						readWriteModel.NewCBusOptionsBuilder().MustBuild(),
 						readWriteModel.NewCBusCommandPointToPoint(
 							readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class2, false, 0, readWriteModel.DestinationAddressType_PointToMultiPoint),
 							readWriteModel.NewCBusPointToPointCommandDirect(
 								0,
 								readWriteModel.NewCALDataIdentify(
+									readWriteModel.NewRequestContext(false),
 									0,
 									nil,
 									0,
-									nil,
 								),
 								readWriteModel.NewUnitAddress(0),
-								nil,
 							),
-							nil,
 						),
 						nil,
 						nil,
-						nil,
 					),
-					nil,
-					nil,
 				),
 			},
 			want: readWriteModel.NewRequestContext(true),
@@ -190,12 +176,9 @@ func TestCreateRequestContextWithInfoCallback(t *testing.T) {
 						nil,
 						0,
 						readWriteModel.NewRequestTermination(),
-						readWriteModel.NewCALDataReset(readWriteModel.CALCommandTypeContainer_CALCommandReset, nil, nil),
-						nil,
+						readWriteModel.NewCALDataReset(readWriteModel.NewRequestContext(false), readWriteModel.CALCommandTypeContainer_CALCommandReset, nil),
 						nil,
 					),
-					nil,
-					nil,
 				),
 			},
 			want: readWriteModel.NewRequestContext(false),
@@ -211,16 +194,13 @@ func TestCreateRequestContextWithInfoCallback(t *testing.T) {
 						0,
 						readWriteModel.NewRequestTermination(),
 						readWriteModel.NewCALDataIdentify(
+							readWriteModel.NewRequestContext(false),
 							0,
 							nil,
 							0,
-							nil,
 						),
 						nil,
-						nil,
 					),
-					nil,
-					nil,
 				),
 			},
 			want: readWriteModel.NewRequestContext(true),
@@ -237,11 +217,7 @@ func TestCreateRequestContextWithInfoCallback(t *testing.T) {
 							readWriteModel.ConfirmationType_CONFIRMATION_SUCCESSFUL,
 						),
 						nil,
-						nil,
-						nil,
 					),
-					nil,
-					nil,
 				),
 			},
 			want: readWriteModel.NewRequestContext(false),
diff --git a/plc4go/internal/eip/Connection.go b/plc4go/internal/eip/Connection.go
index a6e43cb0b3e..9d4d77f62a5 100644
--- a/plc4go/internal/eip/Connection.go
+++ b/plc4go/internal/eip/Connection.go
@@ -321,7 +321,7 @@ func (c *Connection) connectRegisterSession(ctx context.Context, ch chan plc4go.
 						2113537,
 						readWriteModel.NewNetworkConnectionParameters(4002, false, 2, 0, true),
 						readWriteModel.NewTransportType(true, 2, 3),
-						c.connectionPathSize, c.routingAddress, 1))
+						c.connectionPathSize, c.routingAddress))
 				typeIds := []readWriteModel.TypeId{readWriteModel.NewNullAddressItem(), exchange}
 				eipWrapper := readWriteModel.NewCipRRData(
 					c.sessionHandle,
@@ -418,8 +418,8 @@ func (c *Connection) listAllAttributes(ctx context.Context, ch chan plc4go.PlcCo
 			[]readWriteModel.TypeId{
 				readWriteModel.NewNullAddressItem(),
 				readWriteModel.NewUnConnectedDataItem(
-					readWriteModel.NewGetAttributeAllRequest(
-						classSegment, instanceSegment, uint16(0))),
+					readWriteModel.NewGetAttributeAllRequest(classSegment, instanceSegment),
+				),
 			},
 		),
 		func(message spi.Message) bool {
diff --git a/plc4go/internal/eip/Reader.go b/plc4go/internal/eip/Reader.go
index 2aba7914150..0e3f6784fa5 100644
--- a/plc4go/internal/eip/Reader.go
+++ b/plc4go/internal/eip/Reader.go
@@ -93,8 +93,8 @@ func (m *Reader) Read(ctx context.Context, readRequest apiModel.PlcReadRequest)
 				return
 			}
 			requestItem := readWriteModel.NewCipUnconnectedRequest(classSegment, instanceSegment,
-				readWriteModel.NewCipReadRequest(ansi, elementsNb, 0),
-				m.configuration.backplane, m.configuration.slot, uint16(0))
+				readWriteModel.NewCipReadRequest(ansi, elementsNb),
+				m.configuration.backplane, m.configuration.slot)
 			typeIds := []readWriteModel.TypeId{
 				readWriteModel.NewNullAddressItem(),
 				readWriteModel.NewUnConnectedDataItem(requestItem),
@@ -257,7 +257,7 @@ func (m *Reader) ToPlc4xReadResponse(response readWriteModel.CipService, readReq
 				return nil, err
 			}
 		}
-		services := readWriteModel.NewServices(multipleServiceResponse.GetOffsets(), arr, uint16(0))
+		services := readWriteModel.NewServices(multipleServiceResponse.GetOffsets(), arr)
 		for i, tagName := range readRequest.GetTagNames() {
 			tag := readRequest.GetTag(tagName).(PlcTag)
 			if cipReadResponse, ok := services.Services[i].(readWriteModel.CipReadResponse); ok {
diff --git a/plc4go/internal/eip/Writer.go b/plc4go/internal/eip/Writer.go
index e5f99803c14..0c7ef52a161 100644
--- a/plc4go/internal/eip/Writer.go
+++ b/plc4go/internal/eip/Writer.go
@@ -95,7 +95,6 @@ func (m *Writer) Write(ctx context.Context, writeRequest apiModel.PlcWriteReques
 			if isArray {
 				dataLength += 2
 			}
-			requestPathSize := int8(dataLength / 2)
 			data, err := encodeValue(value, eipTag.GetType(), elements)
 			if err != nil {
 				result <- spiModel.NewDefaultPlcWriteRequestResult(writeRequest, nil, errors.Wrapf(err, "Error encoding value for eipTag %s", tagName))
@@ -106,7 +105,7 @@ func (m *Writer) Write(ctx context.Context, writeRequest apiModel.PlcWriteReques
 				result <- spiModel.NewDefaultPlcWriteRequestResult(writeRequest, nil, errors.Wrapf(err, "Error encoding eip ansi for eipTag %s", tagName))
 				return
 			}
-			items[i] = readWriteModel.NewCipWriteRequest(ansi, eipTag.GetType(), elements, data, uint16(requestPathSize))
+			items[i] = readWriteModel.NewCipWriteRequest(ansi, eipTag.GetType(), elements, data)
 		}
 
 		/*		if len(items) == 1 {
diff --git a/plc4go/internal/knxnetip/ConnectionInternalOperations.go b/plc4go/internal/knxnetip/ConnectionInternalOperations.go
index 4fc80361f19..f4dd98b5221 100644
--- a/plc4go/internal/knxnetip/ConnectionInternalOperations.go
+++ b/plc4go/internal/knxnetip/ConnectionInternalOperations.go
@@ -271,13 +271,10 @@ func (m *Connection) sendGroupAddressReadRequest(ctx context.Context, groupAddre
 				driverModel.NewApduDataContainer(
 					false,
 					0,
-					driverModel.NewApduDataGroupValueRead(0),
-					0,
+					driverModel.NewApduDataGroupValueRead(),
 				),
 			),
-			0,
 		),
-		0,
 	)
 
 	result := make(chan driverModel.ApduDataGroupValueResponse, 1)
@@ -362,12 +359,9 @@ func (m *Connection) sendDeviceConnectionRequest(ctx context.Context, targetAddr
 					false,
 					0,
 					driverModel.NewApduControlConnect(),
-					0,
 				),
 			),
-			0,
 		),
-		0,
 	)
 
 	result := make(chan driverModel.ApduControlConnect, 1)
@@ -459,12 +453,9 @@ func (m *Connection) sendDeviceDisconnectionRequest(ctx context.Context, targetA
 					false,
 					0,
 					driverModel.NewApduControlDisconnect(),
-					0,
 				),
 			),
-			0,
 		),
-		0,
 	)
 
 	result := make(chan driverModel.ApduControlDisconnect, 1)
@@ -564,15 +555,11 @@ func (m *Connection) sendDeviceAuthentication(ctx context.Context, targetAddress
 					true,
 					counter,
 					driverModel.NewApduDataOther(
-						driverModel.NewApduDataExtAuthorizeRequest(authenticationLevel, buildingKey, 0),
-						0,
+						driverModel.NewApduDataExtAuthorizeRequest(authenticationLevel, buildingKey),
 					),
-					0,
 				),
 			),
-			0,
 		),
-		0,
 	)
 
 	result := make(chan driverModel.ApduDataExtAuthorizeResponse, 1)
@@ -682,13 +669,10 @@ func (m *Connection) sendDeviceDeviceDescriptorReadRequest(ctx context.Context,
 				driverModel.NewApduDataContainer(
 					true,
 					counter,
-					driverModel.NewApduDataDeviceDescriptorRead(0, 0),
-					0,
+					driverModel.NewApduDataDeviceDescriptorRead(0),
 				),
 			),
-			0,
 		),
-		0,
 	)
 
 	result := make(chan driverModel.ApduDataDeviceDescriptorResponse, 1)
@@ -789,15 +773,11 @@ func (m *Connection) sendDevicePropertyReadRequest(ctx context.Context, targetAd
 					true,
 					counter,
 					driverModel.NewApduDataOther(
-						driverModel.NewApduDataExtPropertyValueRead(objectId, propertyId, numElements, propertyIndex, 0),
-						0,
+						driverModel.NewApduDataExtPropertyValueRead(objectId, propertyId, numElements, propertyIndex),
 					),
-					0,
 				),
 			),
-			0,
 		),
-		0,
 	)
 
 	result := make(chan driverModel.ApduDataExtPropertyValueResponse, 1)
@@ -906,15 +886,11 @@ func (m *Connection) sendDevicePropertyDescriptionReadRequest(ctx context.Contex
 					true,
 					counter,
 					driverModel.NewApduDataOther(
-						driverModel.NewApduDataExtPropertyDescriptionRead(objectId, propertyId, 1, 0),
-						0,
+						driverModel.NewApduDataExtPropertyDescriptionRead(objectId, propertyId, 1),
 					),
-					0,
 				),
 			),
-			0,
 		),
-		0,
 	)
 
 	result := make(chan driverModel.ApduDataExtPropertyDescriptionResponse, 1)
@@ -1022,13 +998,10 @@ func (m *Connection) sendDeviceMemoryReadRequest(ctx context.Context, targetAddr
 				driverModel.NewApduDataContainer(
 					true,
 					counter,
-					driverModel.NewApduDataMemoryRead(numBytes, address, 0),
-					0,
+					driverModel.NewApduDataMemoryRead(numBytes, address),
 				),
 			),
-			0,
 		),
-		0,
 	)
 
 	result := make(chan driverModel.ApduDataMemoryResponse, 1)
@@ -1126,11 +1099,9 @@ func (m *Connection) sendDeviceAck(ctx context.Context, targetAddress driverMode
 				6,
 				uint8(0),
 				driverModel.NewKnxAddress(0, 0, 0), KnxAddressToByteArray(targetAddress),
-				driverModel.NewApduControlContainer(true, counter, driverModel.NewApduControlAck(), 0),
+				driverModel.NewApduControlContainer(true, counter, driverModel.NewApduControlAck()),
 			),
-			0,
 		),
-		0,
 	)
 
 	if err := m.messageCodec.SendRequest(ctx, ack,
diff --git a/plc4go/internal/modbus/Connection.go b/plc4go/internal/modbus/Connection.go
index 2eaae7f6e1f..4d73f9b43b1 100644
--- a/plc4go/internal/modbus/Connection.go
+++ b/plc4go/internal/modbus/Connection.go
@@ -119,7 +119,7 @@ func (c *Connection) Ping() <-chan plc4go.PlcConnectionPingResult {
 			}
 		}()
 		diagnosticRequestPdu := readWriteModel.NewModbusPDUDiagnosticRequest(0, 0x42)
-		pingRequest := readWriteModel.NewModbusTcpADU(1, c.unitIdentifier, diagnosticRequestPdu, false)
+		pingRequest := readWriteModel.NewModbusTcpADU(1, c.unitIdentifier, diagnosticRequestPdu)
 		if err := c.messageCodec.SendRequest(ctx, pingRequest,
 			func(message spi.Message) bool {
 				responseAdu, ok := message.(readWriteModel.ModbusTcpADU)
diff --git a/plc4go/internal/modbus/Reader.go b/plc4go/internal/modbus/Reader.go
index 6d48aa43bc1..7609baec06e 100644
--- a/plc4go/internal/modbus/Reader.go
+++ b/plc4go/internal/modbus/Reader.go
@@ -130,7 +130,7 @@ func (m *Reader) Read(ctx context.Context, readRequest apiModel.PlcReadRequest)
 
 		// Assemble the finished ADU
 		m.log.Trace().Msg("Assemble ADU")
-		requestAdu := readWriteModel.NewModbusTcpADU(uint16(transactionIdentifier), m.unitIdentifier, pdu, false)
+		requestAdu := readWriteModel.NewModbusTcpADU(uint16(transactionIdentifier), m.unitIdentifier, pdu)
 
 		// Send the ADU over the wire
 		m.log.Trace().Msg("Send ADU")
diff --git a/plc4go/internal/modbus/Writer.go b/plc4go/internal/modbus/Writer.go
index 3969cfd70b7..9ad3aa3b179 100644
--- a/plc4go/internal/modbus/Writer.go
+++ b/plc4go/internal/modbus/Writer.go
@@ -120,7 +120,7 @@ func (m *Writer) Write(ctx context.Context, writeRequest apiModel.PlcWriteReques
 		}
 
 		// Assemble the finished ADU
-		requestAdu := readWriteModel.NewModbusTcpADU(uint16(transactionIdentifier), m.unitIdentifier, pdu, false)
+		requestAdu := readWriteModel.NewModbusTcpADU(uint16(transactionIdentifier), m.unitIdentifier, pdu)
 
 		// Send the ADU over the wire
 		err = m.messageCodec.SendRequest(ctx, requestAdu, func(message spi.Message) bool {
diff --git a/plc4go/internal/opcua/EncryptionHandler.go b/plc4go/internal/opcua/EncryptionHandler.go
index f52e4906256..bc87ec4a2fd 100644
--- a/plc4go/internal/opcua/EncryptionHandler.go
+++ b/plc4go/internal/opcua/EncryptionHandler.go
@@ -78,7 +78,7 @@ func (h *EncryptionHandler) encodeMessage(ctx context.Context, pdu readWriteMode
 	numberOfBlocks := preEncryptedLength / PREENCRYPTED_BLOCK_LENGTH
 	encryptedLength := numberOfBlocks*256 + positionFirstBlock
 	buf := utils.NewWriteBufferByteBased(utils.WithByteOrderForByteBasedBuffer(binary.LittleEndian))
-	if err := readWriteModel.NewOpcuaAPU(pdu, false, true).SerializeWithWriteBuffer(ctx, buf); err != nil {
+	if err := readWriteModel.NewOpcuaAPU(pdu).SerializeWithWriteBuffer(ctx, buf); err != nil {
 		return nil, errors.Wrap(err, "error serializing")
 	}
 	paddingByte := byte(paddingSize)
diff --git a/plc4go/internal/opcua/MessageCodec.go b/plc4go/internal/opcua/MessageCodec.go
index 32dfa2f4e9e..0a371163b93 100644
--- a/plc4go/internal/opcua/MessageCodec.go
+++ b/plc4go/internal/opcua/MessageCodec.go
@@ -70,7 +70,7 @@ func (m *MessageCodec) Send(message spi.Message) error {
 	opcuaApu, ok := message.(readWriteModel.OpcuaAPU)
 	if !ok {
 		if message, ok := message.(readWriteModel.MessagePDU); ok {
-			opcuaApu = readWriteModel.NewOpcuaAPU(message, false, true)
+			opcuaApu = readWriteModel.NewOpcuaAPU(message)
 		} else {
 			return errors.Errorf("Invalid message type %T", message)
 		}
diff --git a/plc4go/internal/opcua/Reader.go b/plc4go/internal/opcua/Reader.go
index 114a2367e2f..7238d424415 100644
--- a/plc4go/internal/opcua/Reader.go
+++ b/plc4go/internal/opcua/Reader.go
@@ -102,7 +102,7 @@ func (m *Reader) readSync(ctx context.Context, readRequest apiModel.PlcReadReque
 		nil,
 		nil)
 
-	extObject := readWriteModel.NewExtensiblePayload(nil, readWriteModel.NewRootExtensionObject(expandedNodeId, opcuaReadRequest, identifier), 0)
+	extObject := readWriteModel.NewExtensiblePayload(nil, readWriteModel.NewRootExtensionObject(expandedNodeId, opcuaReadRequest))
 
 	buffer := utils.NewWriteBufferByteBased(utils.WithByteOrderForByteBasedBuffer(binary.LittleEndian))
 	if err := extObject.SerializeWithWriteBuffer(ctx, buffer); err != nil {
diff --git a/plc4go/internal/opcua/SecureChannel.go b/plc4go/internal/opcua/SecureChannel.go
index 541064142a3..c24db8979a9 100644
--- a/plc4go/internal/opcua/SecureChannel.go
+++ b/plc4go/internal/opcua/SecureChannel.go
@@ -68,8 +68,7 @@ var (
 	BINARY_ENCODING_MASK  = readWriteModel.NewExtensionObjectEncodingMask(false, false, true)
 	NULL_EXTENSION_OBJECT = readWriteModel.NewNullExtensionObjectWithMask(NULL_EXPANDED_NODEID,
 		readWriteModel.NewExtensionObjectEncodingMask(false, false, false),
-		0,
-		false) // Body
+	) // Body
 
 	INET_ADDRESS_PATTERN = regexp.MustCompile(`(.(?P<transportCode>tcp))?://(?P<transportHost>[\w.-]+)(:(?P<transportPort>\d*))?`)
 
@@ -196,10 +195,7 @@ func (s *SecureChannel) submit(ctx context.Context, codec *MessageCodec, errorDi
 		readWriteModel.NewBinaryPayload(
 			readWriteModel.NewSequenceHeader(transactionId, transactionId),
 			buffer.GetBytes(),
-			uint32(len(buffer.GetBytes())),
 		),
-		uint32(len(buffer.GetBytes())),
-		true,
 	)
 
 	var apu readWriteModel.OpcuaAPU
@@ -215,7 +211,7 @@ func (s *SecureChannel) submit(ctx context.Context, codec *MessageCodec, errorDi
 			return
 		}
 	} else {
-		apu = readWriteModel.NewOpcuaAPU(messageRequest, false, true)
+		apu = readWriteModel.NewOpcuaAPU(messageRequest)
 	}
 
 	requestConsumer := func(transactionId int32) {
@@ -302,7 +298,6 @@ func (s *SecureChannel) onConnect(ctx context.Context, connection *Connection, c
 			DEFAULT_MAX_CHUNK_COUNT,
 		),
 		s.endpoint,
-		true,
 	)
 
 	requestConsumer := func(transactionId int32) {
@@ -388,7 +383,6 @@ func (s *SecureChannel) onConnectOpenSecureChannel(ctx context.Context, connecti
 	extObject := readWriteModel.NewRootExtensionObject(
 		expandedNodeId,
 		openSecureChannelRequest,
-		identifier,
 	)
 
 	buffer := utils.NewWriteBufferByteBased(utils.WithByteOrderForByteBasedBuffer(binary.LittleEndian))
@@ -408,10 +402,7 @@ func (s *SecureChannel) onConnectOpenSecureChannel(ctx context.Context, connecti
 		readWriteModel.NewBinaryPayload(
 			readWriteModel.NewSequenceHeader(transactionId, transactionId),
 			buffer.GetBytes(),
-			uint32(len(buffer.GetBytes())),
 		),
-		uint32(len(buffer.GetBytes())),
-		true,
 	)
 
 	var apu readWriteModel.OpcuaAPU
@@ -430,7 +421,7 @@ func (s *SecureChannel) onConnectOpenSecureChannel(ctx context.Context, connecti
 			return
 		}
 	} else {
-		apu = readWriteModel.NewOpcuaAPU(openRequest, false, true)
+		apu = readWriteModel.NewOpcuaAPU(openRequest)
 	}
 
 	requestConsumer := func(transactionId int32) {
@@ -547,7 +538,6 @@ func (s *SecureChannel) onConnectCreateSessionRequest(ctx context.Context, conne
 	extObject := readWriteModel.NewRootExtensionObject(
 		expandedNodeId,
 		createSessionRequest,
-		identifier,
 	)
 
 	buffer := utils.NewWriteBufferByteBased(utils.WithByteOrderForByteBasedBuffer(binary.LittleEndian))
@@ -663,7 +653,6 @@ func (s *SecureChannel) onConnectActivateSessionRequest(ctx context.Context, con
 	extObject := readWriteModel.NewRootExtensionObject(
 		expandedNodeId,
 		activateSessionRequest,
-		identifier,
 	)
 
 	buffer := utils.NewWriteBufferByteBased(utils.WithByteOrderForByteBasedBuffer(binary.LittleEndian))
@@ -760,7 +749,6 @@ func (s *SecureChannel) onDisconnect(ctx context.Context, connection *Connection
 	extObject := readWriteModel.NewRootExtensionObject(
 		expandedNodeId,
 		closeSessionRequest,
-		closeSessionRequest.GetExtensionId(),
 	)
 
 	buffer := utils.NewWriteBufferByteBased(utils.WithByteOrderForByteBasedBuffer(binary.LittleEndian))
@@ -842,14 +830,11 @@ func (s *SecureChannel) onDisconnectCloseSecureChannel(ctx context.Context, conn
 			readWriteModel.NewRootExtensionObject(
 				expandedNodeId,
 				closeSecureChannelRequest,
-				identifier,
 			),
-			0,
 		),
-		true,
 	)
 
-	apu := readWriteModel.NewOpcuaAPU(closeRequest, false, true)
+	apu := readWriteModel.NewOpcuaAPU(closeRequest)
 
 	requestConsumer := func(transactionId int32) {
 		if err := connection.messageCodec.SendRequest(
@@ -906,10 +891,9 @@ func (s *SecureChannel) onDiscover(ctx context.Context, codec *MessageCodec) {
 			DEFAULT_MAX_CHUNK_COUNT,
 		),
 		s.endpoint,
-		true,
 	)
 
-	apu := readWriteModel.NewOpcuaAPU(hello, false, true)
+	apu := readWriteModel.NewOpcuaAPU(hello)
 
 	requestConsumer := func(transactionId int32) {
 		if err := codec.SendRequest(
@@ -985,7 +969,6 @@ func (s *SecureChannel) onDiscoverOpenSecureChannel(ctx context.Context, codec *
 	extObject := readWriteModel.NewRootExtensionObject(
 		expandedNodeId,
 		openSecureChannelRequest,
-		identifier,
 	)
 
 	buffer := utils.NewWriteBufferByteBased(utils.WithByteOrderForByteBasedBuffer(binary.LittleEndian))
@@ -1005,13 +988,10 @@ func (s *SecureChannel) onDiscoverOpenSecureChannel(ctx context.Context, codec *
 		readWriteModel.NewBinaryPayload(
 			readWriteModel.NewSequenceHeader(transactionId, transactionId),
 			buffer.GetBytes(),
-			uint32(len(buffer.GetBytes())),
 		),
-		uint32(len(buffer.GetBytes())),
-		true,
 	)
 
-	apu := readWriteModel.NewOpcuaAPU(openRequest, false, true)
+	apu := readWriteModel.NewOpcuaAPU(openRequest)
 
 	requestConsumer := func(transactionId int32) {
 		if err := codec.SendRequest(
@@ -1114,7 +1094,6 @@ func (s *SecureChannel) onDiscoverGetEndpointsRequest(ctx context.Context, codec
 	extObject := readWriteModel.NewRootExtensionObject(
 		expandedNodeId,
 		endpointsRequest,
-		identifier,
 	)
 
 	buffer := utils.NewWriteBufferByteBased(utils.WithByteOrderForByteBasedBuffer(binary.LittleEndian))
@@ -1132,13 +1111,10 @@ func (s *SecureChannel) onDiscoverGetEndpointsRequest(ctx context.Context, codec
 		readWriteModel.NewBinaryPayload(
 			readWriteModel.NewSequenceHeader(nextSequenceNumber, nextRequestId),
 			buffer.GetBytes(),
-			uint32(len(buffer.GetBytes())),
 		),
-		uint32(len(buffer.GetBytes())),
-		true,
 	)
 
-	apu := readWriteModel.NewOpcuaAPU(messageRequest, false, true)
+	apu := readWriteModel.NewOpcuaAPU(messageRequest)
 
 	requestConsumer := func(transactionId int32) {
 		if err := codec.SendRequest(
@@ -1244,14 +1220,11 @@ func (s *SecureChannel) onDiscoverCloseSecureChannel(ctx context.Context, codec
 			readWriteModel.NewRootExtensionObject(
 				expandedNodeId,
 				closeSecureChannelRequest,
-				identifier,
 			),
-			uint32(0),
 		),
-		true,
 	)
 
-	apu := readWriteModel.NewOpcuaAPU(closeRequest, false, true)
+	apu := readWriteModel.NewOpcuaAPU(closeRequest)
 
 	requestConsumer := func(transactionId int32) {
 		if err := codec.SendRequest(
@@ -1354,7 +1327,6 @@ func (s *SecureChannel) keepAlive() {
 			extObject := readWriteModel.NewRootExtensionObject(
 				expandedNodeId,
 				openSecureChannelRequest,
-				identifier,
 			)
 
 			buffer := utils.NewWriteBufferByteBased(utils.WithByteOrderForByteBasedBuffer(binary.LittleEndian))
@@ -1373,10 +1345,7 @@ func (s *SecureChannel) keepAlive() {
 				readWriteModel.NewBinaryPayload(
 					readWriteModel.NewSequenceHeader(transactionId, transactionId),
 					buffer.GetBytes(),
-					uint32(len(buffer.GetBytes())),
 				),
-				uint32(len(buffer.GetBytes())),
-				true,
 			)
 
 			var apu readWriteModel.OpcuaAPU
@@ -1393,7 +1362,7 @@ func (s *SecureChannel) keepAlive() {
 					return
 				}
 			} else {
-				apu = readWriteModel.NewOpcuaAPU(openRequest, false, true)
+				apu = readWriteModel.NewOpcuaAPU(openRequest)
 			}
 
 			requestConsumer := func(transactionId int32) {
@@ -1588,8 +1557,6 @@ func (s *SecureChannel) getIdentityToken(tokenType readWriteModel.UserTokenType,
 			extExpandedNodeId,
 			BINARY_ENCODING_MASK,
 			anonymousIdentityToken,
-			anonymousIdentityToken.GetExtensionId(),
-			false,
 		)
 	case readWriteModel.UserTokenType_userTokenTypeUserName:
 		//Encrypt the password using the server nonce and server public key
@@ -1626,8 +1593,6 @@ func (s *SecureChannel) getIdentityToken(tokenType readWriteModel.UserTokenType,
 			extExpandedNodeId,
 			BINARY_ENCODING_MASK,
 			userNameIdentityToken,
-			userNameIdentityToken.GetExtensionId(),
-			false,
 		)
 	}
 	return nil
diff --git a/plc4go/internal/opcua/Subscriber.go b/plc4go/internal/opcua/Subscriber.go
index ce4803ff54b..0ddc19c1607 100644
--- a/plc4go/internal/opcua/Subscriber.go
+++ b/plc4go/internal/opcua/Subscriber.go
@@ -152,9 +152,8 @@ func (s *Subscriber) onSubscribeCreateSubscription(ctx context.Context, cycleTim
 	extObject := readWriteModel.NewExtensiblePayload(
 		nil,
 		readWriteModel.NewRootExtensionObject(
-			expandedNodeId, createSubscriptionRequest, createSubscriptionRequest.GetExtensionId(),
+			expandedNodeId, createSubscriptionRequest,
 		),
-		0,
 	)
 
 	buffer := utils.NewWriteBufferByteBased(utils.WithByteOrderForByteBasedBuffer(binary.LittleEndian))
diff --git a/plc4go/internal/opcua/SubscriptionHandle.go b/plc4go/internal/opcua/SubscriptionHandle.go
index acc179404db..6fea5c017bd 100644
--- a/plc4go/internal/opcua/SubscriptionHandle.go
+++ b/plc4go/internal/opcua/SubscriptionHandle.go
@@ -147,7 +147,6 @@ func (h *SubscriptionHandle) onSubscribeCreateMonitoredItemsRequest() (readWrite
 	extObject := readWriteModel.NewRootExtensionObject(
 		expandedNodeId,
 		createMonitoredItemsRequest,
-		identifier,
 	)
 
 	ctx, cancel := context.WithTimeout(context.Background(), REQUEST_TIMEOUT)
@@ -279,7 +278,6 @@ func (h *SubscriptionHandle) startSubscriber() {
 				extObject := readWriteModel.NewRootExtensionObject(
 					extExpandedNodeId,
 					publishRequest,
-					identifier,
 				)
 
 				ctx := context.Background()
@@ -390,7 +388,6 @@ func (h *SubscriptionHandle) stopSubscriber() {
 	extObject := readWriteModel.NewRootExtensionObject(
 		extExpandedNodeId,
 		deleteSubscriptionrequest,
-		identifier,
 	)
 
 	ctx := context.Background()
diff --git a/plc4go/internal/opcua/Writer.go b/plc4go/internal/opcua/Writer.go
index ab04138775b..4dcd7507a5b 100644
--- a/plc4go/internal/opcua/Writer.go
+++ b/plc4go/internal/opcua/Writer.go
@@ -126,9 +126,7 @@ func (m *Writer) WriteSync(ctx context.Context, writeRequest apiModel.PlcWriteRe
 		readWriteModel.NewRootExtensionObject(
 			expandedNodeId,
 			opcuaWriteRequest,
-			identifier,
 		),
-		0,
 	)
 	buffer := utils.NewWriteBufferByteBased(utils.WithByteOrderForByteBasedBuffer(binary.LittleEndian))
 	if err := extObject.SerializeWithWriteBuffer(ctx, buffer); err != nil {
diff --git a/plc4go/internal/s7/Connection.go b/plc4go/internal/s7/Connection.go
index 054c237d511..7e1157a778a 100644
--- a/plc4go/internal/s7/Connection.go
+++ b/plc4go/internal/s7/Connection.go
@@ -400,10 +400,9 @@ func (c *Connection) createIdentifyRemoteMessage() readWriteModel.TPKTPacket {
 					0x0000,
 				),
 			},
-			nil,
 		),
 	)
-	cotpPacketData := readWriteModel.NewCOTPPacketData(nil, identifyRemoteMessage, true, 2, 0)
+	cotpPacketData := readWriteModel.NewCOTPPacketData(nil, identifyRemoteMessage, true, 2)
 	return readWriteModel.NewTPKTPacket(cotpPacketData)
 }
 
@@ -428,22 +427,21 @@ func (c *Connection) createS7ConnectionRequest(cotpPacketConnectionResponse read
 		c.driverContext.MaxAmqCaller, c.driverContext.MaxAmqCallee, c.driverContext.PduSize,
 	)
 	s7Message := readWriteModel.NewS7MessageRequest(0, s7ParameterSetupCommunication, nil)
-	cotpPacketData := readWriteModel.NewCOTPPacketData(nil, s7Message, true, 1, 0)
+	cotpPacketData := readWriteModel.NewCOTPPacketData(nil, s7Message, true, 1)
 	return readWriteModel.NewTPKTPacket(cotpPacketData)
 }
 
 func (c *Connection) createCOTPConnectionRequest() readWriteModel.COTPPacket {
 	return readWriteModel.NewCOTPPacketConnectionRequest(
 		[]readWriteModel.COTPParameter{
-			readWriteModel.NewCOTPParameterCallingTsap(c.driverContext.CallingTsapId, 0),
-			readWriteModel.NewCOTPParameterCalledTsap(c.driverContext.CalledTsapId, 0),
-			readWriteModel.NewCOTPParameterTpduSize(c.driverContext.CotpTpduSize, 0),
+			readWriteModel.NewCOTPParameterCallingTsap(c.driverContext.CallingTsapId),
+			readWriteModel.NewCOTPParameterCalledTsap(c.driverContext.CalledTsapId),
+			readWriteModel.NewCOTPParameterTpduSize(c.driverContext.CotpTpduSize),
 		},
 		nil,
 		0x0000,
 		0x000F,
 		readWriteModel.COTPProtocolClass_CLASS_0,
-		0,
 	)
 }
 
diff --git a/plc4go/internal/s7/Reader.go b/plc4go/internal/s7/Reader.go
index 54d303002e1..d734353dd29 100644
--- a/plc4go/internal/s7/Reader.go
+++ b/plc4go/internal/s7/Reader.go
@@ -112,7 +112,6 @@ func (m *Reader) Read(ctx context.Context, readRequest apiModel.PlcReadRequest)
 				s7MessageRequest,
 				true,
 				uint8(tpduId),
-				0,
 			),
 		)
 		// Start a new request-transaction (Is ended in the response-handler)
diff --git a/plc4go/internal/s7/Writer.go b/plc4go/internal/s7/Writer.go
index 0b9c1227c24..667fd6cab95 100644
--- a/plc4go/internal/s7/Writer.go
+++ b/plc4go/internal/s7/Writer.go
@@ -92,7 +92,7 @@ func (m *Writer) Write(ctx context.Context, writeRequest apiModel.PlcWriteReques
 		s7MessageRequest := readWriteModel.NewS7MessageRequest(
 			tpduId,
 			readWriteModel.NewS7ParameterWriteVarRequest(parameterItems),
-			readWriteModel.NewS7PayloadWriteVarRequest(payloadItems, nil),
+			readWriteModel.NewS7PayloadWriteVarRequest(payloadItems),
 		)
 
 		// Assemble the finished paket
@@ -104,7 +104,6 @@ func (m *Writer) Write(ctx context.Context, writeRequest apiModel.PlcWriteReques
 				s7MessageRequest,
 				true,
 				uint8(tpduId),
-				0,
 			),
 		)
 
diff --git a/plc4go/internal/s7/s7Io_test.go b/plc4go/internal/s7/s7Io_test.go
index 1024692f3b1..f151b27787b 100644
--- a/plc4go/internal/s7/s7Io_test.go
+++ b/plc4go/internal/s7/s7Io_test.go
@@ -54,7 +54,7 @@ func TestS7MessageBytes(t *testing.T) {
 			args: args{
 				debuggable: model.NewTPKTPacket(
 					model.NewCOTPPacketData(
-						[]model.COTPParameter{model.NewCOTPParameterTpduSize(model.COTPTpduSize_SIZE_4096, 3)},
+						[]model.COTPParameter{model.NewCOTPParameterTpduSize(model.COTPTpduSize_SIZE_4096)},
 						model.NewS7MessageResponseData(
 							11,
 							model.NewS7ParameterReadVarResponse(1),
@@ -66,14 +66,12 @@ func TestS7MessageBytes(t *testing.T) {
 										[]byte{1},
 									),
 								},
-								model.NewS7ParameterReadVarResponse(1),
 							),
 							0,
 							0,
 						),
 						false,
 						13,
-						25,
 					),
 				),
 			},
@@ -375,7 +373,7 @@ func TestS7MessageBytes(t *testing.T) {
 			args: args{
 				debuggable: model.NewTPKTPacket(
 					model.NewCOTPPacketData(
-						[]model.COTPParameter{model.NewCOTPParameterTpduSize(model.COTPTpduSize_SIZE_4096, 3)},
+						[]model.COTPParameter{model.NewCOTPParameterTpduSize(model.COTPTpduSize_SIZE_4096)},
 						model.NewS7MessageRequest(
 							13,
 							model.NewS7ParameterWriteVarRequest([]model.S7VarRequestParameterItem{
@@ -404,21 +402,10 @@ func TestS7MessageBytes(t *testing.T) {
 											0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE,
 										},
 									),
-								},
-								model.NewS7ParameterWriteVarRequest([]model.S7VarRequestParameterItem{
-									model.NewS7VarRequestParameterItemAddress(model.NewS7AddressAny(
-										model.TransportSize_BYTE,
-										64,
-										13,
-										model.MemoryArea_INPUTS,
-										0,
-										0,
-									)),
-								})),
+								}),
 						),
 						false,
 						13,
-						98,
 					),
 				),
 			},
diff --git a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationPacket.go b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationPacket.go
index 597f0b006aa..e01ef3d5a96 100644
--- a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationPacket.go
+++ b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationPacket.go
@@ -367,7 +367,7 @@ func CIPEncapsulationPacketParseWithBufferProducer[T CIPEncapsulationPacket]() f
 }
 
 func CIPEncapsulationPacketParseWithBuffer[T CIPEncapsulationPacket](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_CIPEncapsulationPacket{}).parse(ctx, readBuffer)
+	v, err := (new(_CIPEncapsulationPacket)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationReadResponse.go b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationReadResponse.go
index 8f7607a93de..82efbcbc226 100644
--- a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationReadResponse.go
+++ b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationReadResponse.go
@@ -55,16 +55,13 @@ type CIPEncapsulationReadResponse interface {
 type _CIPEncapsulationReadResponse struct {
 	CIPEncapsulationPacketContract
 	Response DF1ResponseMessage
-
-	// Arguments.
-	PacketLen uint16
 }
 
 var _ CIPEncapsulationReadResponse = (*_CIPEncapsulationReadResponse)(nil)
 var _ CIPEncapsulationPacketRequirements = (*_CIPEncapsulationReadResponse)(nil)
 
 // NewCIPEncapsulationReadResponse factory function for _CIPEncapsulationReadResponse
-func NewCIPEncapsulationReadResponse(sessionHandle uint32, status uint32, senderContext []uint8, options uint32, response DF1ResponseMessage, packetLen uint16) *_CIPEncapsulationReadResponse {
+func NewCIPEncapsulationReadResponse(sessionHandle uint32, status uint32, senderContext []uint8, options uint32, response DF1ResponseMessage) *_CIPEncapsulationReadResponse {
 	if response == nil {
 		panic("response of type DF1ResponseMessage for CIPEncapsulationReadResponse must not be nil")
 	}
@@ -90,8 +87,6 @@ type CIPEncapsulationReadResponseBuilder interface {
 	WithResponse(DF1ResponseMessage) CIPEncapsulationReadResponseBuilder
 	// WithResponseBuilder adds Response (property field) which is build by the builder
 	WithResponseBuilder(func(DF1ResponseMessageBuilder) DF1ResponseMessageBuilder) CIPEncapsulationReadResponseBuilder
-	// WithArgPacketLen sets a parser argument
-	WithArgPacketLen(uint16) CIPEncapsulationReadResponseBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() CIPEncapsulationPacketBuilder
 	// Build builds the CIPEncapsulationReadResponse or returns an error if something is wrong
@@ -139,11 +134,6 @@ func (b *_CIPEncapsulationReadResponseBuilder) WithResponseBuilder(builderSuppli
 	return b
 }
 
-func (b *_CIPEncapsulationReadResponseBuilder) WithArgPacketLen(packetLen uint16) CIPEncapsulationReadResponseBuilder {
-	b.PacketLen = packetLen
-	return b
-}
-
 func (b *_CIPEncapsulationReadResponseBuilder) Build() (CIPEncapsulationReadResponse, error) {
 	if b.Response == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'response' not set"))
@@ -308,16 +298,6 @@ func (m *_CIPEncapsulationReadResponse) SerializeWithWriteBuffer(ctx context.Con
 	return m.CIPEncapsulationPacketContract.(*_CIPEncapsulationPacket).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_CIPEncapsulationReadResponse) GetPacketLen() uint16 {
-	return m.PacketLen
-}
-
-//
-////
-
 func (m *_CIPEncapsulationReadResponse) IsCIPEncapsulationReadResponse() {}
 
 func (m *_CIPEncapsulationReadResponse) DeepCopy() any {
@@ -331,7 +311,6 @@ func (m *_CIPEncapsulationReadResponse) deepCopy() *_CIPEncapsulationReadRespons
 	_CIPEncapsulationReadResponseCopy := &_CIPEncapsulationReadResponse{
 		m.CIPEncapsulationPacketContract.(*_CIPEncapsulationPacket).deepCopy(),
 		utils.DeepCopy[DF1ResponseMessage](m.Response),
-		m.PacketLen,
 	}
 	_CIPEncapsulationReadResponseCopy.CIPEncapsulationPacketContract.(*_CIPEncapsulationPacket)._SubType = m
 	return _CIPEncapsulationReadResponseCopy
diff --git a/plc4go/protocols/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go b/plc4go/protocols/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
index 8f23db5cf8f..da7a1a54785 100644
--- a/plc4go/protocols/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
+++ b/plc4go/protocols/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
@@ -59,9 +59,9 @@ var _ DF1CommandResponseMessageProtectedTypedLogicalRead = (*_DF1CommandResponse
 var _ DF1ResponseMessageRequirements = (*_DF1CommandResponseMessageProtectedTypedLogicalRead)(nil)
 
 // NewDF1CommandResponseMessageProtectedTypedLogicalRead factory function for _DF1CommandResponseMessageProtectedTypedLogicalRead
-func NewDF1CommandResponseMessageProtectedTypedLogicalRead(destinationAddress uint8, sourceAddress uint8, status uint8, transactionCounter uint16, data []uint8, payloadLength uint16) *_DF1CommandResponseMessageProtectedTypedLogicalRead {
+func NewDF1CommandResponseMessageProtectedTypedLogicalRead(destinationAddress uint8, sourceAddress uint8, status uint8, transactionCounter uint16, data []uint8) *_DF1CommandResponseMessageProtectedTypedLogicalRead {
 	_result := &_DF1CommandResponseMessageProtectedTypedLogicalRead{
-		DF1ResponseMessageContract: NewDF1ResponseMessage(destinationAddress, sourceAddress, status, transactionCounter, payloadLength),
+		DF1ResponseMessageContract: NewDF1ResponseMessage(destinationAddress, sourceAddress, status, transactionCounter),
 		Data:                       data,
 	}
 	_result.DF1ResponseMessageContract.(*_DF1ResponseMessage)._SubType = _result
diff --git a/plc4go/protocols/abeth/readwrite/model/DF1RequestCommand.go b/plc4go/protocols/abeth/readwrite/model/DF1RequestCommand.go
index 7d2962a005b..cb762a90fde 100644
--- a/plc4go/protocols/abeth/readwrite/model/DF1RequestCommand.go
+++ b/plc4go/protocols/abeth/readwrite/model/DF1RequestCommand.go
@@ -241,7 +241,7 @@ func DF1RequestCommandParseWithBufferProducer[T DF1RequestCommand]() func(ctx co
 }
 
 func DF1RequestCommandParseWithBuffer[T DF1RequestCommand](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_DF1RequestCommand{}).parse(ctx, readBuffer)
+	v, err := (new(_DF1RequestCommand)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/abeth/readwrite/model/DF1RequestMessage.go b/plc4go/protocols/abeth/readwrite/model/DF1RequestMessage.go
index 72c4c955989..e59b3b7554b 100644
--- a/plc4go/protocols/abeth/readwrite/model/DF1RequestMessage.go
+++ b/plc4go/protocols/abeth/readwrite/model/DF1RequestMessage.go
@@ -324,7 +324,7 @@ func DF1RequestMessageParseWithBufferProducer[T DF1RequestMessage]() func(ctx co
 }
 
 func DF1RequestMessageParseWithBuffer[T DF1RequestMessage](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_DF1RequestMessage{}).parse(ctx, readBuffer)
+	v, err := (new(_DF1RequestMessage)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/abeth/readwrite/model/DF1ResponseMessage.go b/plc4go/protocols/abeth/readwrite/model/DF1ResponseMessage.go
index 0fad2d12e29..eb7747af1cd 100644
--- a/plc4go/protocols/abeth/readwrite/model/DF1ResponseMessage.go
+++ b/plc4go/protocols/abeth/readwrite/model/DF1ResponseMessage.go
@@ -58,8 +58,6 @@ type DF1ResponseMessageContract interface {
 	GetStatus() uint8
 	// GetTransactionCounter returns TransactionCounter (property field)
 	GetTransactionCounter() uint16
-	// GetPayloadLength() returns a parser argument
-	GetPayloadLength() uint16
 	// IsDF1ResponseMessage is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsDF1ResponseMessage()
 	// CreateBuilder creates a DF1ResponseMessageBuilder
@@ -84,9 +82,6 @@ type _DF1ResponseMessage struct {
 	SourceAddress      uint8
 	Status             uint8
 	TransactionCounter uint16
-
-	// Arguments.
-	PayloadLength uint16
 	// Reserved Fields
 	reservedField0 *uint8
 	reservedField1 *uint8
@@ -95,8 +90,8 @@ type _DF1ResponseMessage struct {
 var _ DF1ResponseMessageContract = (*_DF1ResponseMessage)(nil)
 
 // NewDF1ResponseMessage factory function for _DF1ResponseMessage
-func NewDF1ResponseMessage(destinationAddress uint8, sourceAddress uint8, status uint8, transactionCounter uint16, payloadLength uint16) *_DF1ResponseMessage {
-	return &_DF1ResponseMessage{DestinationAddress: destinationAddress, SourceAddress: sourceAddress, Status: status, TransactionCounter: transactionCounter, PayloadLength: payloadLength}
+func NewDF1ResponseMessage(destinationAddress uint8, sourceAddress uint8, status uint8, transactionCounter uint16) *_DF1ResponseMessage {
+	return &_DF1ResponseMessage{DestinationAddress: destinationAddress, SourceAddress: sourceAddress, Status: status, TransactionCounter: transactionCounter}
 }
 
 ///////////////////////////////////////////////////////////
@@ -117,8 +112,6 @@ type DF1ResponseMessageBuilder interface {
 	WithStatus(uint8) DF1ResponseMessageBuilder
 	// WithTransactionCounter adds TransactionCounter (property field)
 	WithTransactionCounter(uint16) DF1ResponseMessageBuilder
-	// WithArgPayloadLength sets a parser argument
-	WithArgPayloadLength(uint16) DF1ResponseMessageBuilder
 	// AsDF1CommandResponseMessageProtectedTypedLogicalRead converts this build to a subType of DF1ResponseMessage. It is always possible to return to current builder using Done()
 	AsDF1CommandResponseMessageProtectedTypedLogicalRead() DF1CommandResponseMessageProtectedTypedLogicalReadBuilder
 	// Build builds the DF1ResponseMessage or returns an error if something is wrong
@@ -176,11 +169,6 @@ func (b *_DF1ResponseMessageBuilder) WithTransactionCounter(transactionCounter u
 	return b
 }
 
-func (b *_DF1ResponseMessageBuilder) WithArgPayloadLength(payloadLength uint16) DF1ResponseMessageBuilder {
-	b.PayloadLength = payloadLength
-	return b
-}
-
 func (b *_DF1ResponseMessageBuilder) PartialBuild() (DF1ResponseMessageContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -340,7 +328,7 @@ func DF1ResponseMessageParseWithBufferProducer[T DF1ResponseMessage](payloadLeng
 }
 
 func DF1ResponseMessageParseWithBuffer[T DF1ResponseMessage](ctx context.Context, readBuffer utils.ReadBuffer, payloadLength uint16) (T, error) {
-	v, err := (&_DF1ResponseMessage{PayloadLength: payloadLength}).parse(ctx, readBuffer, payloadLength)
+	v, err := (new(_DF1ResponseMessage)).parse(ctx, readBuffer, payloadLength)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -472,16 +460,6 @@ func (pm *_DF1ResponseMessage) serializeParent(ctx context.Context, writeBuffer
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_DF1ResponseMessage) GetPayloadLength() uint16 {
-	return m.PayloadLength
-}
-
-//
-////
-
 func (m *_DF1ResponseMessage) IsDF1ResponseMessage() {}
 
 func (m *_DF1ResponseMessage) DeepCopy() any {
@@ -498,7 +476,6 @@ func (m *_DF1ResponseMessage) deepCopy() *_DF1ResponseMessage {
 		m.SourceAddress,
 		m.Status,
 		m.TransactionCounter,
-		m.PayloadLength,
 		m.reservedField0,
 		m.reservedField1,
 	}
diff --git a/plc4go/protocols/ads/discovery/readwrite/ParserHelper.go b/plc4go/protocols/ads/discovery/readwrite/ParserHelper.go
index 00c6b44047a..1ba0fef5a85 100644
--- a/plc4go/protocols/ads/discovery/readwrite/ParserHelper.go
+++ b/plc4go/protocols/ads/discovery/readwrite/ParserHelper.go
@@ -39,8 +39,6 @@ func (m AdsDiscoveryParserHelper) Parse(typeName string, arguments []string, io
 		return AdsDiscoveryParseWithBuffer(context.Background(), io)
 	case "AdsDiscoveryBlock":
 		return AdsDiscoveryBlockParseWithBuffer[AdsDiscoveryBlock](context.Background(), io)
-	case "AdsDiscoveryConstants":
-		return AdsDiscoveryConstantsParseWithBuffer(context.Background(), io)
 	case "AmsNetId":
 		return AmsNetIdParseWithBuffer(context.Background(), io)
 	case "AmsString":
diff --git a/plc4go/protocols/ads/discovery/readwrite/XmlParserHelper.go b/plc4go/protocols/ads/discovery/readwrite/XmlParserHelper.go
index 0617588c59c..ccd2bce2abc 100644
--- a/plc4go/protocols/ads/discovery/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/ads/discovery/readwrite/XmlParserHelper.go
@@ -49,8 +49,6 @@ func (m AdsDiscoveryXmlParserHelper) Parse(typeName string, xmlString string, pa
 		return AdsDiscoveryParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
 	case "AdsDiscoveryBlock":
 		return AdsDiscoveryBlockParseWithBuffer[AdsDiscoveryBlock](context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
-	case "AdsDiscoveryConstants":
-		return AdsDiscoveryConstantsParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
 	case "AmsNetId":
 		return AmsNetIdParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
 	case "AmsString":
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscovery.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscovery.go
index 5a987b4024d..0907277ca6c 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscovery.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscovery.go
@@ -304,7 +304,7 @@ func AdsDiscoveryParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func AdsDiscoveryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AdsDiscovery, error) {
-	v, err := (&_AdsDiscovery{}).parse(ctx, readBuffer)
+	v, err := (new(_AdsDiscovery)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlock.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlock.go
index f9f4aa40174..78519ac85f2 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlock.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlock.go
@@ -337,7 +337,7 @@ func AdsDiscoveryBlockParseWithBufferProducer[T AdsDiscoveryBlock]() func(ctx co
 }
 
 func AdsDiscoveryBlockParseWithBuffer[T AdsDiscoveryBlock](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_AdsDiscoveryBlock{}).parse(ctx, readBuffer)
+	v, err := (new(_AdsDiscoveryBlock)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AmsNetId.go b/plc4go/protocols/ads/discovery/readwrite/model/AmsNetId.go
index f092d8ffb55..86005ea42b6 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AmsNetId.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AmsNetId.go
@@ -274,7 +274,7 @@ func AmsNetIdParseWithBufferProducer() func(ctx context.Context, readBuffer util
 }
 
 func AmsNetIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AmsNetId, error) {
-	v, err := (&_AmsNetId{}).parse(ctx, readBuffer)
+	v, err := (new(_AmsNetId)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AmsString.go b/plc4go/protocols/ads/discovery/readwrite/model/AmsString.go
index cdf9ee81766..df2a52b04b6 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AmsString.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AmsString.go
@@ -198,7 +198,7 @@ func AmsStringParseWithBufferProducer() func(ctx context.Context, readBuffer uti
 }
 
 func AmsStringParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AmsString, error) {
-	v, err := (&_AmsString{}).parse(ctx, readBuffer)
+	v, err := (new(_AmsString)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/Constants.go b/plc4go/protocols/ads/discovery/readwrite/model/Constants.go
new file mode 100644
index 00000000000..a994f20855b
--- /dev/null
+++ b/plc4go/protocols/ads/discovery/readwrite/model/Constants.go
@@ -0,0 +1,24 @@
+/*
+ * 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 model
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Constant values.
+var Constant_ADSDISCOVERYUDPDEFAULTPORT uint16 = uint16(48899)
diff --git a/plc4go/protocols/ads/readwrite/ParserHelper.go b/plc4go/protocols/ads/readwrite/ParserHelper.go
index 820fc70a6bc..db0f52655a2 100644
--- a/plc4go/protocols/ads/readwrite/ParserHelper.go
+++ b/plc4go/protocols/ads/readwrite/ParserHelper.go
@@ -67,8 +67,6 @@ func (m AdsParserHelper) Parse(typeName string, arguments []string, io utils.Rea
 		return AmsSerialResetFrameParseWithBuffer(context.Background(), io)
 	case "AdsDataTypeTableChildEntry":
 		return AdsDataTypeTableChildEntryParseWithBuffer(context.Background(), io)
-	case "AdsConstants":
-		return AdsConstantsParseWithBuffer(context.Background(), io)
 	case "AdsNotificationSample":
 		return AdsNotificationSampleParseWithBuffer(context.Background(), io)
 	case "AdsSymbolTableEntry":
diff --git a/plc4go/protocols/ads/readwrite/XmlParserHelper.go b/plc4go/protocols/ads/readwrite/XmlParserHelper.go
index 3a9228d9cb4..c0ca6d218ff 100644
--- a/plc4go/protocols/ads/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/ads/readwrite/XmlParserHelper.go
@@ -79,8 +79,6 @@ func (m AdsXmlParserHelper) Parse(typeName string, xmlString string, parserArgum
 		return AmsSerialResetFrameParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
 	case "AdsDataTypeTableChildEntry":
 		return AdsDataTypeTableChildEntryParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
-	case "AdsConstants":
-		return AdsConstantsParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
 	case "AdsNotificationSample":
 		return AdsNotificationSampleParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
 	case "AdsSymbolTableEntry":
diff --git a/plc4go/protocols/ads/readwrite/model/AdsDataTypeArrayInfo.go b/plc4go/protocols/ads/readwrite/model/AdsDataTypeArrayInfo.go
index 864c2a54395..ddd4b995575 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsDataTypeArrayInfo.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsDataTypeArrayInfo.go
@@ -227,7 +227,7 @@ func AdsDataTypeArrayInfoParseWithBufferProducer() func(ctx context.Context, rea
 }
 
 func AdsDataTypeArrayInfoParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AdsDataTypeArrayInfo, error) {
-	v, err := (&_AdsDataTypeArrayInfo{}).parse(ctx, readBuffer)
+	v, err := (new(_AdsDataTypeArrayInfo)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableChildEntry.go b/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableChildEntry.go
index 2859b122055..befcbe9d37c 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableChildEntry.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableChildEntry.go
@@ -502,7 +502,7 @@ func AdsDataTypeTableChildEntryParseWithBufferProducer() func(ctx context.Contex
 }
 
 func AdsDataTypeTableChildEntryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AdsDataTypeTableChildEntry, error) {
-	v, err := (&_AdsDataTypeTableChildEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_AdsDataTypeTableChildEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableEntry.go b/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableEntry.go
index 322b9fa6127..826142c77de 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableEntry.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableEntry.go
@@ -502,7 +502,7 @@ func AdsDataTypeTableEntryParseWithBufferProducer() func(ctx context.Context, re
 }
 
 func AdsDataTypeTableEntryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AdsDataTypeTableEntry, error) {
-	v, err := (&_AdsDataTypeTableEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_AdsDataTypeTableEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItem.go b/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItem.go
index aa28de5f150..a18e4a89756 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItem.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItem.go
@@ -261,7 +261,7 @@ func AdsMultiRequestItemParseWithBufferProducer[T AdsMultiRequestItem](indexGrou
 }
 
 func AdsMultiRequestItemParseWithBuffer[T AdsMultiRequestItem](ctx context.Context, readBuffer utils.ReadBuffer, indexGroup uint32) (T, error) {
-	v, err := (&_AdsMultiRequestItem{}).parse(ctx, readBuffer, indexGroup)
+	v, err := (new(_AdsMultiRequestItem)).parse(ctx, readBuffer, indexGroup)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/ads/readwrite/model/AdsNotificationSample.go b/plc4go/protocols/ads/readwrite/model/AdsNotificationSample.go
index 17b118707bc..837d15ef0b7 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsNotificationSample.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsNotificationSample.go
@@ -225,7 +225,7 @@ func AdsNotificationSampleParseWithBufferProducer() func(ctx context.Context, re
 }
 
 func AdsNotificationSampleParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AdsNotificationSample, error) {
-	v, err := (&_AdsNotificationSample{}).parse(ctx, readBuffer)
+	v, err := (new(_AdsNotificationSample)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/ads/readwrite/model/AdsStampHeader.go b/plc4go/protocols/ads/readwrite/model/AdsStampHeader.go
index 3eee9f5f029..f8239dbe93b 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsStampHeader.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsStampHeader.go
@@ -228,7 +228,7 @@ func AdsStampHeaderParseWithBufferProducer() func(ctx context.Context, readBuffe
 }
 
 func AdsStampHeaderParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AdsStampHeader, error) {
-	v, err := (&_AdsStampHeader{}).parse(ctx, readBuffer)
+	v, err := (new(_AdsStampHeader)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/ads/readwrite/model/AdsSymbolTableEntry.go b/plc4go/protocols/ads/readwrite/model/AdsSymbolTableEntry.go
index 316886be388..4f36490f552 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsSymbolTableEntry.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsSymbolTableEntry.go
@@ -603,7 +603,7 @@ func AdsSymbolTableEntryParseWithBufferProducer() func(ctx context.Context, read
 }
 
 func AdsSymbolTableEntryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AdsSymbolTableEntry, error) {
-	v, err := (&_AdsSymbolTableEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_AdsSymbolTableEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/ads/readwrite/model/AdsTableSizes.go b/plc4go/protocols/ads/readwrite/model/AdsTableSizes.go
index 0fb92d06698..88b9736a500 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsTableSizes.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsTableSizes.go
@@ -276,7 +276,7 @@ func AdsTableSizesParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func AdsTableSizesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AdsTableSizes, error) {
-	v, err := (&_AdsTableSizes{}).parse(ctx, readBuffer)
+	v, err := (new(_AdsTableSizes)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/ads/readwrite/model/AmsNetId.go b/plc4go/protocols/ads/readwrite/model/AmsNetId.go
index f092d8ffb55..86005ea42b6 100644
--- a/plc4go/protocols/ads/readwrite/model/AmsNetId.go
+++ b/plc4go/protocols/ads/readwrite/model/AmsNetId.go
@@ -274,7 +274,7 @@ func AmsNetIdParseWithBufferProducer() func(ctx context.Context, readBuffer util
 }
 
 func AmsNetIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AmsNetId, error) {
-	v, err := (&_AmsNetId{}).parse(ctx, readBuffer)
+	v, err := (new(_AmsNetId)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/ads/readwrite/model/AmsPacket.go b/plc4go/protocols/ads/readwrite/model/AmsPacket.go
index 269e928a5fd..4ada4df0786 100644
--- a/plc4go/protocols/ads/readwrite/model/AmsPacket.go
+++ b/plc4go/protocols/ads/readwrite/model/AmsPacket.go
@@ -718,7 +718,7 @@ func AmsPacketParseWithBufferProducer[T AmsPacket]() func(ctx context.Context, r
 }
 
 func AmsPacketParseWithBuffer[T AmsPacket](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_AmsPacket{}).parse(ctx, readBuffer)
+	v, err := (new(_AmsPacket)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/ads/readwrite/model/AmsSerialAcknowledgeFrame.go b/plc4go/protocols/ads/readwrite/model/AmsSerialAcknowledgeFrame.go
index a5b130e0cda..5851a17f9cb 100644
--- a/plc4go/protocols/ads/readwrite/model/AmsSerialAcknowledgeFrame.go
+++ b/plc4go/protocols/ads/readwrite/model/AmsSerialAcknowledgeFrame.go
@@ -274,7 +274,7 @@ func AmsSerialAcknowledgeFrameParseWithBufferProducer() func(ctx context.Context
 }
 
 func AmsSerialAcknowledgeFrameParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AmsSerialAcknowledgeFrame, error) {
-	v, err := (&_AmsSerialAcknowledgeFrame{}).parse(ctx, readBuffer)
+	v, err := (new(_AmsSerialAcknowledgeFrame)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/ads/readwrite/model/AmsSerialFrame.go b/plc4go/protocols/ads/readwrite/model/AmsSerialFrame.go
index 0d5ee529d78..f2fa6ad4fa9 100644
--- a/plc4go/protocols/ads/readwrite/model/AmsSerialFrame.go
+++ b/plc4go/protocols/ads/readwrite/model/AmsSerialFrame.go
@@ -309,7 +309,7 @@ func AmsSerialFrameParseWithBufferProducer() func(ctx context.Context, readBuffe
 }
 
 func AmsSerialFrameParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AmsSerialFrame, error) {
-	v, err := (&_AmsSerialFrame{}).parse(ctx, readBuffer)
+	v, err := (new(_AmsSerialFrame)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/ads/readwrite/model/AmsSerialResetFrame.go b/plc4go/protocols/ads/readwrite/model/AmsSerialResetFrame.go
index accece5d4eb..0c2fec3100b 100644
--- a/plc4go/protocols/ads/readwrite/model/AmsSerialResetFrame.go
+++ b/plc4go/protocols/ads/readwrite/model/AmsSerialResetFrame.go
@@ -274,7 +274,7 @@ func AmsSerialResetFrameParseWithBufferProducer() func(ctx context.Context, read
 }
 
 func AmsSerialResetFrameParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AmsSerialResetFrame, error) {
-	v, err := (&_AmsSerialResetFrame{}).parse(ctx, readBuffer)
+	v, err := (new(_AmsSerialResetFrame)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/ads/readwrite/model/AmsTCPPacket.go b/plc4go/protocols/ads/readwrite/model/AmsTCPPacket.go
index 0513431c0f1..df7855e4906 100644
--- a/plc4go/protocols/ads/readwrite/model/AmsTCPPacket.go
+++ b/plc4go/protocols/ads/readwrite/model/AmsTCPPacket.go
@@ -217,7 +217,7 @@ func AmsTCPPacketParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func AmsTCPPacketParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AmsTCPPacket, error) {
-	v, err := (&_AmsTCPPacket{}).parse(ctx, readBuffer)
+	v, err := (new(_AmsTCPPacket)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/ads/readwrite/model/Constants.go b/plc4go/protocols/ads/readwrite/model/Constants.go
new file mode 100644
index 00000000000..fb89c0dfc8f
--- /dev/null
+++ b/plc4go/protocols/ads/readwrite/model/Constants.go
@@ -0,0 +1,24 @@
+/*
+ * 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 model
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Constant values.
+var Constant_ADSTCPDEFAULTPORT uint16 = uint16(48898)
diff --git a/plc4go/protocols/bacnetip/readwrite/ParserHelper.go b/plc4go/protocols/bacnetip/readwrite/ParserHelper.go
index ff36f50cb20..bef4ab8e443 100644
--- a/plc4go/protocols/bacnetip/readwrite/ParserHelper.go
+++ b/plc4go/protocols/bacnetip/readwrite/ParserHelper.go
@@ -1193,8 +1193,6 @@ func (m BacnetipParserHelper) Parse(typeName string, arguments []string, io util
 		}
 		tagClass, _ := TagClassByName(arguments[1])
 		return ErrorCodeTaggedParseWithBuffer(context.Background(), io, tagNumber, tagClass)
-	case "BacnetConstants":
-		return BacnetConstantsParseWithBuffer(context.Background(), io)
 	case "BACnetPolarityTagged":
 		tagNumber, err := utils.StrToUint8(arguments[0])
 		if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/XmlParserHelper.go b/plc4go/protocols/bacnetip/readwrite/XmlParserHelper.go
index e6275e708f4..1ce70147123 100644
--- a/plc4go/protocols/bacnetip/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/bacnetip/readwrite/XmlParserHelper.go
@@ -1352,8 +1352,6 @@ func (m BacnetipXmlParserHelper) Parse(typeName string, xmlString string, parser
 		tagNumber := uint8(parsedUint0)
 		tagClass, _ := TagClassByName(parserArguments[1])
 		return ErrorCodeTaggedParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), tagNumber, tagClass)
-	case "BacnetConstants":
-		return BacnetConstantsParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
 	case "BACnetPolarityTagged":
 		parsedUint0, err := strconv.ParseUint(parserArguments[0], 10, 8)
 		if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDU.go b/plc4go/protocols/bacnetip/readwrite/model/APDU.go
index 5f87745e584..6fa3fc21ef8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDU.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDU.go
@@ -50,8 +50,6 @@ type APDU interface {
 
 // APDUContract provides a set of functions which can be overwritten by a sub struct
 type APDUContract interface {
-	// GetApduLength() returns a parser argument
-	GetApduLength() uint16
 	// IsAPDU is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsAPDU()
 	// CreateBuilder creates a APDUBuilder
@@ -72,16 +70,13 @@ type _APDU struct {
 		APDUContract
 		APDURequirements
 	}
-
-	// Arguments.
-	ApduLength uint16
 }
 
 var _ APDUContract = (*_APDU)(nil)
 
 // NewAPDU factory function for _APDU
-func NewAPDU(apduLength uint16) *_APDU {
-	return &_APDU{ApduLength: apduLength}
+func NewAPDU() *_APDU {
+	return &_APDU{}
 }
 
 ///////////////////////////////////////////////////////////
@@ -94,8 +89,6 @@ type APDUBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
 	WithMandatoryFields() APDUBuilder
-	// WithArgApduLength sets a parser argument
-	WithArgApduLength(uint16) APDUBuilder
 	// AsAPDUConfirmedRequest converts this build to a subType of APDU. It is always possible to return to current builder using Done()
 	AsAPDUConfirmedRequest() APDUConfirmedRequestBuilder
 	// AsAPDUUnconfirmedRequest converts this build to a subType of APDU. It is always possible to return to current builder using Done()
@@ -149,11 +142,6 @@ func (b *_APDUBuilder) WithMandatoryFields() APDUBuilder {
 	return b
 }
 
-func (b *_APDUBuilder) WithArgApduLength(apduLength uint16) APDUBuilder {
-	b.ApduLength = apduLength
-	return b
-}
-
 func (b *_APDUBuilder) PartialBuild() (APDUContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -349,7 +337,7 @@ func APDUParseWithBufferProducer[T APDU](apduLength uint16) func(ctx context.Con
 }
 
 func APDUParseWithBuffer[T APDU](ctx context.Context, readBuffer utils.ReadBuffer, apduLength uint16) (T, error) {
-	v, err := (&_APDU{ApduLength: apduLength}).parse(ctx, readBuffer, apduLength)
+	v, err := (new(_APDU)).parse(ctx, readBuffer, apduLength)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -453,16 +441,6 @@ func (pm *_APDU) serializeParent(ctx context.Context, writeBuffer utils.WriteBuf
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_APDU) GetApduLength() uint16 {
-	return m.ApduLength
-}
-
-//
-////
-
 func (m *_APDU) IsAPDU() {}
 
 func (m *_APDU) DeepCopy() any {
@@ -475,7 +453,6 @@ func (m *_APDU) deepCopy() *_APDU {
 	}
 	_APDUCopy := &_APDU{
 		nil, // will be set by child
-		m.ApduLength,
 	}
 	return _APDUCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUAbort.go b/plc4go/protocols/bacnetip/readwrite/model/APDUAbort.go
index 3cdefa2403f..8eca5ebd74f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUAbort.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUAbort.go
@@ -67,12 +67,12 @@ var _ APDUAbort = (*_APDUAbort)(nil)
 var _ APDURequirements = (*_APDUAbort)(nil)
 
 // NewAPDUAbort factory function for _APDUAbort
-func NewAPDUAbort(server bool, originalInvokeId uint8, abortReason BACnetAbortReasonTagged, apduLength uint16) *_APDUAbort {
+func NewAPDUAbort(server bool, originalInvokeId uint8, abortReason BACnetAbortReasonTagged) *_APDUAbort {
 	if abortReason == nil {
 		panic("abortReason of type BACnetAbortReasonTagged for APDUAbort must not be nil")
 	}
 	_result := &_APDUAbort{
-		APDUContract:     NewAPDU(apduLength),
+		APDUContract:     NewAPDU(),
 		Server:           server,
 		OriginalInvokeId: originalInvokeId,
 		AbortReason:      abortReason,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUComplexAck.go b/plc4go/protocols/bacnetip/readwrite/model/APDUComplexAck.go
index f55b1ae9f4b..b0bf0aa431a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUComplexAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUComplexAck.go
@@ -86,9 +86,9 @@ var _ APDUComplexAck = (*_APDUComplexAck)(nil)
 var _ APDURequirements = (*_APDUComplexAck)(nil)
 
 // NewAPDUComplexAck factory function for _APDUComplexAck
-func NewAPDUComplexAck(segmentedMessage bool, moreFollows bool, originalInvokeId uint8, sequenceNumber *uint8, proposedWindowSize *uint8, serviceAck BACnetServiceAck, segmentServiceChoice *BACnetConfirmedServiceChoice, segment []byte, apduLength uint16) *_APDUComplexAck {
+func NewAPDUComplexAck(segmentedMessage bool, moreFollows bool, originalInvokeId uint8, sequenceNumber *uint8, proposedWindowSize *uint8, serviceAck BACnetServiceAck, segmentServiceChoice *BACnetConfirmedServiceChoice, segment []byte) *_APDUComplexAck {
 	_result := &_APDUComplexAck{
-		APDUContract:         NewAPDU(apduLength),
+		APDUContract:         NewAPDU(),
 		SegmentedMessage:     segmentedMessage,
 		MoreFollows:          moreFollows,
 		OriginalInvokeId:     originalInvokeId,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUConfirmedRequest.go b/plc4go/protocols/bacnetip/readwrite/model/APDUConfirmedRequest.go
index 4294acceab2..f130294840c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUConfirmedRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUConfirmedRequest.go
@@ -95,9 +95,9 @@ var _ APDUConfirmedRequest = (*_APDUConfirmedRequest)(nil)
 var _ APDURequirements = (*_APDUConfirmedRequest)(nil)
 
 // NewAPDUConfirmedRequest factory function for _APDUConfirmedRequest
-func NewAPDUConfirmedRequest(segmentedMessage bool, moreFollows bool, segmentedResponseAccepted bool, maxSegmentsAccepted MaxSegmentsAccepted, maxApduLengthAccepted MaxApduLengthAccepted, invokeId uint8, sequenceNumber *uint8, proposedWindowSize *uint8, serviceRequest BACnetConfirmedServiceRequest, segmentServiceChoice *BACnetConfirmedServiceChoice, segment []byte, apduLength uint16) *_APDUConfirmedRequest {
+func NewAPDUConfirmedRequest(segmentedMessage bool, moreFollows bool, segmentedResponseAccepted bool, maxSegmentsAccepted MaxSegmentsAccepted, maxApduLengthAccepted MaxApduLengthAccepted, invokeId uint8, sequenceNumber *uint8, proposedWindowSize *uint8, serviceRequest BACnetConfirmedServiceRequest, segmentServiceChoice *BACnetConfirmedServiceChoice, segment []byte) *_APDUConfirmedRequest {
 	_result := &_APDUConfirmedRequest{
-		APDUContract:              NewAPDU(apduLength),
+		APDUContract:              NewAPDU(),
 		SegmentedMessage:          segmentedMessage,
 		MoreFollows:               moreFollows,
 		SegmentedResponseAccepted: segmentedResponseAccepted,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUError.go b/plc4go/protocols/bacnetip/readwrite/model/APDUError.go
index 8ad1e444591..eb70cf21912 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUError.go
@@ -67,12 +67,12 @@ var _ APDUError = (*_APDUError)(nil)
 var _ APDURequirements = (*_APDUError)(nil)
 
 // NewAPDUError factory function for _APDUError
-func NewAPDUError(originalInvokeId uint8, errorChoice BACnetConfirmedServiceChoice, error BACnetError, apduLength uint16) *_APDUError {
+func NewAPDUError(originalInvokeId uint8, errorChoice BACnetConfirmedServiceChoice, error BACnetError) *_APDUError {
 	if error == nil {
 		panic("error of type BACnetError for APDUError must not be nil")
 	}
 	_result := &_APDUError{
-		APDUContract:     NewAPDU(apduLength),
+		APDUContract:     NewAPDU(),
 		OriginalInvokeId: originalInvokeId,
 		ErrorChoice:      errorChoice,
 		Error:            error,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUReject.go b/plc4go/protocols/bacnetip/readwrite/model/APDUReject.go
index 5e61ed45ca5..e8ef1c3788b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUReject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUReject.go
@@ -64,12 +64,12 @@ var _ APDUReject = (*_APDUReject)(nil)
 var _ APDURequirements = (*_APDUReject)(nil)
 
 // NewAPDUReject factory function for _APDUReject
-func NewAPDUReject(originalInvokeId uint8, rejectReason BACnetRejectReasonTagged, apduLength uint16) *_APDUReject {
+func NewAPDUReject(originalInvokeId uint8, rejectReason BACnetRejectReasonTagged) *_APDUReject {
 	if rejectReason == nil {
 		panic("rejectReason of type BACnetRejectReasonTagged for APDUReject must not be nil")
 	}
 	_result := &_APDUReject{
-		APDUContract:     NewAPDU(apduLength),
+		APDUContract:     NewAPDU(),
 		OriginalInvokeId: originalInvokeId,
 		RejectReason:     rejectReason,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUSegmentAck.go b/plc4go/protocols/bacnetip/readwrite/model/APDUSegmentAck.go
index 457258c4047..d068078a2e4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUSegmentAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUSegmentAck.go
@@ -73,9 +73,9 @@ var _ APDUSegmentAck = (*_APDUSegmentAck)(nil)
 var _ APDURequirements = (*_APDUSegmentAck)(nil)
 
 // NewAPDUSegmentAck factory function for _APDUSegmentAck
-func NewAPDUSegmentAck(negativeAck bool, server bool, originalInvokeId uint8, sequenceNumber uint8, actualWindowSize uint8, apduLength uint16) *_APDUSegmentAck {
+func NewAPDUSegmentAck(negativeAck bool, server bool, originalInvokeId uint8, sequenceNumber uint8, actualWindowSize uint8) *_APDUSegmentAck {
 	_result := &_APDUSegmentAck{
-		APDUContract:     NewAPDU(apduLength),
+		APDUContract:     NewAPDU(),
 		NegativeAck:      negativeAck,
 		Server:           server,
 		OriginalInvokeId: originalInvokeId,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUSimpleAck.go b/plc4go/protocols/bacnetip/readwrite/model/APDUSimpleAck.go
index 603ca10e02a..f9504926f37 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUSimpleAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUSimpleAck.go
@@ -64,9 +64,9 @@ var _ APDUSimpleAck = (*_APDUSimpleAck)(nil)
 var _ APDURequirements = (*_APDUSimpleAck)(nil)
 
 // NewAPDUSimpleAck factory function for _APDUSimpleAck
-func NewAPDUSimpleAck(originalInvokeId uint8, serviceChoice BACnetConfirmedServiceChoice, apduLength uint16) *_APDUSimpleAck {
+func NewAPDUSimpleAck(originalInvokeId uint8, serviceChoice BACnetConfirmedServiceChoice) *_APDUSimpleAck {
 	_result := &_APDUSimpleAck{
-		APDUContract:     NewAPDU(apduLength),
+		APDUContract:     NewAPDU(),
 		OriginalInvokeId: originalInvokeId,
 		ServiceChoice:    serviceChoice,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUUnconfirmedRequest.go b/plc4go/protocols/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
index 255dcabceaa..7e2ee6f5891 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
@@ -61,12 +61,12 @@ var _ APDUUnconfirmedRequest = (*_APDUUnconfirmedRequest)(nil)
 var _ APDURequirements = (*_APDUUnconfirmedRequest)(nil)
 
 // NewAPDUUnconfirmedRequest factory function for _APDUUnconfirmedRequest
-func NewAPDUUnconfirmedRequest(serviceRequest BACnetUnconfirmedServiceRequest, apduLength uint16) *_APDUUnconfirmedRequest {
+func NewAPDUUnconfirmedRequest(serviceRequest BACnetUnconfirmedServiceRequest) *_APDUUnconfirmedRequest {
 	if serviceRequest == nil {
 		panic("serviceRequest of type BACnetUnconfirmedServiceRequest for APDUUnconfirmedRequest must not be nil")
 	}
 	_result := &_APDUUnconfirmedRequest{
-		APDUContract:   NewAPDU(apduLength),
+		APDUContract:   NewAPDU(),
 		ServiceRequest: serviceRequest,
 	}
 	_result.APDUContract.(*_APDU)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUUnknown.go b/plc4go/protocols/bacnetip/readwrite/model/APDUUnknown.go
index 6f8114cbbdf..18f7edc0b05 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUUnknown.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUUnknown.go
@@ -62,9 +62,9 @@ var _ APDUUnknown = (*_APDUUnknown)(nil)
 var _ APDURequirements = (*_APDUUnknown)(nil)
 
 // NewAPDUUnknown factory function for _APDUUnknown
-func NewAPDUUnknown(unknownTypeRest uint8, unknownBytes []byte, apduLength uint16) *_APDUUnknown {
+func NewAPDUUnknown(unknownTypeRest uint8, unknownBytes []byte) *_APDUUnknown {
 	_result := &_APDUUnknown{
-		APDUContract:    NewAPDU(apduLength),
+		APDUContract:    NewAPDU(),
 		UnknownTypeRest: unknownTypeRest,
 		UnknownBytes:    unknownBytes,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReasonTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReasonTagged.go
index ba549634a6c..cbcf20c9003 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReasonTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReasonTagged.go
@@ -39,6 +39,8 @@ type BACnetAbortReasonTagged interface {
 	utils.LengthAware
 	utils.Serializable
 	utils.Copyable
+	// GetActualLength returns ActualLength (property field)
+	GetActualLength() uint32
 	// GetValue returns Value (property field)
 	GetValue() BACnetAbortReason
 	// GetProprietaryValue returns ProprietaryValue (property field)
@@ -53,18 +55,16 @@ type BACnetAbortReasonTagged interface {
 
 // _BACnetAbortReasonTagged is the data-structure of this message
 type _BACnetAbortReasonTagged struct {
+	ActualLength     uint32
 	Value            BACnetAbortReason
 	ProprietaryValue uint32
-
-	// Arguments.
-	ActualLength uint32
 }
 
 var _ BACnetAbortReasonTagged = (*_BACnetAbortReasonTagged)(nil)
 
 // NewBACnetAbortReasonTagged factory function for _BACnetAbortReasonTagged
-func NewBACnetAbortReasonTagged(value BACnetAbortReason, proprietaryValue uint32, actualLength uint32) *_BACnetAbortReasonTagged {
-	return &_BACnetAbortReasonTagged{Value: value, ProprietaryValue: proprietaryValue, ActualLength: actualLength}
+func NewBACnetAbortReasonTagged(actualLength uint32, value BACnetAbortReason, proprietaryValue uint32) *_BACnetAbortReasonTagged {
+	return &_BACnetAbortReasonTagged{ActualLength: actualLength, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -76,13 +76,13 @@ func NewBACnetAbortReasonTagged(value BACnetAbortReason, proprietaryValue uint32
 type BACnetAbortReasonTaggedBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
-	WithMandatoryFields(value BACnetAbortReason, proprietaryValue uint32) BACnetAbortReasonTaggedBuilder
+	WithMandatoryFields(actualLength uint32, value BACnetAbortReason, proprietaryValue uint32) BACnetAbortReasonTaggedBuilder
+	// WithActualLength adds ActualLength (property field)
+	WithActualLength(uint32) BACnetAbortReasonTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetAbortReason) BACnetAbortReasonTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetAbortReasonTaggedBuilder
-	// WithArgActualLength sets a parser argument
-	WithArgActualLength(uint32) BACnetAbortReasonTaggedBuilder
 	// Build builds the BACnetAbortReasonTagged or returns an error if something is wrong
 	Build() (BACnetAbortReasonTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -102,8 +102,13 @@ type _BACnetAbortReasonTaggedBuilder struct {
 
 var _ (BACnetAbortReasonTaggedBuilder) = (*_BACnetAbortReasonTaggedBuilder)(nil)
 
-func (b *_BACnetAbortReasonTaggedBuilder) WithMandatoryFields(value BACnetAbortReason, proprietaryValue uint32) BACnetAbortReasonTaggedBuilder {
-	return b.WithValue(value).WithProprietaryValue(proprietaryValue)
+func (b *_BACnetAbortReasonTaggedBuilder) WithMandatoryFields(actualLength uint32, value BACnetAbortReason, proprietaryValue uint32) BACnetAbortReasonTaggedBuilder {
+	return b.WithActualLength(actualLength).WithValue(value).WithProprietaryValue(proprietaryValue)
+}
+
+func (b *_BACnetAbortReasonTaggedBuilder) WithActualLength(actualLength uint32) BACnetAbortReasonTaggedBuilder {
+	b.ActualLength = actualLength
+	return b
 }
 
 func (b *_BACnetAbortReasonTaggedBuilder) WithValue(value BACnetAbortReason) BACnetAbortReasonTaggedBuilder {
@@ -116,11 +121,6 @@ func (b *_BACnetAbortReasonTaggedBuilder) WithProprietaryValue(proprietaryValue
 	return b
 }
 
-func (b *_BACnetAbortReasonTaggedBuilder) WithArgActualLength(actualLength uint32) BACnetAbortReasonTaggedBuilder {
-	b.ActualLength = actualLength
-	return b
-}
-
 func (b *_BACnetAbortReasonTaggedBuilder) Build() (BACnetAbortReasonTagged, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -162,6 +162,10 @@ func (b *_BACnetAbortReasonTagged) CreateBACnetAbortReasonTaggedBuilder() BACnet
 /////////////////////// Accessors for property fields.
 ///////////////////////
 
+func (m *_BACnetAbortReasonTagged) GetActualLength() uint32 {
+	return m.ActualLength
+}
+
 func (m *_BACnetAbortReasonTagged) GetValue() BACnetAbortReason {
 	return m.Value
 }
@@ -234,7 +238,7 @@ func BACnetAbortReasonTaggedParseWithBufferProducer(actualLength uint32) func(ct
 }
 
 func BACnetAbortReasonTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, actualLength uint32) (BACnetAbortReasonTagged, error) {
-	v, err := (&_BACnetAbortReasonTagged{ActualLength: actualLength}).parse(ctx, readBuffer, actualLength)
+	v, err := (new(_BACnetAbortReasonTagged)).parse(ctx, readBuffer, actualLength)
 	if err != nil {
 		return nil, err
 	}
@@ -249,6 +253,7 @@ func (m *_BACnetAbortReasonTagged) parse(ctx context.Context, readBuffer utils.R
 	}
 	currentPos := positionAware.GetPos()
 	_ = currentPos
+	m.ActualLength = actualLength
 
 	value, err := ReadManualField[BACnetAbortReason](ctx, "value", readBuffer, EnsureType[BACnetAbortReason](ReadEnumGeneric(ctx, readBuffer, actualLength, BACnetAbortReason_VENDOR_PROPRIETARY_VALUE)))
 	if err != nil {
@@ -314,16 +319,6 @@ func (m *_BACnetAbortReasonTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAbortReasonTagged) GetActualLength() uint32 {
-	return m.ActualLength
-}
-
-//
-////
-
 func (m *_BACnetAbortReasonTagged) IsBACnetAbortReasonTagged() {}
 
 func (m *_BACnetAbortReasonTagged) DeepCopy() any {
@@ -335,9 +330,9 @@ func (m *_BACnetAbortReasonTagged) deepCopy() *_BACnetAbortReasonTagged {
 		return nil
 	}
 	_BACnetAbortReasonTaggedCopy := &_BACnetAbortReasonTagged{
+		m.ActualLength,
 		m.Value,
 		m.ProprietaryValue,
-		m.ActualLength,
 	}
 	return _BACnetAbortReasonTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisableTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisableTagged.go
index 5a53fe2a30a..646e56fddc3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisableTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisableTagged.go
@@ -59,20 +59,16 @@ type _BACnetAccessAuthenticationFactorDisableTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetAccessAuthenticationFactorDisable
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetAccessAuthenticationFactorDisableTagged = (*_BACnetAccessAuthenticationFactorDisableTagged)(nil)
 
 // NewBACnetAccessAuthenticationFactorDisableTagged factory function for _BACnetAccessAuthenticationFactorDisableTagged
-func NewBACnetAccessAuthenticationFactorDisableTagged(header BACnetTagHeader, value BACnetAccessAuthenticationFactorDisable, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetAccessAuthenticationFactorDisableTagged {
+func NewBACnetAccessAuthenticationFactorDisableTagged(header BACnetTagHeader, value BACnetAccessAuthenticationFactorDisable, proprietaryValue uint32) *_BACnetAccessAuthenticationFactorDisableTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetAccessAuthenticationFactorDisableTagged must not be nil")
 	}
-	return &_BACnetAccessAuthenticationFactorDisableTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetAccessAuthenticationFactorDisableTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetAccessAuthenticationFactorDisableTaggedBuilder interface {
 	WithValue(BACnetAccessAuthenticationFactorDisable) BACnetAccessAuthenticationFactorDisableTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetAccessAuthenticationFactorDisableTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAccessAuthenticationFactorDisableTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetAccessAuthenticationFactorDisableTaggedBuilder
 	// Build builds the BACnetAccessAuthenticationFactorDisableTagged or returns an error if something is wrong
 	Build() (BACnetAccessAuthenticationFactorDisableTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetAccessAuthenticationFactorDisableTaggedBuilder) WithProprietaryV
 	return b
 }
 
-func (b *_BACnetAccessAuthenticationFactorDisableTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAccessAuthenticationFactorDisableTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetAccessAuthenticationFactorDisableTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetAccessAuthenticationFactorDisableTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetAccessAuthenticationFactorDisableTaggedBuilder) Build() (BACnetAccessAuthenticationFactorDisableTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetAccessAuthenticationFactorDisableTaggedParseWithBufferProducer(tagNum
 }
 
 func BACnetAccessAuthenticationFactorDisableTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetAccessAuthenticationFactorDisableTagged, error) {
-	v, err := (&_BACnetAccessAuthenticationFactorDisableTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetAccessAuthenticationFactorDisableTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetAccessAuthenticationFactorDisableTagged) SerializeWithWriteBuffe
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAccessAuthenticationFactorDisableTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetAccessAuthenticationFactorDisableTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetAccessAuthenticationFactorDisableTagged) IsBACnetAccessAuthenticationFactorDisableTagged() {
 }
 
@@ -405,8 +375,6 @@ func (m *_BACnetAccessAuthenticationFactorDisableTagged) deepCopy() *_BACnetAcce
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetAccessAuthenticationFactorDisableTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReasonTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReasonTagged.go
index f89a869ae96..337a2cb083c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReasonTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReasonTagged.go
@@ -59,20 +59,16 @@ type _BACnetAccessCredentialDisableReasonTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetAccessCredentialDisableReason
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetAccessCredentialDisableReasonTagged = (*_BACnetAccessCredentialDisableReasonTagged)(nil)
 
 // NewBACnetAccessCredentialDisableReasonTagged factory function for _BACnetAccessCredentialDisableReasonTagged
-func NewBACnetAccessCredentialDisableReasonTagged(header BACnetTagHeader, value BACnetAccessCredentialDisableReason, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetAccessCredentialDisableReasonTagged {
+func NewBACnetAccessCredentialDisableReasonTagged(header BACnetTagHeader, value BACnetAccessCredentialDisableReason, proprietaryValue uint32) *_BACnetAccessCredentialDisableReasonTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetAccessCredentialDisableReasonTagged must not be nil")
 	}
-	return &_BACnetAccessCredentialDisableReasonTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetAccessCredentialDisableReasonTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetAccessCredentialDisableReasonTaggedBuilder interface {
 	WithValue(BACnetAccessCredentialDisableReason) BACnetAccessCredentialDisableReasonTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetAccessCredentialDisableReasonTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAccessCredentialDisableReasonTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetAccessCredentialDisableReasonTaggedBuilder
 	// Build builds the BACnetAccessCredentialDisableReasonTagged or returns an error if something is wrong
 	Build() (BACnetAccessCredentialDisableReasonTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetAccessCredentialDisableReasonTaggedBuilder) WithProprietaryValue
 	return b
 }
 
-func (b *_BACnetAccessCredentialDisableReasonTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAccessCredentialDisableReasonTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetAccessCredentialDisableReasonTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetAccessCredentialDisableReasonTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetAccessCredentialDisableReasonTaggedBuilder) Build() (BACnetAccessCredentialDisableReasonTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetAccessCredentialDisableReasonTaggedParseWithBufferProducer(tagNumber
 }
 
 func BACnetAccessCredentialDisableReasonTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetAccessCredentialDisableReasonTagged, error) {
-	v, err := (&_BACnetAccessCredentialDisableReasonTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetAccessCredentialDisableReasonTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetAccessCredentialDisableReasonTagged) SerializeWithWriteBuffer(ct
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAccessCredentialDisableReasonTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetAccessCredentialDisableReasonTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetAccessCredentialDisableReasonTagged) IsBACnetAccessCredentialDisableReasonTagged() {}
 
 func (m *_BACnetAccessCredentialDisableReasonTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetAccessCredentialDisableReasonTagged) deepCopy() *_BACnetAccessCr
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetAccessCredentialDisableReasonTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableTagged.go
index 9d7e7720ddf..318113ecad1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableTagged.go
@@ -59,20 +59,16 @@ type _BACnetAccessCredentialDisableTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetAccessCredentialDisable
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetAccessCredentialDisableTagged = (*_BACnetAccessCredentialDisableTagged)(nil)
 
 // NewBACnetAccessCredentialDisableTagged factory function for _BACnetAccessCredentialDisableTagged
-func NewBACnetAccessCredentialDisableTagged(header BACnetTagHeader, value BACnetAccessCredentialDisable, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetAccessCredentialDisableTagged {
+func NewBACnetAccessCredentialDisableTagged(header BACnetTagHeader, value BACnetAccessCredentialDisable, proprietaryValue uint32) *_BACnetAccessCredentialDisableTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetAccessCredentialDisableTagged must not be nil")
 	}
-	return &_BACnetAccessCredentialDisableTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetAccessCredentialDisableTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetAccessCredentialDisableTaggedBuilder interface {
 	WithValue(BACnetAccessCredentialDisable) BACnetAccessCredentialDisableTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetAccessCredentialDisableTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAccessCredentialDisableTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetAccessCredentialDisableTaggedBuilder
 	// Build builds the BACnetAccessCredentialDisableTagged or returns an error if something is wrong
 	Build() (BACnetAccessCredentialDisableTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetAccessCredentialDisableTaggedBuilder) WithProprietaryValue(propr
 	return b
 }
 
-func (b *_BACnetAccessCredentialDisableTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAccessCredentialDisableTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetAccessCredentialDisableTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetAccessCredentialDisableTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetAccessCredentialDisableTaggedBuilder) Build() (BACnetAccessCredentialDisableTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetAccessCredentialDisableTaggedParseWithBufferProducer(tagNumber uint8,
 }
 
 func BACnetAccessCredentialDisableTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetAccessCredentialDisableTagged, error) {
-	v, err := (&_BACnetAccessCredentialDisableTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetAccessCredentialDisableTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetAccessCredentialDisableTagged) SerializeWithWriteBuffer(ctx cont
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAccessCredentialDisableTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetAccessCredentialDisableTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetAccessCredentialDisableTagged) IsBACnetAccessCredentialDisableTagged() {}
 
 func (m *_BACnetAccessCredentialDisableTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetAccessCredentialDisableTagged) deepCopy() *_BACnetAccessCredenti
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetAccessCredentialDisableTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEventTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEventTagged.go
index e2c9595f5c1..46e55998d3c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEventTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEventTagged.go
@@ -59,20 +59,16 @@ type _BACnetAccessEventTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetAccessEvent
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetAccessEventTagged = (*_BACnetAccessEventTagged)(nil)
 
 // NewBACnetAccessEventTagged factory function for _BACnetAccessEventTagged
-func NewBACnetAccessEventTagged(header BACnetTagHeader, value BACnetAccessEvent, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetAccessEventTagged {
+func NewBACnetAccessEventTagged(header BACnetTagHeader, value BACnetAccessEvent, proprietaryValue uint32) *_BACnetAccessEventTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetAccessEventTagged must not be nil")
 	}
-	return &_BACnetAccessEventTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetAccessEventTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetAccessEventTaggedBuilder interface {
 	WithValue(BACnetAccessEvent) BACnetAccessEventTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetAccessEventTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAccessEventTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetAccessEventTaggedBuilder
 	// Build builds the BACnetAccessEventTagged or returns an error if something is wrong
 	Build() (BACnetAccessEventTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetAccessEventTaggedBuilder) WithProprietaryValue(proprietaryValue
 	return b
 }
 
-func (b *_BACnetAccessEventTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAccessEventTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetAccessEventTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetAccessEventTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetAccessEventTaggedBuilder) Build() (BACnetAccessEventTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetAccessEventTaggedParseWithBufferProducer(tagNumber uint8, tagClass Ta
 }
 
 func BACnetAccessEventTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetAccessEventTagged, error) {
-	v, err := (&_BACnetAccessEventTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetAccessEventTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetAccessEventTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAccessEventTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetAccessEventTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetAccessEventTagged) IsBACnetAccessEventTagged() {}
 
 func (m *_BACnetAccessEventTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetAccessEventTagged) deepCopy() *_BACnetAccessEventTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetAccessEventTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackModeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackModeTagged.go
index c2454476de1..845f57f009c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackModeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackModeTagged.go
@@ -54,20 +54,16 @@ type BACnetAccessPassbackModeTagged interface {
 type _BACnetAccessPassbackModeTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetAccessPassbackMode
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetAccessPassbackModeTagged = (*_BACnetAccessPassbackModeTagged)(nil)
 
 // NewBACnetAccessPassbackModeTagged factory function for _BACnetAccessPassbackModeTagged
-func NewBACnetAccessPassbackModeTagged(header BACnetTagHeader, value BACnetAccessPassbackMode, tagNumber uint8, tagClass TagClass) *_BACnetAccessPassbackModeTagged {
+func NewBACnetAccessPassbackModeTagged(header BACnetTagHeader, value BACnetAccessPassbackMode) *_BACnetAccessPassbackModeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetAccessPassbackModeTagged must not be nil")
 	}
-	return &_BACnetAccessPassbackModeTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetAccessPassbackModeTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetAccessPassbackModeTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetAccessPassbackModeTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetAccessPassbackMode) BACnetAccessPassbackModeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAccessPassbackModeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetAccessPassbackModeTaggedBuilder
 	// Build builds the BACnetAccessPassbackModeTagged or returns an error if something is wrong
 	Build() (BACnetAccessPassbackModeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetAccessPassbackModeTaggedBuilder) WithValue(value BACnetAccessPas
 	return b
 }
 
-func (b *_BACnetAccessPassbackModeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAccessPassbackModeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetAccessPassbackModeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetAccessPassbackModeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetAccessPassbackModeTaggedBuilder) Build() (BACnetAccessPassbackModeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetAccessPassbackModeTaggedParseWithBufferProducer(tagNumber uint8, tagC
 }
 
 func BACnetAccessPassbackModeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetAccessPassbackModeTagged, error) {
-	v, err := (&_BACnetAccessPassbackModeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetAccessPassbackModeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetAccessPassbackModeTagged) SerializeWithWriteBuffer(ctx context.C
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAccessPassbackModeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetAccessPassbackModeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetAccessPassbackModeTagged) IsBACnetAccessPassbackModeTagged() {}
 
 func (m *_BACnetAccessPassbackModeTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetAccessPassbackModeTagged) deepCopy() *_BACnetAccessPassbackModeT
 	_BACnetAccessPassbackModeTaggedCopy := &_BACnetAccessPassbackModeTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetAccessPassbackModeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRule.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRule.go
index c3b15715fff..df677d1fe22 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRule.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRule.go
@@ -339,7 +339,7 @@ func BACnetAccessRuleParseWithBufferProducer() func(ctx context.Context, readBuf
 }
 
 func BACnetAccessRuleParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetAccessRule, error) {
-	v, err := (&_BACnetAccessRule{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetAccessRule)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifierTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifierTagged.go
index ac2b48b9888..442e8e370e3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifierTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifierTagged.go
@@ -54,20 +54,16 @@ type BACnetAccessRuleLocationSpecifierTagged interface {
 type _BACnetAccessRuleLocationSpecifierTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetAccessRuleLocationSpecifier
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetAccessRuleLocationSpecifierTagged = (*_BACnetAccessRuleLocationSpecifierTagged)(nil)
 
 // NewBACnetAccessRuleLocationSpecifierTagged factory function for _BACnetAccessRuleLocationSpecifierTagged
-func NewBACnetAccessRuleLocationSpecifierTagged(header BACnetTagHeader, value BACnetAccessRuleLocationSpecifier, tagNumber uint8, tagClass TagClass) *_BACnetAccessRuleLocationSpecifierTagged {
+func NewBACnetAccessRuleLocationSpecifierTagged(header BACnetTagHeader, value BACnetAccessRuleLocationSpecifier) *_BACnetAccessRuleLocationSpecifierTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetAccessRuleLocationSpecifierTagged must not be nil")
 	}
-	return &_BACnetAccessRuleLocationSpecifierTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetAccessRuleLocationSpecifierTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetAccessRuleLocationSpecifierTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetAccessRuleLocationSpecifierTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetAccessRuleLocationSpecifier) BACnetAccessRuleLocationSpecifierTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAccessRuleLocationSpecifierTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetAccessRuleLocationSpecifierTaggedBuilder
 	// Build builds the BACnetAccessRuleLocationSpecifierTagged or returns an error if something is wrong
 	Build() (BACnetAccessRuleLocationSpecifierTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetAccessRuleLocationSpecifierTaggedBuilder) WithValue(value BACnet
 	return b
 }
 
-func (b *_BACnetAccessRuleLocationSpecifierTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAccessRuleLocationSpecifierTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetAccessRuleLocationSpecifierTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetAccessRuleLocationSpecifierTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetAccessRuleLocationSpecifierTaggedBuilder) Build() (BACnetAccessRuleLocationSpecifierTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetAccessRuleLocationSpecifierTaggedParseWithBufferProducer(tagNumber ui
 }
 
 func BACnetAccessRuleLocationSpecifierTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetAccessRuleLocationSpecifierTagged, error) {
-	v, err := (&_BACnetAccessRuleLocationSpecifierTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetAccessRuleLocationSpecifierTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetAccessRuleLocationSpecifierTagged) SerializeWithWriteBuffer(ctx
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAccessRuleLocationSpecifierTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetAccessRuleLocationSpecifierTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetAccessRuleLocationSpecifierTagged) IsBACnetAccessRuleLocationSpecifierTagged() {}
 
 func (m *_BACnetAccessRuleLocationSpecifierTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetAccessRuleLocationSpecifierTagged) deepCopy() *_BACnetAccessRule
 	_BACnetAccessRuleLocationSpecifierTaggedCopy := &_BACnetAccessRuleLocationSpecifierTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetAccessRuleLocationSpecifierTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifierTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifierTagged.go
index cf147c64837..91e2a74ae77 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifierTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifierTagged.go
@@ -54,20 +54,16 @@ type BACnetAccessRuleTimeRangeSpecifierTagged interface {
 type _BACnetAccessRuleTimeRangeSpecifierTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetAccessRuleTimeRangeSpecifier
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetAccessRuleTimeRangeSpecifierTagged = (*_BACnetAccessRuleTimeRangeSpecifierTagged)(nil)
 
 // NewBACnetAccessRuleTimeRangeSpecifierTagged factory function for _BACnetAccessRuleTimeRangeSpecifierTagged
-func NewBACnetAccessRuleTimeRangeSpecifierTagged(header BACnetTagHeader, value BACnetAccessRuleTimeRangeSpecifier, tagNumber uint8, tagClass TagClass) *_BACnetAccessRuleTimeRangeSpecifierTagged {
+func NewBACnetAccessRuleTimeRangeSpecifierTagged(header BACnetTagHeader, value BACnetAccessRuleTimeRangeSpecifier) *_BACnetAccessRuleTimeRangeSpecifierTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetAccessRuleTimeRangeSpecifierTagged must not be nil")
 	}
-	return &_BACnetAccessRuleTimeRangeSpecifierTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetAccessRuleTimeRangeSpecifierTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetAccessRuleTimeRangeSpecifierTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetAccessRuleTimeRangeSpecifierTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetAccessRuleTimeRangeSpecifier) BACnetAccessRuleTimeRangeSpecifierTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAccessRuleTimeRangeSpecifierTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetAccessRuleTimeRangeSpecifierTaggedBuilder
 	// Build builds the BACnetAccessRuleTimeRangeSpecifierTagged or returns an error if something is wrong
 	Build() (BACnetAccessRuleTimeRangeSpecifierTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetAccessRuleTimeRangeSpecifierTaggedBuilder) WithValue(value BACne
 	return b
 }
 
-func (b *_BACnetAccessRuleTimeRangeSpecifierTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAccessRuleTimeRangeSpecifierTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetAccessRuleTimeRangeSpecifierTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetAccessRuleTimeRangeSpecifierTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetAccessRuleTimeRangeSpecifierTaggedBuilder) Build() (BACnetAccessRuleTimeRangeSpecifierTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetAccessRuleTimeRangeSpecifierTaggedParseWithBufferProducer(tagNumber u
 }
 
 func BACnetAccessRuleTimeRangeSpecifierTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetAccessRuleTimeRangeSpecifierTagged, error) {
-	v, err := (&_BACnetAccessRuleTimeRangeSpecifierTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetAccessRuleTimeRangeSpecifierTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetAccessRuleTimeRangeSpecifierTagged) SerializeWithWriteBuffer(ctx
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAccessRuleTimeRangeSpecifierTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetAccessRuleTimeRangeSpecifierTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetAccessRuleTimeRangeSpecifierTagged) IsBACnetAccessRuleTimeRangeSpecifierTagged() {}
 
 func (m *_BACnetAccessRuleTimeRangeSpecifierTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetAccessRuleTimeRangeSpecifierTagged) deepCopy() *_BACnetAccessRul
 	_BACnetAccessRuleTimeRangeSpecifierTaggedCopy := &_BACnetAccessRuleTimeRangeSpecifierTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetAccessRuleTimeRangeSpecifierTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessThreatLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessThreatLevel.go
index fb4ea758831..ceb90063cc1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessThreatLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessThreatLevel.go
@@ -207,7 +207,7 @@ func BACnetAccessThreatLevelParseWithBufferProducer() func(ctx context.Context,
 }
 
 func BACnetAccessThreatLevelParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetAccessThreatLevel, error) {
-	v, err := (&_BACnetAccessThreatLevel{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetAccessThreatLevel)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserTypeTagged.go
index 13f9d07e07a..18e6764edbd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserTypeTagged.go
@@ -59,20 +59,16 @@ type _BACnetAccessUserTypeTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetAccessUserType
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetAccessUserTypeTagged = (*_BACnetAccessUserTypeTagged)(nil)
 
 // NewBACnetAccessUserTypeTagged factory function for _BACnetAccessUserTypeTagged
-func NewBACnetAccessUserTypeTagged(header BACnetTagHeader, value BACnetAccessUserType, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetAccessUserTypeTagged {
+func NewBACnetAccessUserTypeTagged(header BACnetTagHeader, value BACnetAccessUserType, proprietaryValue uint32) *_BACnetAccessUserTypeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetAccessUserTypeTagged must not be nil")
 	}
-	return &_BACnetAccessUserTypeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetAccessUserTypeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetAccessUserTypeTaggedBuilder interface {
 	WithValue(BACnetAccessUserType) BACnetAccessUserTypeTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetAccessUserTypeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAccessUserTypeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetAccessUserTypeTaggedBuilder
 	// Build builds the BACnetAccessUserTypeTagged or returns an error if something is wrong
 	Build() (BACnetAccessUserTypeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetAccessUserTypeTaggedBuilder) WithProprietaryValue(proprietaryVal
 	return b
 }
 
-func (b *_BACnetAccessUserTypeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAccessUserTypeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetAccessUserTypeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetAccessUserTypeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetAccessUserTypeTaggedBuilder) Build() (BACnetAccessUserTypeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetAccessUserTypeTaggedParseWithBufferProducer(tagNumber uint8, tagClass
 }
 
 func BACnetAccessUserTypeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetAccessUserTypeTagged, error) {
-	v, err := (&_BACnetAccessUserTypeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetAccessUserTypeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetAccessUserTypeTagged) SerializeWithWriteBuffer(ctx context.Conte
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAccessUserTypeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetAccessUserTypeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetAccessUserTypeTagged) IsBACnetAccessUserTypeTagged() {}
 
 func (m *_BACnetAccessUserTypeTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetAccessUserTypeTagged) deepCopy() *_BACnetAccessUserTypeTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetAccessUserTypeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyStateTagged.go
index fa47a059dfa..987e961b6c4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyStateTagged.go
@@ -59,20 +59,16 @@ type _BACnetAccessZoneOccupancyStateTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetAccessZoneOccupancyState
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetAccessZoneOccupancyStateTagged = (*_BACnetAccessZoneOccupancyStateTagged)(nil)
 
 // NewBACnetAccessZoneOccupancyStateTagged factory function for _BACnetAccessZoneOccupancyStateTagged
-func NewBACnetAccessZoneOccupancyStateTagged(header BACnetTagHeader, value BACnetAccessZoneOccupancyState, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetAccessZoneOccupancyStateTagged {
+func NewBACnetAccessZoneOccupancyStateTagged(header BACnetTagHeader, value BACnetAccessZoneOccupancyState, proprietaryValue uint32) *_BACnetAccessZoneOccupancyStateTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetAccessZoneOccupancyStateTagged must not be nil")
 	}
-	return &_BACnetAccessZoneOccupancyStateTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetAccessZoneOccupancyStateTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetAccessZoneOccupancyStateTaggedBuilder interface {
 	WithValue(BACnetAccessZoneOccupancyState) BACnetAccessZoneOccupancyStateTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetAccessZoneOccupancyStateTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAccessZoneOccupancyStateTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetAccessZoneOccupancyStateTaggedBuilder
 	// Build builds the BACnetAccessZoneOccupancyStateTagged or returns an error if something is wrong
 	Build() (BACnetAccessZoneOccupancyStateTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetAccessZoneOccupancyStateTaggedBuilder) WithProprietaryValue(prop
 	return b
 }
 
-func (b *_BACnetAccessZoneOccupancyStateTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAccessZoneOccupancyStateTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetAccessZoneOccupancyStateTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetAccessZoneOccupancyStateTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetAccessZoneOccupancyStateTaggedBuilder) Build() (BACnetAccessZoneOccupancyStateTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetAccessZoneOccupancyStateTaggedParseWithBufferProducer(tagNumber uint8
 }
 
 func BACnetAccessZoneOccupancyStateTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetAccessZoneOccupancyStateTagged, error) {
-	v, err := (&_BACnetAccessZoneOccupancyStateTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetAccessZoneOccupancyStateTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetAccessZoneOccupancyStateTagged) SerializeWithWriteBuffer(ctx con
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAccessZoneOccupancyStateTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetAccessZoneOccupancyStateTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetAccessZoneOccupancyStateTagged) IsBACnetAccessZoneOccupancyStateTagged() {}
 
 func (m *_BACnetAccessZoneOccupancyStateTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetAccessZoneOccupancyStateTagged) deepCopy() *_BACnetAccessZoneOcc
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetAccessZoneOccupancyStateTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecord.go
index 1d3282ea5d7..d982a2f9703 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecord.go
@@ -312,7 +312,7 @@ func BACnetAccumulatorRecordParseWithBufferProducer() func(ctx context.Context,
 }
 
 func BACnetAccumulatorRecordParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetAccumulatorRecord, error) {
-	v, err := (&_BACnetAccumulatorRecord{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetAccumulatorRecord)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatusTagged.go
index 349e29c5f14..a4a7c798f6e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatusTagged.go
@@ -54,20 +54,16 @@ type BACnetAccumulatorRecordAccumulatorStatusTagged interface {
 type _BACnetAccumulatorRecordAccumulatorStatusTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetAccumulatorRecordAccumulatorStatus
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetAccumulatorRecordAccumulatorStatusTagged = (*_BACnetAccumulatorRecordAccumulatorStatusTagged)(nil)
 
 // NewBACnetAccumulatorRecordAccumulatorStatusTagged factory function for _BACnetAccumulatorRecordAccumulatorStatusTagged
-func NewBACnetAccumulatorRecordAccumulatorStatusTagged(header BACnetTagHeader, value BACnetAccumulatorRecordAccumulatorStatus, tagNumber uint8, tagClass TagClass) *_BACnetAccumulatorRecordAccumulatorStatusTagged {
+func NewBACnetAccumulatorRecordAccumulatorStatusTagged(header BACnetTagHeader, value BACnetAccumulatorRecordAccumulatorStatus) *_BACnetAccumulatorRecordAccumulatorStatusTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetAccumulatorRecordAccumulatorStatusTagged must not be nil")
 	}
-	return &_BACnetAccumulatorRecordAccumulatorStatusTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetAccumulatorRecordAccumulatorStatusTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetAccumulatorRecordAccumulatorStatusTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetAccumulatorRecordAccumulatorStatusTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetAccumulatorRecordAccumulatorStatus) BACnetAccumulatorRecordAccumulatorStatusTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAccumulatorRecordAccumulatorStatusTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetAccumulatorRecordAccumulatorStatusTaggedBuilder
 	// Build builds the BACnetAccumulatorRecordAccumulatorStatusTagged or returns an error if something is wrong
 	Build() (BACnetAccumulatorRecordAccumulatorStatusTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetAccumulatorRecordAccumulatorStatusTaggedBuilder) WithValue(value
 	return b
 }
 
-func (b *_BACnetAccumulatorRecordAccumulatorStatusTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAccumulatorRecordAccumulatorStatusTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetAccumulatorRecordAccumulatorStatusTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetAccumulatorRecordAccumulatorStatusTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetAccumulatorRecordAccumulatorStatusTaggedBuilder) Build() (BACnetAccumulatorRecordAccumulatorStatusTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetAccumulatorRecordAccumulatorStatusTaggedParseWithBufferProducer(tagNu
 }
 
 func BACnetAccumulatorRecordAccumulatorStatusTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetAccumulatorRecordAccumulatorStatusTagged, error) {
-	v, err := (&_BACnetAccumulatorRecordAccumulatorStatusTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetAccumulatorRecordAccumulatorStatusTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetAccumulatorRecordAccumulatorStatusTagged) SerializeWithWriteBuff
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAccumulatorRecordAccumulatorStatusTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetAccumulatorRecordAccumulatorStatusTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetAccumulatorRecordAccumulatorStatusTagged) IsBACnetAccumulatorRecordAccumulatorStatusTagged() {
 }
 
@@ -344,8 +314,6 @@ func (m *_BACnetAccumulatorRecordAccumulatorStatusTagged) deepCopy() *_BACnetAcc
 	_BACnetAccumulatorRecordAccumulatorStatusTaggedCopy := &_BACnetAccumulatorRecordAccumulatorStatusTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetAccumulatorRecordAccumulatorStatusTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetActionCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetActionCommand.go
index 80e0f2ff5c9..69da906ba5c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetActionCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetActionCommand.go
@@ -467,7 +467,7 @@ func BACnetActionCommandParseWithBufferProducer() func(ctx context.Context, read
 }
 
 func BACnetActionCommandParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetActionCommand, error) {
-	v, err := (&_BACnetActionCommand{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetActionCommand)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetActionList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetActionList.go
index 44fdc8cb5b3..c0c67eb954c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetActionList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetActionList.go
@@ -263,7 +263,7 @@ func BACnetActionListParseWithBufferProducer() func(ctx context.Context, readBuf
 }
 
 func BACnetActionListParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetActionList, error) {
-	v, err := (&_BACnetActionList{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetActionList)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetActionTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetActionTagged.go
index 9d2a8ec815c..437f33ee141 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetActionTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetActionTagged.go
@@ -54,20 +54,16 @@ type BACnetActionTagged interface {
 type _BACnetActionTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetAction
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetActionTagged = (*_BACnetActionTagged)(nil)
 
 // NewBACnetActionTagged factory function for _BACnetActionTagged
-func NewBACnetActionTagged(header BACnetTagHeader, value BACnetAction, tagNumber uint8, tagClass TagClass) *_BACnetActionTagged {
+func NewBACnetActionTagged(header BACnetTagHeader, value BACnetAction) *_BACnetActionTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetActionTagged must not be nil")
 	}
-	return &_BACnetActionTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetActionTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetActionTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetActionTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetAction) BACnetActionTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetActionTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetActionTaggedBuilder
 	// Build builds the BACnetActionTagged or returns an error if something is wrong
 	Build() (BACnetActionTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetActionTaggedBuilder) WithValue(value BACnetAction) BACnetActionT
 	return b
 }
 
-func (b *_BACnetActionTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetActionTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetActionTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetActionTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetActionTaggedBuilder) Build() (BACnetActionTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetActionTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagClas
 }
 
 func BACnetActionTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetActionTagged, error) {
-	v, err := (&_BACnetActionTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetActionTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetActionTagged) SerializeWithWriteBuffer(ctx context.Context, writ
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetActionTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetActionTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetActionTagged) IsBACnetActionTagged() {}
 
 func (m *_BACnetActionTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetActionTagged) deepCopy() *_BACnetActionTagged {
 	_BACnetActionTaggedCopy := &_BACnetActionTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetActionTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAddress.go
index 5613fb35ef8..db18f4cd7cc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAddress.go
@@ -281,7 +281,7 @@ func BACnetAddressParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func BACnetAddressParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetAddress, error) {
-	v, err := (&_BACnetAddress{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetAddress)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressBinding.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressBinding.go
index f8ca32ef2ef..58e5f6f7a1e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressBinding.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressBinding.go
@@ -242,7 +242,7 @@ func BACnetAddressBindingParseWithBufferProducer() func(ctx context.Context, rea
 }
 
 func BACnetAddressBindingParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetAddressBinding, error) {
-	v, err := (&_BACnetAddressBinding{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetAddressBinding)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressEnclosed.go
index 81354e6d9ab..b1aa8479103 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetAddressEnclosed struct {
 	OpeningTag BACnetOpeningTag
 	Address    BACnetAddress
 	ClosingTag BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetAddressEnclosed = (*_BACnetAddressEnclosed)(nil)
 
 // NewBACnetAddressEnclosed factory function for _BACnetAddressEnclosed
-func NewBACnetAddressEnclosed(openingTag BACnetOpeningTag, address BACnetAddress, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetAddressEnclosed {
+func NewBACnetAddressEnclosed(openingTag BACnetOpeningTag, address BACnetAddress, closingTag BACnetClosingTag) *_BACnetAddressEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetAddressEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetAddressEnclosed(openingTag BACnetOpeningTag, address BACnetAddress
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetAddressEnclosed must not be nil")
 	}
-	return &_BACnetAddressEnclosed{OpeningTag: openingTag, Address: address, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetAddressEnclosed{OpeningTag: openingTag, Address: address, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetAddressEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetAddressEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetAddressEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAddressEnclosedBuilder
 	// Build builds the BACnetAddressEnclosed or returns an error if something is wrong
 	Build() (BACnetAddressEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetAddressEnclosedBuilder) WithClosingTagBuilder(builderSupplier fu
 	return b
 }
 
-func (b *_BACnetAddressEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAddressEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetAddressEnclosedBuilder) Build() (BACnetAddressEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetAddressEnclosedParseWithBufferProducer(tagNumber uint8) func(ctx cont
 }
 
 func BACnetAddressEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetAddressEnclosed, error) {
-	v, err := (&_BACnetAddressEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetAddressEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetAddressEnclosed) SerializeWithWriteBuffer(ctx context.Context, w
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAddressEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetAddressEnclosed) IsBACnetAddressEnclosed() {}
 
 func (m *_BACnetAddressEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetAddressEnclosed) deepCopy() *_BACnetAddressEnclosed {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetAddress](m.Address),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetAddressEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTag.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTag.go
index b0308b2d6cf..c0e98d4fee4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTag.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTag.go
@@ -459,7 +459,7 @@ func BACnetApplicationTagParseWithBufferProducer[T BACnetApplicationTag]() func(
 }
 
 func BACnetApplicationTagParseWithBuffer[T BACnetApplicationTag](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetApplicationTag{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetApplicationTag)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedAccessRights.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedAccessRights.go
index 64c4b1581d2..1228c87a193 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedAccessRights.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedAccessRights.go
@@ -242,7 +242,7 @@ func BACnetAssignedAccessRightsParseWithBufferProducer() func(ctx context.Contex
 }
 
 func BACnetAssignedAccessRightsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetAssignedAccessRights, error) {
-	v, err := (&_BACnetAssignedAccessRights{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetAssignedAccessRights)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCalls.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCalls.go
index aad08f2b385..ff287348bdc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCalls.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCalls.go
@@ -207,7 +207,7 @@ func BACnetAssignedLandingCallsParseWithBufferProducer() func(ctx context.Contex
 }
 
 func BACnetAssignedLandingCallsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetAssignedLandingCalls, error) {
-	v, err := (&_BACnetAssignedLandingCalls{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetAssignedLandingCalls)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsList.go
index 0f483cc09f9..62aece534a2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsList.go
@@ -57,22 +57,19 @@ type _BACnetAssignedLandingCallsLandingCallsList struct {
 	OpeningTag   BACnetOpeningTag
 	LandingCalls []BACnetAssignedLandingCallsLandingCallsListEntry
 	ClosingTag   BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetAssignedLandingCallsLandingCallsList = (*_BACnetAssignedLandingCallsLandingCallsList)(nil)
 
 // NewBACnetAssignedLandingCallsLandingCallsList factory function for _BACnetAssignedLandingCallsLandingCallsList
-func NewBACnetAssignedLandingCallsLandingCallsList(openingTag BACnetOpeningTag, landingCalls []BACnetAssignedLandingCallsLandingCallsListEntry, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetAssignedLandingCallsLandingCallsList {
+func NewBACnetAssignedLandingCallsLandingCallsList(openingTag BACnetOpeningTag, landingCalls []BACnetAssignedLandingCallsLandingCallsListEntry, closingTag BACnetClosingTag) *_BACnetAssignedLandingCallsLandingCallsList {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetAssignedLandingCallsLandingCallsList must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetAssignedLandingCallsLandingCallsList must not be nil")
 	}
-	return &_BACnetAssignedLandingCallsLandingCallsList{OpeningTag: openingTag, LandingCalls: landingCalls, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetAssignedLandingCallsLandingCallsList{OpeningTag: openingTag, LandingCalls: landingCalls, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetAssignedLandingCallsLandingCallsListBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetAssignedLandingCallsLandingCallsListBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetAssignedLandingCallsLandingCallsListBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAssignedLandingCallsLandingCallsListBuilder
 	// Build builds the BACnetAssignedLandingCallsLandingCallsList or returns an error if something is wrong
 	Build() (BACnetAssignedLandingCallsLandingCallsList, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetAssignedLandingCallsLandingCallsListBuilder) WithClosingTagBuild
 	return b
 }
 
-func (b *_BACnetAssignedLandingCallsLandingCallsListBuilder) WithArgTagNumber(tagNumber uint8) BACnetAssignedLandingCallsLandingCallsListBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetAssignedLandingCallsLandingCallsListBuilder) Build() (BACnetAssignedLandingCallsLandingCallsList, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetAssignedLandingCallsLandingCallsListParseWithBufferProducer(tagNumber
 }
 
 func BACnetAssignedLandingCallsLandingCallsListParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetAssignedLandingCallsLandingCallsList, error) {
-	v, err := (&_BACnetAssignedLandingCallsLandingCallsList{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetAssignedLandingCallsLandingCallsList)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetAssignedLandingCallsLandingCallsList) SerializeWithWriteBuffer(c
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAssignedLandingCallsLandingCallsList) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetAssignedLandingCallsLandingCallsList) IsBACnetAssignedLandingCallsLandingCallsList() {
 }
 
@@ -374,7 +354,6 @@ func (m *_BACnetAssignedLandingCallsLandingCallsList) deepCopy() *_BACnetAssigne
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetAssignedLandingCallsLandingCallsListEntry, BACnetAssignedLandingCallsLandingCallsListEntry](m.LandingCalls),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetAssignedLandingCallsLandingCallsListCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsListEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsListEntry.go
index 7a6d39802e6..3042549b252 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsListEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsListEntry.go
@@ -242,7 +242,7 @@ func BACnetAssignedLandingCallsLandingCallsListEntryParseWithBufferProducer() fu
 }
 
 func BACnetAssignedLandingCallsLandingCallsListEntryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetAssignedLandingCallsLandingCallsListEntry, error) {
-	v, err := (&_BACnetAssignedLandingCallsLandingCallsListEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetAssignedLandingCallsLandingCallsListEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactor.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactor.go
index 7ab32c66d7f..07c7cb07594 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactor.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactor.go
@@ -277,7 +277,7 @@ func BACnetAuthenticationFactorParseWithBufferProducer() func(ctx context.Contex
 }
 
 func BACnetAuthenticationFactorParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetAuthenticationFactor, error) {
-	v, err := (&_BACnetAuthenticationFactor{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetAuthenticationFactor)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorEnclosed.go
index 81f15dc3b60..cf207aebda9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetAuthenticationFactorEnclosed struct {
 	OpeningTag           BACnetOpeningTag
 	AuthenticationFactor BACnetAuthenticationFactor
 	ClosingTag           BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetAuthenticationFactorEnclosed = (*_BACnetAuthenticationFactorEnclosed)(nil)
 
 // NewBACnetAuthenticationFactorEnclosed factory function for _BACnetAuthenticationFactorEnclosed
-func NewBACnetAuthenticationFactorEnclosed(openingTag BACnetOpeningTag, authenticationFactor BACnetAuthenticationFactor, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetAuthenticationFactorEnclosed {
+func NewBACnetAuthenticationFactorEnclosed(openingTag BACnetOpeningTag, authenticationFactor BACnetAuthenticationFactor, closingTag BACnetClosingTag) *_BACnetAuthenticationFactorEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetAuthenticationFactorEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetAuthenticationFactorEnclosed(openingTag BACnetOpeningTag, authenti
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetAuthenticationFactorEnclosed must not be nil")
 	}
-	return &_BACnetAuthenticationFactorEnclosed{OpeningTag: openingTag, AuthenticationFactor: authenticationFactor, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetAuthenticationFactorEnclosed{OpeningTag: openingTag, AuthenticationFactor: authenticationFactor, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetAuthenticationFactorEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetAuthenticationFactorEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetAuthenticationFactorEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAuthenticationFactorEnclosedBuilder
 	// Build builds the BACnetAuthenticationFactorEnclosed or returns an error if something is wrong
 	Build() (BACnetAuthenticationFactorEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetAuthenticationFactorEnclosedBuilder) WithClosingTagBuilder(build
 	return b
 }
 
-func (b *_BACnetAuthenticationFactorEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAuthenticationFactorEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetAuthenticationFactorEnclosedBuilder) Build() (BACnetAuthenticationFactorEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetAuthenticationFactorEnclosedParseWithBufferProducer(tagNumber uint8)
 }
 
 func BACnetAuthenticationFactorEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetAuthenticationFactorEnclosed, error) {
-	v, err := (&_BACnetAuthenticationFactorEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetAuthenticationFactorEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetAuthenticationFactorEnclosed) SerializeWithWriteBuffer(ctx conte
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAuthenticationFactorEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetAuthenticationFactorEnclosed) IsBACnetAuthenticationFactorEnclosed() {}
 
 func (m *_BACnetAuthenticationFactorEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetAuthenticationFactorEnclosed) deepCopy() *_BACnetAuthenticationF
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetAuthenticationFactor](m.AuthenticationFactor),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetAuthenticationFactorEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorFormat.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorFormat.go
index a1a0a3321fe..f2d92a4c325 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorFormat.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorFormat.go
@@ -269,7 +269,7 @@ func BACnetAuthenticationFactorFormatParseWithBufferProducer() func(ctx context.
 }
 
 func BACnetAuthenticationFactorFormatParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetAuthenticationFactorFormat, error) {
-	v, err := (&_BACnetAuthenticationFactorFormat{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetAuthenticationFactorFormat)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorTypeTagged.go
index 2bdb1b6620b..4365778d7eb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorTypeTagged.go
@@ -54,20 +54,16 @@ type BACnetAuthenticationFactorTypeTagged interface {
 type _BACnetAuthenticationFactorTypeTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetAuthenticationFactorType
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetAuthenticationFactorTypeTagged = (*_BACnetAuthenticationFactorTypeTagged)(nil)
 
 // NewBACnetAuthenticationFactorTypeTagged factory function for _BACnetAuthenticationFactorTypeTagged
-func NewBACnetAuthenticationFactorTypeTagged(header BACnetTagHeader, value BACnetAuthenticationFactorType, tagNumber uint8, tagClass TagClass) *_BACnetAuthenticationFactorTypeTagged {
+func NewBACnetAuthenticationFactorTypeTagged(header BACnetTagHeader, value BACnetAuthenticationFactorType) *_BACnetAuthenticationFactorTypeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetAuthenticationFactorTypeTagged must not be nil")
 	}
-	return &_BACnetAuthenticationFactorTypeTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetAuthenticationFactorTypeTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetAuthenticationFactorTypeTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetAuthenticationFactorTypeTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetAuthenticationFactorType) BACnetAuthenticationFactorTypeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAuthenticationFactorTypeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetAuthenticationFactorTypeTaggedBuilder
 	// Build builds the BACnetAuthenticationFactorTypeTagged or returns an error if something is wrong
 	Build() (BACnetAuthenticationFactorTypeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetAuthenticationFactorTypeTaggedBuilder) WithValue(value BACnetAut
 	return b
 }
 
-func (b *_BACnetAuthenticationFactorTypeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAuthenticationFactorTypeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetAuthenticationFactorTypeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetAuthenticationFactorTypeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetAuthenticationFactorTypeTaggedBuilder) Build() (BACnetAuthenticationFactorTypeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetAuthenticationFactorTypeTaggedParseWithBufferProducer(tagNumber uint8
 }
 
 func BACnetAuthenticationFactorTypeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetAuthenticationFactorTypeTagged, error) {
-	v, err := (&_BACnetAuthenticationFactorTypeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetAuthenticationFactorTypeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetAuthenticationFactorTypeTagged) SerializeWithWriteBuffer(ctx con
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAuthenticationFactorTypeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetAuthenticationFactorTypeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetAuthenticationFactorTypeTagged) IsBACnetAuthenticationFactorTypeTagged() {}
 
 func (m *_BACnetAuthenticationFactorTypeTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetAuthenticationFactorTypeTagged) deepCopy() *_BACnetAuthenticatio
 	_BACnetAuthenticationFactorTypeTaggedCopy := &_BACnetAuthenticationFactorTypeTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetAuthenticationFactorTypeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicy.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicy.go
index 6adbd5b36ad..a379189d2a4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicy.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicy.go
@@ -277,7 +277,7 @@ func BACnetAuthenticationPolicyParseWithBufferProducer() func(ctx context.Contex
 }
 
 func BACnetAuthenticationPolicyParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetAuthenticationPolicy, error) {
-	v, err := (&_BACnetAuthenticationPolicy{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetAuthenticationPolicy)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyList.go
index 3df3be988cf..6af09928e17 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyList.go
@@ -57,22 +57,19 @@ type _BACnetAuthenticationPolicyList struct {
 	OpeningTag BACnetOpeningTag
 	Entries    []BACnetAuthenticationPolicyListEntry
 	ClosingTag BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetAuthenticationPolicyList = (*_BACnetAuthenticationPolicyList)(nil)
 
 // NewBACnetAuthenticationPolicyList factory function for _BACnetAuthenticationPolicyList
-func NewBACnetAuthenticationPolicyList(openingTag BACnetOpeningTag, entries []BACnetAuthenticationPolicyListEntry, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetAuthenticationPolicyList {
+func NewBACnetAuthenticationPolicyList(openingTag BACnetOpeningTag, entries []BACnetAuthenticationPolicyListEntry, closingTag BACnetClosingTag) *_BACnetAuthenticationPolicyList {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetAuthenticationPolicyList must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetAuthenticationPolicyList must not be nil")
 	}
-	return &_BACnetAuthenticationPolicyList{OpeningTag: openingTag, Entries: entries, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetAuthenticationPolicyList{OpeningTag: openingTag, Entries: entries, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetAuthenticationPolicyListBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetAuthenticationPolicyListBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetAuthenticationPolicyListBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAuthenticationPolicyListBuilder
 	// Build builds the BACnetAuthenticationPolicyList or returns an error if something is wrong
 	Build() (BACnetAuthenticationPolicyList, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetAuthenticationPolicyListBuilder) WithClosingTagBuilder(builderSu
 	return b
 }
 
-func (b *_BACnetAuthenticationPolicyListBuilder) WithArgTagNumber(tagNumber uint8) BACnetAuthenticationPolicyListBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetAuthenticationPolicyListBuilder) Build() (BACnetAuthenticationPolicyList, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetAuthenticationPolicyListParseWithBufferProducer(tagNumber uint8) func
 }
 
 func BACnetAuthenticationPolicyListParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetAuthenticationPolicyList, error) {
-	v, err := (&_BACnetAuthenticationPolicyList{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetAuthenticationPolicyList)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetAuthenticationPolicyList) SerializeWithWriteBuffer(ctx context.C
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAuthenticationPolicyList) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetAuthenticationPolicyList) IsBACnetAuthenticationPolicyList() {}
 
 func (m *_BACnetAuthenticationPolicyList) DeepCopy() any {
@@ -373,7 +353,6 @@ func (m *_BACnetAuthenticationPolicyList) deepCopy() *_BACnetAuthenticationPolic
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetAuthenticationPolicyListEntry, BACnetAuthenticationPolicyListEntry](m.Entries),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetAuthenticationPolicyListCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyListEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyListEntry.go
index cff3abddee7..7263fea7b5f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyListEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyListEntry.go
@@ -242,7 +242,7 @@ func BACnetAuthenticationPolicyListEntryParseWithBufferProducer() func(ctx conte
 }
 
 func BACnetAuthenticationPolicyListEntryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetAuthenticationPolicyListEntry, error) {
-	v, err := (&_BACnetAuthenticationPolicyListEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetAuthenticationPolicyListEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatusTagged.go
index 76b0534fa0e..79abdddd8e3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatusTagged.go
@@ -54,20 +54,16 @@ type BACnetAuthenticationStatusTagged interface {
 type _BACnetAuthenticationStatusTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetAuthenticationStatus
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetAuthenticationStatusTagged = (*_BACnetAuthenticationStatusTagged)(nil)
 
 // NewBACnetAuthenticationStatusTagged factory function for _BACnetAuthenticationStatusTagged
-func NewBACnetAuthenticationStatusTagged(header BACnetTagHeader, value BACnetAuthenticationStatus, tagNumber uint8, tagClass TagClass) *_BACnetAuthenticationStatusTagged {
+func NewBACnetAuthenticationStatusTagged(header BACnetTagHeader, value BACnetAuthenticationStatus) *_BACnetAuthenticationStatusTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetAuthenticationStatusTagged must not be nil")
 	}
-	return &_BACnetAuthenticationStatusTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetAuthenticationStatusTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetAuthenticationStatusTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetAuthenticationStatusTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetAuthenticationStatus) BACnetAuthenticationStatusTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAuthenticationStatusTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetAuthenticationStatusTaggedBuilder
 	// Build builds the BACnetAuthenticationStatusTagged or returns an error if something is wrong
 	Build() (BACnetAuthenticationStatusTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetAuthenticationStatusTaggedBuilder) WithValue(value BACnetAuthent
 	return b
 }
 
-func (b *_BACnetAuthenticationStatusTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAuthenticationStatusTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetAuthenticationStatusTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetAuthenticationStatusTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetAuthenticationStatusTaggedBuilder) Build() (BACnetAuthenticationStatusTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetAuthenticationStatusTaggedParseWithBufferProducer(tagNumber uint8, ta
 }
 
 func BACnetAuthenticationStatusTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetAuthenticationStatusTagged, error) {
-	v, err := (&_BACnetAuthenticationStatusTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetAuthenticationStatusTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetAuthenticationStatusTagged) SerializeWithWriteBuffer(ctx context
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAuthenticationStatusTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetAuthenticationStatusTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetAuthenticationStatusTagged) IsBACnetAuthenticationStatusTagged() {}
 
 func (m *_BACnetAuthenticationStatusTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetAuthenticationStatusTagged) deepCopy() *_BACnetAuthenticationSta
 	_BACnetAuthenticationStatusTaggedCopy := &_BACnetAuthenticationStatusTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetAuthenticationStatusTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemptionTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemptionTagged.go
index 0803c43f787..ff6c759305f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemptionTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemptionTagged.go
@@ -59,20 +59,16 @@ type _BACnetAuthorizationExemptionTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetAuthorizationExemption
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetAuthorizationExemptionTagged = (*_BACnetAuthorizationExemptionTagged)(nil)
 
 // NewBACnetAuthorizationExemptionTagged factory function for _BACnetAuthorizationExemptionTagged
-func NewBACnetAuthorizationExemptionTagged(header BACnetTagHeader, value BACnetAuthorizationExemption, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetAuthorizationExemptionTagged {
+func NewBACnetAuthorizationExemptionTagged(header BACnetTagHeader, value BACnetAuthorizationExemption, proprietaryValue uint32) *_BACnetAuthorizationExemptionTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetAuthorizationExemptionTagged must not be nil")
 	}
-	return &_BACnetAuthorizationExemptionTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetAuthorizationExemptionTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetAuthorizationExemptionTaggedBuilder interface {
 	WithValue(BACnetAuthorizationExemption) BACnetAuthorizationExemptionTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetAuthorizationExemptionTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAuthorizationExemptionTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetAuthorizationExemptionTaggedBuilder
 	// Build builds the BACnetAuthorizationExemptionTagged or returns an error if something is wrong
 	Build() (BACnetAuthorizationExemptionTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetAuthorizationExemptionTaggedBuilder) WithProprietaryValue(propri
 	return b
 }
 
-func (b *_BACnetAuthorizationExemptionTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAuthorizationExemptionTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetAuthorizationExemptionTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetAuthorizationExemptionTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetAuthorizationExemptionTaggedBuilder) Build() (BACnetAuthorizationExemptionTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetAuthorizationExemptionTaggedParseWithBufferProducer(tagNumber uint8,
 }
 
 func BACnetAuthorizationExemptionTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetAuthorizationExemptionTagged, error) {
-	v, err := (&_BACnetAuthorizationExemptionTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetAuthorizationExemptionTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetAuthorizationExemptionTagged) SerializeWithWriteBuffer(ctx conte
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAuthorizationExemptionTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetAuthorizationExemptionTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetAuthorizationExemptionTagged) IsBACnetAuthorizationExemptionTagged() {}
 
 func (m *_BACnetAuthorizationExemptionTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetAuthorizationExemptionTagged) deepCopy() *_BACnetAuthorizationEx
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetAuthorizationExemptionTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationModeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationModeTagged.go
index 413b2ce6efa..fa0bddf443e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationModeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationModeTagged.go
@@ -59,20 +59,16 @@ type _BACnetAuthorizationModeTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetAuthorizationMode
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetAuthorizationModeTagged = (*_BACnetAuthorizationModeTagged)(nil)
 
 // NewBACnetAuthorizationModeTagged factory function for _BACnetAuthorizationModeTagged
-func NewBACnetAuthorizationModeTagged(header BACnetTagHeader, value BACnetAuthorizationMode, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetAuthorizationModeTagged {
+func NewBACnetAuthorizationModeTagged(header BACnetTagHeader, value BACnetAuthorizationMode, proprietaryValue uint32) *_BACnetAuthorizationModeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetAuthorizationModeTagged must not be nil")
 	}
-	return &_BACnetAuthorizationModeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetAuthorizationModeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetAuthorizationModeTaggedBuilder interface {
 	WithValue(BACnetAuthorizationMode) BACnetAuthorizationModeTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetAuthorizationModeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetAuthorizationModeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetAuthorizationModeTaggedBuilder
 	// Build builds the BACnetAuthorizationModeTagged or returns an error if something is wrong
 	Build() (BACnetAuthorizationModeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetAuthorizationModeTaggedBuilder) WithProprietaryValue(proprietary
 	return b
 }
 
-func (b *_BACnetAuthorizationModeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetAuthorizationModeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetAuthorizationModeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetAuthorizationModeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetAuthorizationModeTaggedBuilder) Build() (BACnetAuthorizationModeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetAuthorizationModeTaggedParseWithBufferProducer(tagNumber uint8, tagCl
 }
 
 func BACnetAuthorizationModeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetAuthorizationModeTagged, error) {
-	v, err := (&_BACnetAuthorizationModeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetAuthorizationModeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetAuthorizationModeTagged) SerializeWithWriteBuffer(ctx context.Co
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetAuthorizationModeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetAuthorizationModeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetAuthorizationModeTagged) IsBACnetAuthorizationModeTagged() {}
 
 func (m *_BACnetAuthorizationModeTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetAuthorizationModeTagged) deepCopy() *_BACnetAuthorizationModeTag
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetAuthorizationModeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetBDTEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetBDTEntry.go
index 2ac518dd2f3..08ae4acaec0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetBDTEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetBDTEntry.go
@@ -238,7 +238,7 @@ func BACnetBDTEntryParseWithBufferProducer() func(ctx context.Context, readBuffe
 }
 
 func BACnetBDTEntryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetBDTEntry, error) {
-	v, err := (&_BACnetBDTEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetBDTEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupStateTagged.go
index f585a362e4c..e01b7c19b0d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupStateTagged.go
@@ -54,20 +54,16 @@ type BACnetBackupStateTagged interface {
 type _BACnetBackupStateTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetBackupState
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetBackupStateTagged = (*_BACnetBackupStateTagged)(nil)
 
 // NewBACnetBackupStateTagged factory function for _BACnetBackupStateTagged
-func NewBACnetBackupStateTagged(header BACnetTagHeader, value BACnetBackupState, tagNumber uint8, tagClass TagClass) *_BACnetBackupStateTagged {
+func NewBACnetBackupStateTagged(header BACnetTagHeader, value BACnetBackupState) *_BACnetBackupStateTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetBackupStateTagged must not be nil")
 	}
-	return &_BACnetBackupStateTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetBackupStateTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetBackupStateTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetBackupStateTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetBackupState) BACnetBackupStateTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetBackupStateTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetBackupStateTaggedBuilder
 	// Build builds the BACnetBackupStateTagged or returns an error if something is wrong
 	Build() (BACnetBackupStateTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetBackupStateTaggedBuilder) WithValue(value BACnetBackupState) BAC
 	return b
 }
 
-func (b *_BACnetBackupStateTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetBackupStateTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetBackupStateTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetBackupStateTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetBackupStateTaggedBuilder) Build() (BACnetBackupStateTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetBackupStateTaggedParseWithBufferProducer(tagNumber uint8, tagClass Ta
 }
 
 func BACnetBackupStateTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetBackupStateTagged, error) {
-	v, err := (&_BACnetBackupStateTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetBackupStateTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetBackupStateTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetBackupStateTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetBackupStateTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetBackupStateTagged) IsBACnetBackupStateTagged() {}
 
 func (m *_BACnetBackupStateTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetBackupStateTagged) deepCopy() *_BACnetBackupStateTagged {
 	_BACnetBackupStateTaggedCopy := &_BACnetBackupStateTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetBackupStateTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPVTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPVTagged.go
index c1e4148861e..56c910db535 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPVTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPVTagged.go
@@ -59,20 +59,16 @@ type _BACnetBinaryLightingPVTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetBinaryLightingPV
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetBinaryLightingPVTagged = (*_BACnetBinaryLightingPVTagged)(nil)
 
 // NewBACnetBinaryLightingPVTagged factory function for _BACnetBinaryLightingPVTagged
-func NewBACnetBinaryLightingPVTagged(header BACnetTagHeader, value BACnetBinaryLightingPV, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetBinaryLightingPVTagged {
+func NewBACnetBinaryLightingPVTagged(header BACnetTagHeader, value BACnetBinaryLightingPV, proprietaryValue uint32) *_BACnetBinaryLightingPVTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetBinaryLightingPVTagged must not be nil")
 	}
-	return &_BACnetBinaryLightingPVTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetBinaryLightingPVTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetBinaryLightingPVTaggedBuilder interface {
 	WithValue(BACnetBinaryLightingPV) BACnetBinaryLightingPVTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetBinaryLightingPVTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetBinaryLightingPVTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetBinaryLightingPVTaggedBuilder
 	// Build builds the BACnetBinaryLightingPVTagged or returns an error if something is wrong
 	Build() (BACnetBinaryLightingPVTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetBinaryLightingPVTaggedBuilder) WithProprietaryValue(proprietaryV
 	return b
 }
 
-func (b *_BACnetBinaryLightingPVTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetBinaryLightingPVTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetBinaryLightingPVTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetBinaryLightingPVTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetBinaryLightingPVTaggedBuilder) Build() (BACnetBinaryLightingPVTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetBinaryLightingPVTaggedParseWithBufferProducer(tagNumber uint8, tagCla
 }
 
 func BACnetBinaryLightingPVTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetBinaryLightingPVTagged, error) {
-	v, err := (&_BACnetBinaryLightingPVTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetBinaryLightingPVTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetBinaryLightingPVTagged) SerializeWithWriteBuffer(ctx context.Con
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetBinaryLightingPVTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetBinaryLightingPVTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetBinaryLightingPVTagged) IsBACnetBinaryLightingPVTagged() {}
 
 func (m *_BACnetBinaryLightingPVTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetBinaryLightingPVTagged) deepCopy() *_BACnetBinaryLightingPVTagge
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetBinaryLightingPVTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPVTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPVTagged.go
index 085665d3685..0fa9649f674 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPVTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPVTagged.go
@@ -54,20 +54,16 @@ type BACnetBinaryPVTagged interface {
 type _BACnetBinaryPVTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetBinaryPV
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetBinaryPVTagged = (*_BACnetBinaryPVTagged)(nil)
 
 // NewBACnetBinaryPVTagged factory function for _BACnetBinaryPVTagged
-func NewBACnetBinaryPVTagged(header BACnetTagHeader, value BACnetBinaryPV, tagNumber uint8, tagClass TagClass) *_BACnetBinaryPVTagged {
+func NewBACnetBinaryPVTagged(header BACnetTagHeader, value BACnetBinaryPV) *_BACnetBinaryPVTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetBinaryPVTagged must not be nil")
 	}
-	return &_BACnetBinaryPVTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetBinaryPVTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetBinaryPVTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetBinaryPVTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetBinaryPV) BACnetBinaryPVTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetBinaryPVTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetBinaryPVTaggedBuilder
 	// Build builds the BACnetBinaryPVTagged or returns an error if something is wrong
 	Build() (BACnetBinaryPVTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetBinaryPVTaggedBuilder) WithValue(value BACnetBinaryPV) BACnetBin
 	return b
 }
 
-func (b *_BACnetBinaryPVTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetBinaryPVTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetBinaryPVTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetBinaryPVTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetBinaryPVTaggedBuilder) Build() (BACnetBinaryPVTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetBinaryPVTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagCl
 }
 
 func BACnetBinaryPVTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetBinaryPVTagged, error) {
-	v, err := (&_BACnetBinaryPVTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetBinaryPVTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetBinaryPVTagged) SerializeWithWriteBuffer(ctx context.Context, wr
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetBinaryPVTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetBinaryPVTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetBinaryPVTagged) IsBACnetBinaryPVTagged() {}
 
 func (m *_BACnetBinaryPVTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetBinaryPVTagged) deepCopy() *_BACnetBinaryPVTagged {
 	_BACnetBinaryPVTaggedCopy := &_BACnetBinaryPVTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetBinaryPVTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscription.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscription.go
index d5b22b83442..3874b4e14db 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscription.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscription.go
@@ -347,7 +347,7 @@ func BACnetCOVMultipleSubscriptionParseWithBufferProducer() func(ctx context.Con
 }
 
 func BACnetCOVMultipleSubscriptionParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetCOVMultipleSubscription, error) {
-	v, err := (&_BACnetCOVMultipleSubscription{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetCOVMultipleSubscription)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification.go
index 4ed49be916e..c39da7edc4c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification.go
@@ -57,22 +57,19 @@ type _BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification struct {
 	OpeningTag                              BACnetOpeningTag
 	ListOfCovSubscriptionSpecificationEntry []BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry
 	ClosingTag                              BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification = (*_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification)(nil)
 
 // NewBACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification factory function for _BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification
-func NewBACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification(openingTag BACnetOpeningTag, listOfCovSubscriptionSpecificationEntry []BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification {
+func NewBACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification(openingTag BACnetOpeningTag, listOfCovSubscriptionSpecificationEntry []BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry, closingTag BACnetClosingTag) *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification must not be nil")
 	}
-	return &_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification{OpeningTag: openingTag, ListOfCovSubscriptionSpecificationEntry: listOfCovSubscriptionSpecificationEntry, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification{OpeningTag: openingTag, ListOfCovSubscriptionSpecificationEntry: listOfCovSubscriptionSpecificationEntry, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationBuilder inte
 	WithClosingTag(BACnetClosingTag) BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationBuilder
 	// Build builds the BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification or returns an error if something is wrong
 	Build() (BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationBuilder
 	return b
 }
 
-func (b *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationBuilder) WithArgTagNumber(tagNumber uint8) BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationBuilder) Build() (BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationParseWithBuf
 }
 
 func BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification, error) {
-	v, err := (&_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification) Seria
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification) IsBACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification() {
 }
 
@@ -374,7 +354,6 @@ func (m *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification) deepC
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry, BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry](m.ListOfCovSubscriptionSpecificationEntry),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry.go
index 88361f7ca25..c8fa8f9db8c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry.go
@@ -242,7 +242,7 @@ func BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryParseWi
 }
 
 func BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry, error) {
-	v, err := (&_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences.go
index 1caea4864f5..5eafa79e4ce 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences.go
@@ -57,22 +57,19 @@ type _BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOf
 	OpeningTag          BACnetOpeningTag
 	ListOfCovReferences []BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry
 	ClosingTag          BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences = (*_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences)(nil)
 
 // NewBACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences factory function for _BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences
-func NewBACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences(openingTag BACnetOpeningTag, listOfCovReferences []BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences {
+func NewBACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences(openingTag BACnetOpeningTag, listOfCovReferences []BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry, closingTag BACnetClosingTag) *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences must not be nil")
 	}
-	return &_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences{OpeningTag: openingTag, ListOfCovReferences: listOfCovReferences, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences{OpeningTag: openingTag, ListOfCovReferences: listOfCovReferences, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfC
 	WithClosingTag(BACnetClosingTag) BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesBuilder
 	// Build builds the BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences or returns an error if something is wrong
 	Build() (BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryLi
 	return b
 }
 
-func (b *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesBuilder) WithArgTagNumber(tagNumber uint8) BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesBuilder) Build() (BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfC
 }
 
 func BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences, error) {
-	v, err := (&_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryLi
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences) IsBACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences() {
 }
 
@@ -374,7 +354,6 @@ func (m *_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryLi
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry, BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry](m.ListOfCovReferences),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry.go
index 5c114e95d40..e978c51bbb1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry.go
@@ -273,7 +273,7 @@ func BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfC
 }
 
 func BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry, error) {
-	v, err := (&_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVSubscription.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVSubscription.go
index 211a074fc45..44ee0da497c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVSubscription.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVSubscription.go
@@ -343,7 +343,7 @@ func BACnetCOVSubscriptionParseWithBufferProducer() func(ctx context.Context, re
 }
 
 func BACnetCOVSubscriptionParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetCOVSubscription, error) {
-	v, err := (&_BACnetCOVSubscription{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetCOVSubscription)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntry.go
index 158f4ac2862..880ef3faa77 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntry.go
@@ -325,7 +325,7 @@ func BACnetCalendarEntryParseWithBufferProducer[T BACnetCalendarEntry]() func(ct
 }
 
 func BACnetCalendarEntryParseWithBuffer[T BACnetCalendarEntry](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetCalendarEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetCalendarEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryEnclosed.go
index 1a8921b7564..def3d5dfb66 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetCalendarEntryEnclosed struct {
 	OpeningTag    BACnetOpeningTag
 	CalendarEntry BACnetCalendarEntry
 	ClosingTag    BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetCalendarEntryEnclosed = (*_BACnetCalendarEntryEnclosed)(nil)
 
 // NewBACnetCalendarEntryEnclosed factory function for _BACnetCalendarEntryEnclosed
-func NewBACnetCalendarEntryEnclosed(openingTag BACnetOpeningTag, calendarEntry BACnetCalendarEntry, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetCalendarEntryEnclosed {
+func NewBACnetCalendarEntryEnclosed(openingTag BACnetOpeningTag, calendarEntry BACnetCalendarEntry, closingTag BACnetClosingTag) *_BACnetCalendarEntryEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetCalendarEntryEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetCalendarEntryEnclosed(openingTag BACnetOpeningTag, calendarEntry B
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetCalendarEntryEnclosed must not be nil")
 	}
-	return &_BACnetCalendarEntryEnclosed{OpeningTag: openingTag, CalendarEntry: calendarEntry, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetCalendarEntryEnclosed{OpeningTag: openingTag, CalendarEntry: calendarEntry, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetCalendarEntryEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetCalendarEntryEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetCalendarEntryEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetCalendarEntryEnclosedBuilder
 	// Build builds the BACnetCalendarEntryEnclosed or returns an error if something is wrong
 	Build() (BACnetCalendarEntryEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetCalendarEntryEnclosedBuilder) WithClosingTagBuilder(builderSuppl
 	return b
 }
 
-func (b *_BACnetCalendarEntryEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetCalendarEntryEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetCalendarEntryEnclosedBuilder) Build() (BACnetCalendarEntryEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetCalendarEntryEnclosedParseWithBufferProducer(tagNumber uint8) func(ct
 }
 
 func BACnetCalendarEntryEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetCalendarEntryEnclosed, error) {
-	v, err := (&_BACnetCalendarEntryEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetCalendarEntryEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetCalendarEntryEnclosed) SerializeWithWriteBuffer(ctx context.Cont
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetCalendarEntryEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetCalendarEntryEnclosed) IsBACnetCalendarEntryEnclosed() {}
 
 func (m *_BACnetCalendarEntryEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetCalendarEntryEnclosed) deepCopy() *_BACnetCalendarEntryEnclosed
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetCalendarEntry](m.CalendarEntry),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetCalendarEntryEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValue.go
index da28da322b4..11a101d7958 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValue.go
@@ -470,7 +470,7 @@ func BACnetChannelValueParseWithBufferProducer[T BACnetChannelValue]() func(ctx
 }
 
 func BACnetChannelValueParseWithBuffer[T BACnetChannelValue](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetChannelValue{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetChannelValue)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOV.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOV.go
index 0395469aa9d..12a0e92b580 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOV.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOV.go
@@ -313,7 +313,7 @@ func BACnetClientCOVParseWithBufferProducer[T BACnetClientCOV]() func(ctx contex
 }
 
 func BACnetClientCOVParseWithBuffer[T BACnetClientCOV](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetClientCOV{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetClientCOV)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetClosingTag.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetClosingTag.go
index b772840e123..aba148f8075 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetClosingTag.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetClosingTag.go
@@ -51,19 +51,16 @@ type BACnetClosingTag interface {
 // _BACnetClosingTag is the data-structure of this message
 type _BACnetClosingTag struct {
 	Header BACnetTagHeader
-
-	// Arguments.
-	TagNumberArgument uint8
 }
 
 var _ BACnetClosingTag = (*_BACnetClosingTag)(nil)
 
 // NewBACnetClosingTag factory function for _BACnetClosingTag
-func NewBACnetClosingTag(header BACnetTagHeader, tagNumberArgument uint8) *_BACnetClosingTag {
+func NewBACnetClosingTag(header BACnetTagHeader) *_BACnetClosingTag {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetClosingTag must not be nil")
 	}
-	return &_BACnetClosingTag{Header: header, TagNumberArgument: tagNumberArgument}
+	return &_BACnetClosingTag{Header: header}
 }
 
 ///////////////////////////////////////////////////////////
@@ -80,8 +77,6 @@ type BACnetClosingTagBuilder interface {
 	WithHeader(BACnetTagHeader) BACnetClosingTagBuilder
 	// WithHeaderBuilder adds Header (property field) which is build by the builder
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetClosingTagBuilder
-	// WithArgTagNumberArgument sets a parser argument
-	WithArgTagNumberArgument(uint8) BACnetClosingTagBuilder
 	// Build builds the BACnetClosingTag or returns an error if something is wrong
 	Build() (BACnetClosingTag, error)
 	// MustBuild does the same as Build but panics on error
@@ -120,11 +115,6 @@ func (b *_BACnetClosingTagBuilder) WithHeaderBuilder(builderSupplier func(BACnet
 	return b
 }
 
-func (b *_BACnetClosingTagBuilder) WithArgTagNumberArgument(tagNumberArgument uint8) BACnetClosingTagBuilder {
-	b.TagNumberArgument = tagNumberArgument
-	return b
-}
-
 func (b *_BACnetClosingTagBuilder) Build() (BACnetClosingTag, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -217,7 +207,7 @@ func BACnetClosingTagParseWithBufferProducer(tagNumberArgument uint8) func(ctx c
 }
 
 func BACnetClosingTagParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumberArgument uint8) (BACnetClosingTag, error) {
-	v, err := (&_BACnetClosingTag{TagNumberArgument: tagNumberArgument}).parse(ctx, readBuffer, tagNumberArgument)
+	v, err := (new(_BACnetClosingTag)).parse(ctx, readBuffer, tagNumberArgument)
 	if err != nil {
 		return nil, err
 	}
@@ -288,16 +278,6 @@ func (m *_BACnetClosingTag) SerializeWithWriteBuffer(ctx context.Context, writeB
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetClosingTag) GetTagNumberArgument() uint8 {
-	return m.TagNumberArgument
-}
-
-//
-////
-
 func (m *_BACnetClosingTag) IsBACnetClosingTag() {}
 
 func (m *_BACnetClosingTag) DeepCopy() any {
@@ -310,7 +290,6 @@ func (m *_BACnetClosingTag) deepCopy() *_BACnetClosingTag {
 	}
 	_BACnetClosingTagCopy := &_BACnetClosingTag{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
-		m.TagNumberArgument,
 	}
 	return _BACnetClosingTagCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
index 54ee1dfdf70..580582a682c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
@@ -50,10 +50,10 @@ type BACnetConfirmedServiceRequest interface {
 
 // BACnetConfirmedServiceRequestContract provides a set of functions which can be overwritten by a sub struct
 type BACnetConfirmedServiceRequestContract interface {
+	// GetServiceRequestLength returns ServiceRequestLength (property field)
+	GetServiceRequestLength() uint32
 	// GetServiceRequestPayloadLength returns ServiceRequestPayloadLength (virtual field)
 	GetServiceRequestPayloadLength() uint32
-	// GetServiceRequestLength() returns a parser argument
-	GetServiceRequestLength() uint32
 	// IsBACnetConfirmedServiceRequest is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetConfirmedServiceRequest()
 	// CreateBuilder creates a BACnetConfirmedServiceRequestBuilder
@@ -74,8 +74,6 @@ type _BACnetConfirmedServiceRequest struct {
 		BACnetConfirmedServiceRequestContract
 		BACnetConfirmedServiceRequestRequirements
 	}
-
-	// Arguments.
 	ServiceRequestLength uint32
 }
 
@@ -95,9 +93,9 @@ func NewBACnetConfirmedServiceRequest(serviceRequestLength uint32) *_BACnetConfi
 type BACnetConfirmedServiceRequestBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
-	WithMandatoryFields() BACnetConfirmedServiceRequestBuilder
-	// WithArgServiceRequestLength sets a parser argument
-	WithArgServiceRequestLength(uint32) BACnetConfirmedServiceRequestBuilder
+	WithMandatoryFields(serviceRequestLength uint32) BACnetConfirmedServiceRequestBuilder
+	// WithServiceRequestLength adds ServiceRequestLength (property field)
+	WithServiceRequestLength(uint32) BACnetConfirmedServiceRequestBuilder
 	// AsBACnetConfirmedServiceRequestAcknowledgeAlarm converts this build to a subType of BACnetConfirmedServiceRequest. It is always possible to return to current builder using Done()
 	AsBACnetConfirmedServiceRequestAcknowledgeAlarm() BACnetConfirmedServiceRequestAcknowledgeAlarmBuilder
 	// AsBACnetConfirmedServiceRequestConfirmedCOVNotification converts this build to a subType of BACnetConfirmedServiceRequest. It is always possible to return to current builder using Done()
@@ -193,11 +191,11 @@ type _BACnetConfirmedServiceRequestBuilder struct {
 
 var _ (BACnetConfirmedServiceRequestBuilder) = (*_BACnetConfirmedServiceRequestBuilder)(nil)
 
-func (b *_BACnetConfirmedServiceRequestBuilder) WithMandatoryFields() BACnetConfirmedServiceRequestBuilder {
-	return b
+func (b *_BACnetConfirmedServiceRequestBuilder) WithMandatoryFields(serviceRequestLength uint32) BACnetConfirmedServiceRequestBuilder {
+	return b.WithServiceRequestLength(serviceRequestLength)
 }
 
-func (b *_BACnetConfirmedServiceRequestBuilder) WithArgServiceRequestLength(serviceRequestLength uint32) BACnetConfirmedServiceRequestBuilder {
+func (b *_BACnetConfirmedServiceRequestBuilder) WithServiceRequestLength(serviceRequestLength uint32) BACnetConfirmedServiceRequestBuilder {
 	b.ServiceRequestLength = serviceRequestLength
 	return b
 }
@@ -580,6 +578,19 @@ func (b *_BACnetConfirmedServiceRequest) CreateBACnetConfirmedServiceRequestBuil
 ///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 
+///////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////
+/////////////////////// Accessors for property fields.
+///////////////////////
+
+func (m *_BACnetConfirmedServiceRequest) GetServiceRequestLength() uint32 {
+	return m.ServiceRequestLength
+}
+
+///////////////////////
+///////////////////////
+///////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 /////////////////////// Accessors for virtual fields.
@@ -646,7 +657,7 @@ func BACnetConfirmedServiceRequestParseWithBufferProducer[T BACnetConfirmedServi
 }
 
 func BACnetConfirmedServiceRequestParseWithBuffer[T BACnetConfirmedServiceRequest](ctx context.Context, readBuffer utils.ReadBuffer, serviceRequestLength uint32) (T, error) {
-	v, err := (&_BACnetConfirmedServiceRequest{ServiceRequestLength: serviceRequestLength}).parse(ctx, readBuffer, serviceRequestLength)
+	v, err := (new(_BACnetConfirmedServiceRequest)).parse(ctx, readBuffer, serviceRequestLength)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -672,6 +683,7 @@ func (m *_BACnetConfirmedServiceRequest) parse(ctx context.Context, readBuffer u
 	if err != nil {
 		return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'serviceChoice' field"))
 	}
+	m.ServiceRequestLength = serviceRequestLength
 
 	serviceRequestPayloadLength, err := ReadVirtualField[uint32](ctx, "serviceRequestPayloadLength", (*uint32)(nil), utils.InlineIf((bool((serviceRequestLength) > (0))), func() any { return uint32((uint32(serviceRequestLength) - uint32(uint32(1)))) }, func() any { return uint32(uint32(0)) }).(uint32))
 	if err != nil {
@@ -854,16 +866,6 @@ func (pm *_BACnetConfirmedServiceRequest) serializeParent(ctx context.Context, w
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequest) GetServiceRequestLength() uint32 {
-	return m.ServiceRequestLength
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequest) IsBACnetConfirmedServiceRequest() {}
 
 func (m *_BACnetConfirmedServiceRequest) DeepCopy() any {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
index 848a8e25867..506010a9da7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
@@ -74,7 +74,7 @@ var _ BACnetConfirmedServiceRequestAcknowledgeAlarm = (*_BACnetConfirmedServiceR
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestAcknowledgeAlarm)(nil)
 
 // NewBACnetConfirmedServiceRequestAcknowledgeAlarm factory function for _BACnetConfirmedServiceRequestAcknowledgeAlarm
-func NewBACnetConfirmedServiceRequestAcknowledgeAlarm(acknowledgingProcessIdentifier BACnetContextTagUnsignedInteger, eventObjectIdentifier BACnetContextTagObjectIdentifier, eventStateAcknowledged BACnetEventStateTagged, timestamp BACnetTimeStampEnclosed, acknowledgmentSource BACnetContextTagCharacterString, timeOfAcknowledgment BACnetTimeStampEnclosed, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestAcknowledgeAlarm {
+func NewBACnetConfirmedServiceRequestAcknowledgeAlarm(serviceRequestLength uint32, acknowledgingProcessIdentifier BACnetContextTagUnsignedInteger, eventObjectIdentifier BACnetContextTagObjectIdentifier, eventStateAcknowledged BACnetEventStateTagged, timestamp BACnetTimeStampEnclosed, acknowledgmentSource BACnetContextTagCharacterString, timeOfAcknowledgment BACnetTimeStampEnclosed) *_BACnetConfirmedServiceRequestAcknowledgeAlarm {
 	if acknowledgingProcessIdentifier == nil {
 		panic("acknowledgingProcessIdentifier of type BACnetContextTagUnsignedInteger for BACnetConfirmedServiceRequestAcknowledgeAlarm must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
index 89427986b44..73e0a82af8e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
@@ -68,7 +68,7 @@ var _ BACnetConfirmedServiceRequestAddListElement = (*_BACnetConfirmedServiceReq
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestAddListElement)(nil)
 
 // NewBACnetConfirmedServiceRequestAddListElement factory function for _BACnetConfirmedServiceRequestAddListElement
-func NewBACnetConfirmedServiceRequestAddListElement(objectIdentifier BACnetContextTagObjectIdentifier, propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger, listOfElements BACnetConstructedData, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestAddListElement {
+func NewBACnetConfirmedServiceRequestAddListElement(serviceRequestLength uint32, objectIdentifier BACnetContextTagObjectIdentifier, propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger, listOfElements BACnetConstructedData) *_BACnetConfirmedServiceRequestAddListElement {
 	if objectIdentifier == nil {
 		panic("objectIdentifier of type BACnetContextTagObjectIdentifier for BACnetConfirmedServiceRequestAddListElement must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
index 8cf2bbc0fea..5fdff2c601e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
@@ -62,7 +62,7 @@ var _ BACnetConfirmedServiceRequestAtomicReadFile = (*_BACnetConfirmedServiceReq
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestAtomicReadFile)(nil)
 
 // NewBACnetConfirmedServiceRequestAtomicReadFile factory function for _BACnetConfirmedServiceRequestAtomicReadFile
-func NewBACnetConfirmedServiceRequestAtomicReadFile(fileIdentifier BACnetApplicationTagObjectIdentifier, accessMethod BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestAtomicReadFile {
+func NewBACnetConfirmedServiceRequestAtomicReadFile(serviceRequestLength uint32, fileIdentifier BACnetApplicationTagObjectIdentifier, accessMethod BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord) *_BACnetConfirmedServiceRequestAtomicReadFile {
 	if fileIdentifier == nil {
 		panic("fileIdentifier of type BACnetApplicationTagObjectIdentifier for BACnetConfirmedServiceRequestAtomicReadFile must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go
index 5522bf78ec7..dbaa6117790 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go
@@ -383,7 +383,7 @@ func BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordParseWithBufferPro
 }
 
 func BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordParseWithBuffer[T BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
index 8d4e94983a0..b963a7c16a0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
@@ -71,7 +71,7 @@ var _ BACnetConfirmedServiceRequestAtomicWriteFile = (*_BACnetConfirmedServiceRe
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestAtomicWriteFile)(nil)
 
 // NewBACnetConfirmedServiceRequestAtomicWriteFile factory function for _BACnetConfirmedServiceRequestAtomicWriteFile
-func NewBACnetConfirmedServiceRequestAtomicWriteFile(deviceIdentifier BACnetApplicationTagObjectIdentifier, openingTag BACnetOpeningTag, fileStartPosition BACnetApplicationTagSignedInteger, fileData BACnetApplicationTagOctetString, closingTag BACnetClosingTag, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestAtomicWriteFile {
+func NewBACnetConfirmedServiceRequestAtomicWriteFile(serviceRequestLength uint32, deviceIdentifier BACnetApplicationTagObjectIdentifier, openingTag BACnetOpeningTag, fileStartPosition BACnetApplicationTagSignedInteger, fileData BACnetApplicationTagOctetString, closingTag BACnetClosingTag) *_BACnetConfirmedServiceRequestAtomicWriteFile {
 	if deviceIdentifier == nil {
 		panic("deviceIdentifier of type BACnetApplicationTagObjectIdentifier for BACnetConfirmedServiceRequestAtomicWriteFile must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAuthenticate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAuthenticate.go
index 38d3d40d2dd..6696b1f3b91 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAuthenticate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAuthenticate.go
@@ -53,16 +53,13 @@ type BACnetConfirmedServiceRequestAuthenticate interface {
 type _BACnetConfirmedServiceRequestAuthenticate struct {
 	BACnetConfirmedServiceRequestContract
 	BytesOfRemovedService []byte
-
-	// Arguments.
-	ServiceRequestPayloadLength uint32
 }
 
 var _ BACnetConfirmedServiceRequestAuthenticate = (*_BACnetConfirmedServiceRequestAuthenticate)(nil)
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestAuthenticate)(nil)
 
 // NewBACnetConfirmedServiceRequestAuthenticate factory function for _BACnetConfirmedServiceRequestAuthenticate
-func NewBACnetConfirmedServiceRequestAuthenticate(bytesOfRemovedService []byte, serviceRequestPayloadLength uint32, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestAuthenticate {
+func NewBACnetConfirmedServiceRequestAuthenticate(serviceRequestLength uint32, bytesOfRemovedService []byte) *_BACnetConfirmedServiceRequestAuthenticate {
 	_result := &_BACnetConfirmedServiceRequestAuthenticate{
 		BACnetConfirmedServiceRequestContract: NewBACnetConfirmedServiceRequest(serviceRequestLength),
 		BytesOfRemovedService:                 bytesOfRemovedService,
@@ -83,8 +80,6 @@ type BACnetConfirmedServiceRequestAuthenticateBuilder interface {
 	WithMandatoryFields(bytesOfRemovedService []byte) BACnetConfirmedServiceRequestAuthenticateBuilder
 	// WithBytesOfRemovedService adds BytesOfRemovedService (property field)
 	WithBytesOfRemovedService(...byte) BACnetConfirmedServiceRequestAuthenticateBuilder
-	// WithArgServiceRequestPayloadLength sets a parser argument
-	WithArgServiceRequestPayloadLength(uint32) BACnetConfirmedServiceRequestAuthenticateBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BACnetConfirmedServiceRequestBuilder
 	// Build builds the BACnetConfirmedServiceRequestAuthenticate or returns an error if something is wrong
@@ -122,11 +117,6 @@ func (b *_BACnetConfirmedServiceRequestAuthenticateBuilder) WithBytesOfRemovedSe
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestAuthenticateBuilder) WithArgServiceRequestPayloadLength(serviceRequestPayloadLength uint32) BACnetConfirmedServiceRequestAuthenticateBuilder {
-	b.ServiceRequestPayloadLength = serviceRequestPayloadLength
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestAuthenticateBuilder) Build() (BACnetConfirmedServiceRequestAuthenticate, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -290,16 +280,6 @@ func (m *_BACnetConfirmedServiceRequestAuthenticate) SerializeWithWriteBuffer(ct
 	return m.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestAuthenticate) GetServiceRequestPayloadLength() uint32 {
-	return m.ServiceRequestPayloadLength
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestAuthenticate) IsBACnetConfirmedServiceRequestAuthenticate() {}
 
 func (m *_BACnetConfirmedServiceRequestAuthenticate) DeepCopy() any {
@@ -313,7 +293,6 @@ func (m *_BACnetConfirmedServiceRequestAuthenticate) deepCopy() *_BACnetConfirme
 	_BACnetConfirmedServiceRequestAuthenticateCopy := &_BACnetConfirmedServiceRequestAuthenticate{
 		m.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest).deepCopy(),
 		utils.DeepCopySlice[byte, byte](m.BytesOfRemovedService),
-		m.ServiceRequestPayloadLength,
 	}
 	_BACnetConfirmedServiceRequestAuthenticateCopy.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest)._SubType = m
 	return _BACnetConfirmedServiceRequestAuthenticateCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
index 49ec15c0a34..f79edc0ca2a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
@@ -71,7 +71,7 @@ var _ BACnetConfirmedServiceRequestConfirmedCOVNotification = (*_BACnetConfirmed
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestConfirmedCOVNotification)(nil)
 
 // NewBACnetConfirmedServiceRequestConfirmedCOVNotification factory function for _BACnetConfirmedServiceRequestConfirmedCOVNotification
-func NewBACnetConfirmedServiceRequestConfirmedCOVNotification(subscriberProcessIdentifier BACnetContextTagUnsignedInteger, initiatingDeviceIdentifier BACnetContextTagObjectIdentifier, monitoredObjectIdentifier BACnetContextTagObjectIdentifier, lifetimeInSeconds BACnetContextTagUnsignedInteger, listOfValues BACnetPropertyValues, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestConfirmedCOVNotification {
+func NewBACnetConfirmedServiceRequestConfirmedCOVNotification(serviceRequestLength uint32, subscriberProcessIdentifier BACnetContextTagUnsignedInteger, initiatingDeviceIdentifier BACnetContextTagObjectIdentifier, monitoredObjectIdentifier BACnetContextTagObjectIdentifier, lifetimeInSeconds BACnetContextTagUnsignedInteger, listOfValues BACnetPropertyValues) *_BACnetConfirmedServiceRequestConfirmedCOVNotification {
 	if subscriberProcessIdentifier == nil {
 		panic("subscriberProcessIdentifier of type BACnetContextTagUnsignedInteger for BACnetConfirmedServiceRequestConfirmedCOVNotification must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
index 25b701b45dc..5d2e4c05aac 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
@@ -71,7 +71,7 @@ var _ BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple = (*_BACnetC
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple)(nil)
 
 // NewBACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple factory function for _BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple
-func NewBACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple(subscriberProcessIdentifier BACnetContextTagUnsignedInteger, initiatingDeviceIdentifier BACnetContextTagObjectIdentifier, timeRemaining BACnetContextTagUnsignedInteger, timestamp BACnetTimeStampEnclosed, listOfCovNotifications ListOfCovNotificationsList, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple {
+func NewBACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple(serviceRequestLength uint32, subscriberProcessIdentifier BACnetContextTagUnsignedInteger, initiatingDeviceIdentifier BACnetContextTagObjectIdentifier, timeRemaining BACnetContextTagUnsignedInteger, timestamp BACnetTimeStampEnclosed, listOfCovNotifications ListOfCovNotificationsList) *_BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple {
 	if subscriberProcessIdentifier == nil {
 		panic("subscriberProcessIdentifier of type BACnetContextTagUnsignedInteger for BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
index d0389ef3a95..8b0cb184ad1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
@@ -95,7 +95,7 @@ var _ BACnetConfirmedServiceRequestConfirmedEventNotification = (*_BACnetConfirm
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestConfirmedEventNotification)(nil)
 
 // NewBACnetConfirmedServiceRequestConfirmedEventNotification factory function for _BACnetConfirmedServiceRequestConfirmedEventNotification
-func NewBACnetConfirmedServiceRequestConfirmedEventNotification(processIdentifier BACnetContextTagUnsignedInteger, initiatingDeviceIdentifier BACnetContextTagObjectIdentifier, eventObjectIdentifier BACnetContextTagObjectIdentifier, timestamp BACnetTimeStampEnclosed, notificationClass BACnetContextTagUnsignedInteger, priority BACnetContextTagUnsignedInteger, eventType BACnetEventTypeTagged, messageText BACnetContextTagCharacterString, notifyType BACnetNotifyTypeTagged, ackRequired BACnetContextTagBoolean, fromState BACnetEventStateTagged, toState BACnetEventStateTagged, eventValues BACnetNotificationParameters, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestConfirmedEventNotification {
+func NewBACnetConfirmedServiceRequestConfirmedEventNotification(serviceRequestLength uint32, processIdentifier BACnetContextTagUnsignedInteger, initiatingDeviceIdentifier BACnetContextTagObjectIdentifier, eventObjectIdentifier BACnetContextTagObjectIdentifier, timestamp BACnetTimeStampEnclosed, notificationClass BACnetContextTagUnsignedInteger, priority BACnetContextTagUnsignedInteger, eventType BACnetEventTypeTagged, messageText BACnetContextTagCharacterString, notifyType BACnetNotifyTypeTagged, ackRequired BACnetContextTagBoolean, fromState BACnetEventStateTagged, toState BACnetEventStateTagged, eventValues BACnetNotificationParameters) *_BACnetConfirmedServiceRequestConfirmedEventNotification {
 	if processIdentifier == nil {
 		panic("processIdentifier of type BACnetContextTagUnsignedInteger for BACnetConfirmedServiceRequestConfirmedEventNotification must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
index e0bdcf879c5..9d69d9e2f08 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
@@ -65,7 +65,7 @@ var _ BACnetConfirmedServiceRequestConfirmedPrivateTransfer = (*_BACnetConfirmed
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestConfirmedPrivateTransfer)(nil)
 
 // NewBACnetConfirmedServiceRequestConfirmedPrivateTransfer factory function for _BACnetConfirmedServiceRequestConfirmedPrivateTransfer
-func NewBACnetConfirmedServiceRequestConfirmedPrivateTransfer(vendorId BACnetVendorIdTagged, serviceNumber BACnetContextTagUnsignedInteger, serviceParameters BACnetConstructedData, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestConfirmedPrivateTransfer {
+func NewBACnetConfirmedServiceRequestConfirmedPrivateTransfer(serviceRequestLength uint32, vendorId BACnetVendorIdTagged, serviceNumber BACnetContextTagUnsignedInteger, serviceParameters BACnetConstructedData) *_BACnetConfirmedServiceRequestConfirmedPrivateTransfer {
 	if vendorId == nil {
 		panic("vendorId of type BACnetVendorIdTagged for BACnetConfirmedServiceRequestConfirmedPrivateTransfer must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
index 616c7eedf35..72dc902e3c0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
@@ -68,7 +68,7 @@ var _ BACnetConfirmedServiceRequestConfirmedTextMessage = (*_BACnetConfirmedServ
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestConfirmedTextMessage)(nil)
 
 // NewBACnetConfirmedServiceRequestConfirmedTextMessage factory function for _BACnetConfirmedServiceRequestConfirmedTextMessage
-func NewBACnetConfirmedServiceRequestConfirmedTextMessage(textMessageSourceDevice BACnetContextTagObjectIdentifier, messageClass BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass, messagePriority BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged, message BACnetContextTagCharacterString, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestConfirmedTextMessage {
+func NewBACnetConfirmedServiceRequestConfirmedTextMessage(serviceRequestLength uint32, textMessageSourceDevice BACnetContextTagObjectIdentifier, messageClass BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass, messagePriority BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged, message BACnetContextTagCharacterString) *_BACnetConfirmedServiceRequestConfirmedTextMessage {
 	if textMessageSourceDevice == nil {
 		panic("textMessageSourceDevice of type BACnetContextTagObjectIdentifier for BACnetConfirmedServiceRequestConfirmedTextMessage must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.go
index 15376d55857..801f5281130 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.go
@@ -58,8 +58,6 @@ type BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassContract inter
 	GetClosingTag() BACnetClosingTag
 	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
-	// GetTagNumber() returns a parser argument
-	GetTagNumber() uint8
 	// IsBACnetConfirmedServiceRequestConfirmedTextMessageMessageClass is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetConfirmedServiceRequestConfirmedTextMessageMessageClass()
 	// CreateBuilder creates a BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder
@@ -83,15 +81,12 @@ type _BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass struct {
 	OpeningTag      BACnetOpeningTag
 	PeekedTagHeader BACnetTagHeader
 	ClosingTag      BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassContract = (*_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass)(nil)
 
 // NewBACnetConfirmedServiceRequestConfirmedTextMessageMessageClass factory function for _BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass
-func NewBACnetConfirmedServiceRequestConfirmedTextMessageMessageClass(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass {
+func NewBACnetConfirmedServiceRequestConfirmedTextMessageMessageClass(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass must not be nil")
 	}
@@ -101,7 +96,7 @@ func NewBACnetConfirmedServiceRequestConfirmedTextMessageMessageClass(openingTag
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass must not be nil")
 	}
-	return &_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -126,8 +121,6 @@ type BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder interf
 	WithClosingTag(BACnetClosingTag) BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder
 	// AsBACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric converts this build to a subType of BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass. It is always possible to return to current builder using Done()
 	AsBACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric() BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumericBuilder
 	// AsBACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter converts this build to a subType of BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass. It is always possible to return to current builder using Done()
@@ -212,11 +205,6 @@ func (b *_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder)
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder) WithArgTagNumber(tagNumber uint8) BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder) PartialBuild() (BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassContract, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -395,7 +383,7 @@ func BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassParseWithBuffe
 }
 
 func BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassParseWithBuffer[T BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass](ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (T, error) {
-	v, err := (&_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -500,16 +488,6 @@ func (pm *_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass) serial
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass) IsBACnetConfirmedServiceRequestConfirmedTextMessageMessageClass() {
 }
 
@@ -526,7 +504,6 @@ func (m *_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass) deepCop
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetTagHeader](m.PeekedTagHeader),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.go
index 97b1826fa64..ad42b6edeaa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.go
@@ -59,12 +59,12 @@ var _ BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter = (
 var _ BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassRequirements = (*_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter)(nil)
 
 // NewBACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter factory function for _BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter
-func NewBACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, characterValue BACnetContextTagCharacterString, tagNumber uint8) *_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter {
+func NewBACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, characterValue BACnetContextTagCharacterString) *_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter {
 	if characterValue == nil {
 		panic("characterValue of type BACnetContextTagCharacterString for BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter must not be nil")
 	}
 	_result := &_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter{
-		BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassContract: NewBACnetConfirmedServiceRequestConfirmedTextMessageMessageClass(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassContract: NewBACnetConfirmedServiceRequestConfirmedTextMessageMessageClass(openingTag, peekedTagHeader, closingTag),
 		CharacterValue: characterValue,
 	}
 	_result.BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassContract.(*_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.go
index b90440d1563..d60ea489a9f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.go
@@ -59,12 +59,12 @@ var _ BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric = (*_
 var _ BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassRequirements = (*_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric)(nil)
 
 // NewBACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric factory function for _BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric
-func NewBACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numericValue BACnetContextTagUnsignedInteger, tagNumber uint8) *_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric {
+func NewBACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numericValue BACnetContextTagUnsignedInteger) *_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric {
 	if numericValue == nil {
 		panic("numericValue of type BACnetContextTagUnsignedInteger for BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric must not be nil")
 	}
 	_result := &_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric{
-		BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassContract: NewBACnetConfirmedServiceRequestConfirmedTextMessageMessageClass(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassContract: NewBACnetConfirmedServiceRequestConfirmedTextMessageMessageClass(openingTag, peekedTagHeader, closingTag),
 		NumericValue: numericValue,
 	}
 	_result.BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassContract.(*_BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged.go
index 7fbfb88b58f..32b64091dd5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged.go
@@ -54,20 +54,16 @@ type BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged inte
 type _BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged = (*_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged)(nil)
 
 // NewBACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged factory function for _BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged
-func NewBACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged(header BACnetTagHeader, value BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority, tagNumber uint8, tagClass TagClass) *_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged {
+func NewBACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged(header BACnetTagHeader, value BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority) *_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged must not be nil")
 	}
-	return &_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTaggedBuild
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority) BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTaggedBuilder
 	// Build builds the BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged or returns an error if something is wrong
 	Build() (BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTaggedBuilder) Build() (BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTaggedParse
 }
 
 func BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged, error) {
-	v, err := (&_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged) IsBACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged() {
 }
 
@@ -344,8 +314,6 @@ func (m *_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged
 	_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTaggedCopy := &_BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
index 95dd6e3f813..6f85a5179b1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
@@ -62,7 +62,7 @@ var _ BACnetConfirmedServiceRequestCreateObject = (*_BACnetConfirmedServiceReque
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestCreateObject)(nil)
 
 // NewBACnetConfirmedServiceRequestCreateObject factory function for _BACnetConfirmedServiceRequestCreateObject
-func NewBACnetConfirmedServiceRequestCreateObject(objectSpecifier BACnetConfirmedServiceRequestCreateObjectObjectSpecifier, listOfValues BACnetPropertyValues, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestCreateObject {
+func NewBACnetConfirmedServiceRequestCreateObject(serviceRequestLength uint32, objectSpecifier BACnetConfirmedServiceRequestCreateObjectObjectSpecifier, listOfValues BACnetPropertyValues) *_BACnetConfirmedServiceRequestCreateObject {
 	if objectSpecifier == nil {
 		panic("objectSpecifier of type BACnetConfirmedServiceRequestCreateObjectObjectSpecifier for BACnetConfirmedServiceRequestCreateObject must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.go
index b21b52d86fa..92106cd296d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.go
@@ -66,22 +66,19 @@ type _BACnetConfirmedServiceRequestCreateObjectObjectSpecifier struct {
 	RawObjectType    BACnetContextTagEnumerated
 	ObjectIdentifier BACnetContextTagObjectIdentifier
 	ClosingTag       BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetConfirmedServiceRequestCreateObjectObjectSpecifier = (*_BACnetConfirmedServiceRequestCreateObjectObjectSpecifier)(nil)
 
 // NewBACnetConfirmedServiceRequestCreateObjectObjectSpecifier factory function for _BACnetConfirmedServiceRequestCreateObjectObjectSpecifier
-func NewBACnetConfirmedServiceRequestCreateObjectObjectSpecifier(openingTag BACnetOpeningTag, rawObjectType BACnetContextTagEnumerated, objectIdentifier BACnetContextTagObjectIdentifier, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetConfirmedServiceRequestCreateObjectObjectSpecifier {
+func NewBACnetConfirmedServiceRequestCreateObjectObjectSpecifier(openingTag BACnetOpeningTag, rawObjectType BACnetContextTagEnumerated, objectIdentifier BACnetContextTagObjectIdentifier, closingTag BACnetClosingTag) *_BACnetConfirmedServiceRequestCreateObjectObjectSpecifier {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetConfirmedServiceRequestCreateObjectObjectSpecifier must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetConfirmedServiceRequestCreateObjectObjectSpecifier must not be nil")
 	}
-	return &_BACnetConfirmedServiceRequestCreateObjectObjectSpecifier{OpeningTag: openingTag, RawObjectType: rawObjectType, ObjectIdentifier: objectIdentifier, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetConfirmedServiceRequestCreateObjectObjectSpecifier{OpeningTag: openingTag, RawObjectType: rawObjectType, ObjectIdentifier: objectIdentifier, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -110,8 +107,6 @@ type BACnetConfirmedServiceRequestCreateObjectObjectSpecifierBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetConfirmedServiceRequestCreateObjectObjectSpecifierBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetConfirmedServiceRequestCreateObjectObjectSpecifierBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetConfirmedServiceRequestCreateObjectObjectSpecifierBuilder
 	// Build builds the BACnetConfirmedServiceRequestCreateObjectObjectSpecifier or returns an error if something is wrong
 	Build() (BACnetConfirmedServiceRequestCreateObjectObjectSpecifier, error)
 	// MustBuild does the same as Build but panics on error
@@ -195,11 +190,6 @@ func (b *_BACnetConfirmedServiceRequestCreateObjectObjectSpecifierBuilder) WithC
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestCreateObjectObjectSpecifierBuilder) WithArgTagNumber(tagNumber uint8) BACnetConfirmedServiceRequestCreateObjectObjectSpecifierBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestCreateObjectObjectSpecifierBuilder) Build() (BACnetConfirmedServiceRequestCreateObjectObjectSpecifier, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -365,7 +355,7 @@ func BACnetConfirmedServiceRequestCreateObjectObjectSpecifierParseWithBufferProd
 }
 
 func BACnetConfirmedServiceRequestCreateObjectObjectSpecifierParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetConfirmedServiceRequestCreateObjectObjectSpecifier, error) {
-	v, err := (&_BACnetConfirmedServiceRequestCreateObjectObjectSpecifier{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetConfirmedServiceRequestCreateObjectObjectSpecifier)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -500,16 +490,6 @@ func (m *_BACnetConfirmedServiceRequestCreateObjectObjectSpecifier) SerializeWit
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestCreateObjectObjectSpecifier) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestCreateObjectObjectSpecifier) IsBACnetConfirmedServiceRequestCreateObjectObjectSpecifier() {
 }
 
@@ -526,7 +506,6 @@ func (m *_BACnetConfirmedServiceRequestCreateObjectObjectSpecifier) deepCopy() *
 		utils.DeepCopy[BACnetContextTagEnumerated](m.RawObjectType),
 		utils.DeepCopy[BACnetContextTagObjectIdentifier](m.ObjectIdentifier),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetConfirmedServiceRequestCreateObjectObjectSpecifierCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go
index f715927d40c..b043459ec7c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go
@@ -59,7 +59,7 @@ var _ BACnetConfirmedServiceRequestDeleteObject = (*_BACnetConfirmedServiceReque
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestDeleteObject)(nil)
 
 // NewBACnetConfirmedServiceRequestDeleteObject factory function for _BACnetConfirmedServiceRequestDeleteObject
-func NewBACnetConfirmedServiceRequestDeleteObject(objectIdentifier BACnetApplicationTagObjectIdentifier, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestDeleteObject {
+func NewBACnetConfirmedServiceRequestDeleteObject(serviceRequestLength uint32, objectIdentifier BACnetApplicationTagObjectIdentifier) *_BACnetConfirmedServiceRequestDeleteObject {
 	if objectIdentifier == nil {
 		panic("objectIdentifier of type BACnetApplicationTagObjectIdentifier for BACnetConfirmedServiceRequestDeleteObject must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
index 2ad07564a48..5b5e2e0b2ed 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
@@ -65,7 +65,7 @@ var _ BACnetConfirmedServiceRequestDeviceCommunicationControl = (*_BACnetConfirm
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestDeviceCommunicationControl)(nil)
 
 // NewBACnetConfirmedServiceRequestDeviceCommunicationControl factory function for _BACnetConfirmedServiceRequestDeviceCommunicationControl
-func NewBACnetConfirmedServiceRequestDeviceCommunicationControl(timeDuration BACnetContextTagUnsignedInteger, enableDisable BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged, password BACnetContextTagCharacterString, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestDeviceCommunicationControl {
+func NewBACnetConfirmedServiceRequestDeviceCommunicationControl(serviceRequestLength uint32, timeDuration BACnetContextTagUnsignedInteger, enableDisable BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged, password BACnetContextTagCharacterString) *_BACnetConfirmedServiceRequestDeviceCommunicationControl {
 	if enableDisable == nil {
 		panic("enableDisable of type BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged for BACnetConfirmedServiceRequestDeviceCommunicationControl must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged.go
index 710b8162afe..4c19c10d1fe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged.go
@@ -54,20 +54,16 @@ type BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged
 type _BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged = (*_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged)(nil)
 
 // NewBACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged factory function for _BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged
-func NewBACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged(header BACnetTagHeader, value BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable, tagNumber uint8, tagClass TagClass) *_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged {
+func NewBACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged(header BACnetTagHeader, value BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable) *_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged must not be nil")
 	}
-	return &_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTaggedB
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable) BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTaggedBuilder
 	// Build builds the BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged or returns an error if something is wrong
 	Build() (BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTa
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTaggedBuilder) Build() (BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTaggedP
 }
 
 func BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged, error) {
-	v, err := (&_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTa
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged) IsBACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged() {
 }
 
@@ -344,8 +314,6 @@ func (m *_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTa
 	_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTaggedCopy := &_BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
index b8766ed725c..9c31dc19e46 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
@@ -74,7 +74,7 @@ var _ BACnetConfirmedServiceRequestGetEnrollmentSummary = (*_BACnetConfirmedServ
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestGetEnrollmentSummary)(nil)
 
 // NewBACnetConfirmedServiceRequestGetEnrollmentSummary factory function for _BACnetConfirmedServiceRequestGetEnrollmentSummary
-func NewBACnetConfirmedServiceRequestGetEnrollmentSummary(acknowledgmentFilter BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged, enrollmentFilter BACnetRecipientProcessEnclosed, eventStateFilter BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged, eventTypeFilter BACnetEventTypeTagged, priorityFilter BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter, notificationClassFilter BACnetContextTagUnsignedInteger, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestGetEnrollmentSummary {
+func NewBACnetConfirmedServiceRequestGetEnrollmentSummary(serviceRequestLength uint32, acknowledgmentFilter BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged, enrollmentFilter BACnetRecipientProcessEnclosed, eventStateFilter BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged, eventTypeFilter BACnetEventTypeTagged, priorityFilter BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter, notificationClassFilter BACnetContextTagUnsignedInteger) *_BACnetConfirmedServiceRequestGetEnrollmentSummary {
 	if acknowledgmentFilter == nil {
 		panic("acknowledgmentFilter of type BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged for BACnetConfirmedServiceRequestGetEnrollmentSummary must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged.go
index f4d004c0f78..4d5f0a23bf5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged.go
@@ -54,20 +54,16 @@ type BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagge
 type _BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged = (*_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged)(nil)
 
 // NewBACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged factory function for _BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged
-func NewBACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged(header BACnetTagHeader, value BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter, tagNumber uint8, tagClass TagClass) *_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged {
+func NewBACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged(header BACnetTagHeader, value BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter) *_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged must not be nil")
 	}
-	return &_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagge
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter) BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTaggedBuilder
 	// Build builds the BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged or returns an error if something is wrong
 	Build() (BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTaggedBuilder) Build() (BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagge
 }
 
 func BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged, error) {
-	v, err := (&_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged) IsBACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged() {
 }
 
@@ -344,8 +314,6 @@ func (m *_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter
 	_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTaggedCopy := &_BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged.go
index debbb48c78c..87e56a81672 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged.go
@@ -54,20 +54,16 @@ type BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged int
 type _BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged = (*_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged)(nil)
 
 // NewBACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged factory function for _BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged
-func NewBACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged(header BACnetTagHeader, value BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter, tagNumber uint8, tagClass TagClass) *_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged {
+func NewBACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged(header BACnetTagHeader, value BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter) *_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged must not be nil")
 	}
-	return &_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTaggedBuil
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter) BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTaggedBuilder
 	// Build builds the BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged or returns an error if something is wrong
 	Build() (BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagge
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTaggedBuilder) Build() (BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTaggedPars
 }
 
 func BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged, error) {
-	v, err := (&_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagge
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged) IsBACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged() {
 }
 
@@ -344,8 +314,6 @@ func (m *_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagge
 	_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTaggedCopy := &_BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter.go
index fd96e37c4dc..52b44e44b19 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter.go
@@ -60,15 +60,12 @@ type _BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter struct {
 	MinPriority BACnetContextTagUnsignedInteger
 	MaxPriority BACnetContextTagUnsignedInteger
 	ClosingTag  BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter = (*_BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter)(nil)
 
 // NewBACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter factory function for _BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter
-func NewBACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter(openingTag BACnetOpeningTag, minPriority BACnetContextTagUnsignedInteger, maxPriority BACnetContextTagUnsignedInteger, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter {
+func NewBACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter(openingTag BACnetOpeningTag, minPriority BACnetContextTagUnsignedInteger, maxPriority BACnetContextTagUnsignedInteger, closingTag BACnetClosingTag) *_BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter must not be nil")
 	}
@@ -81,7 +78,7 @@ func NewBACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter(openingT
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter must not be nil")
 	}
-	return &_BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter{OpeningTag: openingTag, MinPriority: minPriority, MaxPriority: maxPriority, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter{OpeningTag: openingTag, MinPriority: minPriority, MaxPriority: maxPriority, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -110,8 +107,6 @@ type BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilterBuilder inte
 	WithClosingTag(BACnetClosingTag) BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilterBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilterBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilterBuilder
 	// Build builds the BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter or returns an error if something is wrong
 	Build() (BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter, error)
 	// MustBuild does the same as Build but panics on error
@@ -195,11 +190,6 @@ func (b *_BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilterBuilder
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilterBuilder) WithArgTagNumber(tagNumber uint8) BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilterBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilterBuilder) Build() (BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -322,7 +312,7 @@ func BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilterParseWithBuf
 }
 
 func BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilterParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter, error) {
-	v, err := (&_BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -408,16 +398,6 @@ func (m *_BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter) Seria
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter) IsBACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter() {
 }
 
@@ -434,7 +414,6 @@ func (m *_BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter) deepC
 		utils.DeepCopy[BACnetContextTagUnsignedInteger](m.MinPriority),
 		utils.DeepCopy[BACnetContextTagUnsignedInteger](m.MaxPriority),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilterCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
index 51a2745064a..6851c3a8f5b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
@@ -59,7 +59,7 @@ var _ BACnetConfirmedServiceRequestGetEventInformation = (*_BACnetConfirmedServi
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestGetEventInformation)(nil)
 
 // NewBACnetConfirmedServiceRequestGetEventInformation factory function for _BACnetConfirmedServiceRequestGetEventInformation
-func NewBACnetConfirmedServiceRequestGetEventInformation(lastReceivedObjectIdentifier BACnetContextTagObjectIdentifier, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestGetEventInformation {
+func NewBACnetConfirmedServiceRequestGetEventInformation(serviceRequestLength uint32, lastReceivedObjectIdentifier BACnetContextTagObjectIdentifier) *_BACnetConfirmedServiceRequestGetEventInformation {
 	_result := &_BACnetConfirmedServiceRequestGetEventInformation{
 		BACnetConfirmedServiceRequestContract: NewBACnetConfirmedServiceRequest(serviceRequestLength),
 		LastReceivedObjectIdentifier:          lastReceivedObjectIdentifier,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
index 14f8c25ca0b..d5547d174c7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
@@ -68,7 +68,7 @@ var _ BACnetConfirmedServiceRequestLifeSafetyOperation = (*_BACnetConfirmedServi
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestLifeSafetyOperation)(nil)
 
 // NewBACnetConfirmedServiceRequestLifeSafetyOperation factory function for _BACnetConfirmedServiceRequestLifeSafetyOperation
-func NewBACnetConfirmedServiceRequestLifeSafetyOperation(requestingProcessIdentifier BACnetContextTagUnsignedInteger, requestingSource BACnetContextTagCharacterString, request BACnetLifeSafetyOperationTagged, objectIdentifier BACnetContextTagObjectIdentifier, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestLifeSafetyOperation {
+func NewBACnetConfirmedServiceRequestLifeSafetyOperation(serviceRequestLength uint32, requestingProcessIdentifier BACnetContextTagUnsignedInteger, requestingSource BACnetContextTagCharacterString, request BACnetLifeSafetyOperationTagged, objectIdentifier BACnetContextTagObjectIdentifier) *_BACnetConfirmedServiceRequestLifeSafetyOperation {
 	if requestingProcessIdentifier == nil {
 		panic("requestingProcessIdentifier of type BACnetContextTagUnsignedInteger for BACnetConfirmedServiceRequestLifeSafetyOperation must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
index 2a25130981f..a1af47de069 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
@@ -65,7 +65,7 @@ var _ BACnetConfirmedServiceRequestReadProperty = (*_BACnetConfirmedServiceReque
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestReadProperty)(nil)
 
 // NewBACnetConfirmedServiceRequestReadProperty factory function for _BACnetConfirmedServiceRequestReadProperty
-func NewBACnetConfirmedServiceRequestReadProperty(objectIdentifier BACnetContextTagObjectIdentifier, propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestReadProperty {
+func NewBACnetConfirmedServiceRequestReadProperty(serviceRequestLength uint32, objectIdentifier BACnetContextTagObjectIdentifier, propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger) *_BACnetConfirmedServiceRequestReadProperty {
 	if objectIdentifier == nil {
 		panic("objectIdentifier of type BACnetContextTagObjectIdentifier for BACnetConfirmedServiceRequestReadProperty must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyConditional.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyConditional.go
index 43dee9e9cad..0211ece4b3c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyConditional.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyConditional.go
@@ -53,16 +53,13 @@ type BACnetConfirmedServiceRequestReadPropertyConditional interface {
 type _BACnetConfirmedServiceRequestReadPropertyConditional struct {
 	BACnetConfirmedServiceRequestContract
 	BytesOfRemovedService []byte
-
-	// Arguments.
-	ServiceRequestPayloadLength uint32
 }
 
 var _ BACnetConfirmedServiceRequestReadPropertyConditional = (*_BACnetConfirmedServiceRequestReadPropertyConditional)(nil)
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestReadPropertyConditional)(nil)
 
 // NewBACnetConfirmedServiceRequestReadPropertyConditional factory function for _BACnetConfirmedServiceRequestReadPropertyConditional
-func NewBACnetConfirmedServiceRequestReadPropertyConditional(bytesOfRemovedService []byte, serviceRequestPayloadLength uint32, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestReadPropertyConditional {
+func NewBACnetConfirmedServiceRequestReadPropertyConditional(serviceRequestLength uint32, bytesOfRemovedService []byte) *_BACnetConfirmedServiceRequestReadPropertyConditional {
 	_result := &_BACnetConfirmedServiceRequestReadPropertyConditional{
 		BACnetConfirmedServiceRequestContract: NewBACnetConfirmedServiceRequest(serviceRequestLength),
 		BytesOfRemovedService:                 bytesOfRemovedService,
@@ -83,8 +80,6 @@ type BACnetConfirmedServiceRequestReadPropertyConditionalBuilder interface {
 	WithMandatoryFields(bytesOfRemovedService []byte) BACnetConfirmedServiceRequestReadPropertyConditionalBuilder
 	// WithBytesOfRemovedService adds BytesOfRemovedService (property field)
 	WithBytesOfRemovedService(...byte) BACnetConfirmedServiceRequestReadPropertyConditionalBuilder
-	// WithArgServiceRequestPayloadLength sets a parser argument
-	WithArgServiceRequestPayloadLength(uint32) BACnetConfirmedServiceRequestReadPropertyConditionalBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BACnetConfirmedServiceRequestBuilder
 	// Build builds the BACnetConfirmedServiceRequestReadPropertyConditional or returns an error if something is wrong
@@ -122,11 +117,6 @@ func (b *_BACnetConfirmedServiceRequestReadPropertyConditionalBuilder) WithBytes
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestReadPropertyConditionalBuilder) WithArgServiceRequestPayloadLength(serviceRequestPayloadLength uint32) BACnetConfirmedServiceRequestReadPropertyConditionalBuilder {
-	b.ServiceRequestPayloadLength = serviceRequestPayloadLength
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestReadPropertyConditionalBuilder) Build() (BACnetConfirmedServiceRequestReadPropertyConditional, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -290,16 +280,6 @@ func (m *_BACnetConfirmedServiceRequestReadPropertyConditional) SerializeWithWri
 	return m.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestReadPropertyConditional) GetServiceRequestPayloadLength() uint32 {
-	return m.ServiceRequestPayloadLength
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestReadPropertyConditional) IsBACnetConfirmedServiceRequestReadPropertyConditional() {
 }
 
@@ -314,7 +294,6 @@ func (m *_BACnetConfirmedServiceRequestReadPropertyConditional) deepCopy() *_BAC
 	_BACnetConfirmedServiceRequestReadPropertyConditionalCopy := &_BACnetConfirmedServiceRequestReadPropertyConditional{
 		m.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest).deepCopy(),
 		utils.DeepCopySlice[byte, byte](m.BytesOfRemovedService),
-		m.ServiceRequestPayloadLength,
 	}
 	_BACnetConfirmedServiceRequestReadPropertyConditionalCopy.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest)._SubType = m
 	return _BACnetConfirmedServiceRequestReadPropertyConditionalCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
index d3c80dec771..c945f34f76c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
@@ -53,16 +53,13 @@ type BACnetConfirmedServiceRequestReadPropertyMultiple interface {
 type _BACnetConfirmedServiceRequestReadPropertyMultiple struct {
 	BACnetConfirmedServiceRequestContract
 	Data []BACnetReadAccessSpecification
-
-	// Arguments.
-	ServiceRequestPayloadLength uint32
 }
 
 var _ BACnetConfirmedServiceRequestReadPropertyMultiple = (*_BACnetConfirmedServiceRequestReadPropertyMultiple)(nil)
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestReadPropertyMultiple)(nil)
 
 // NewBACnetConfirmedServiceRequestReadPropertyMultiple factory function for _BACnetConfirmedServiceRequestReadPropertyMultiple
-func NewBACnetConfirmedServiceRequestReadPropertyMultiple(data []BACnetReadAccessSpecification, serviceRequestPayloadLength uint32, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestReadPropertyMultiple {
+func NewBACnetConfirmedServiceRequestReadPropertyMultiple(serviceRequestLength uint32, data []BACnetReadAccessSpecification) *_BACnetConfirmedServiceRequestReadPropertyMultiple {
 	_result := &_BACnetConfirmedServiceRequestReadPropertyMultiple{
 		BACnetConfirmedServiceRequestContract: NewBACnetConfirmedServiceRequest(serviceRequestLength),
 		Data:                                  data,
@@ -83,8 +80,6 @@ type BACnetConfirmedServiceRequestReadPropertyMultipleBuilder interface {
 	WithMandatoryFields(data []BACnetReadAccessSpecification) BACnetConfirmedServiceRequestReadPropertyMultipleBuilder
 	// WithData adds Data (property field)
 	WithData(...BACnetReadAccessSpecification) BACnetConfirmedServiceRequestReadPropertyMultipleBuilder
-	// WithArgServiceRequestPayloadLength sets a parser argument
-	WithArgServiceRequestPayloadLength(uint32) BACnetConfirmedServiceRequestReadPropertyMultipleBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BACnetConfirmedServiceRequestBuilder
 	// Build builds the BACnetConfirmedServiceRequestReadPropertyMultiple or returns an error if something is wrong
@@ -122,11 +117,6 @@ func (b *_BACnetConfirmedServiceRequestReadPropertyMultipleBuilder) WithData(dat
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestReadPropertyMultipleBuilder) WithArgServiceRequestPayloadLength(serviceRequestPayloadLength uint32) BACnetConfirmedServiceRequestReadPropertyMultipleBuilder {
-	b.ServiceRequestPayloadLength = serviceRequestPayloadLength
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestReadPropertyMultipleBuilder) Build() (BACnetConfirmedServiceRequestReadPropertyMultiple, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -292,16 +282,6 @@ func (m *_BACnetConfirmedServiceRequestReadPropertyMultiple) SerializeWithWriteB
 	return m.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestReadPropertyMultiple) GetServiceRequestPayloadLength() uint32 {
-	return m.ServiceRequestPayloadLength
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestReadPropertyMultiple) IsBACnetConfirmedServiceRequestReadPropertyMultiple() {
 }
 
@@ -316,7 +296,6 @@ func (m *_BACnetConfirmedServiceRequestReadPropertyMultiple) deepCopy() *_BACnet
 	_BACnetConfirmedServiceRequestReadPropertyMultipleCopy := &_BACnetConfirmedServiceRequestReadPropertyMultiple{
 		m.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest).deepCopy(),
 		utils.DeepCopySlice[BACnetReadAccessSpecification, BACnetReadAccessSpecification](m.Data),
-		m.ServiceRequestPayloadLength,
 	}
 	_BACnetConfirmedServiceRequestReadPropertyMultipleCopy.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest)._SubType = m
 	return _BACnetConfirmedServiceRequestReadPropertyMultipleCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
index f167e7f4dda..dc06843da5e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
@@ -68,7 +68,7 @@ var _ BACnetConfirmedServiceRequestReadRange = (*_BACnetConfirmedServiceRequestR
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestReadRange)(nil)
 
 // NewBACnetConfirmedServiceRequestReadRange factory function for _BACnetConfirmedServiceRequestReadRange
-func NewBACnetConfirmedServiceRequestReadRange(objectIdentifier BACnetContextTagObjectIdentifier, propertyIdentifier BACnetPropertyIdentifierTagged, propertyArrayIndex BACnetContextTagUnsignedInteger, readRange BACnetConfirmedServiceRequestReadRangeRange, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestReadRange {
+func NewBACnetConfirmedServiceRequestReadRange(serviceRequestLength uint32, objectIdentifier BACnetContextTagObjectIdentifier, propertyIdentifier BACnetPropertyIdentifierTagged, propertyArrayIndex BACnetContextTagUnsignedInteger, readRange BACnetConfirmedServiceRequestReadRangeRange) *_BACnetConfirmedServiceRequestReadRange {
 	if objectIdentifier == nil {
 		panic("objectIdentifier of type BACnetContextTagObjectIdentifier for BACnetConfirmedServiceRequestReadRange must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRange.go
index 7ebf78f5a9a..354f94f1414 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRange.go
@@ -395,7 +395,7 @@ func BACnetConfirmedServiceRequestReadRangeRangeParseWithBufferProducer[T BACnet
 }
 
 func BACnetConfirmedServiceRequestReadRangeRangeParseWithBuffer[T BACnetConfirmedServiceRequestReadRangeRange](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetConfirmedServiceRequestReadRangeRange{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetConfirmedServiceRequestReadRangeRange)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
index dcd0fbbeb37..328f5e3e561 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
@@ -62,7 +62,7 @@ var _ BACnetConfirmedServiceRequestReinitializeDevice = (*_BACnetConfirmedServic
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestReinitializeDevice)(nil)
 
 // NewBACnetConfirmedServiceRequestReinitializeDevice factory function for _BACnetConfirmedServiceRequestReinitializeDevice
-func NewBACnetConfirmedServiceRequestReinitializeDevice(reinitializedStateOfDevice BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged, password BACnetContextTagCharacterString, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestReinitializeDevice {
+func NewBACnetConfirmedServiceRequestReinitializeDevice(serviceRequestLength uint32, reinitializedStateOfDevice BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged, password BACnetContextTagCharacterString) *_BACnetConfirmedServiceRequestReinitializeDevice {
 	if reinitializedStateOfDevice == nil {
 		panic("reinitializedStateOfDevice of type BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged for BACnetConfirmedServiceRequestReinitializeDevice must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged.go
index e687e7af157..852484f225e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged.go
@@ -54,20 +54,16 @@ type BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTa
 type _BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged = (*_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged)(nil)
 
 // NewBACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged factory function for _BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged
-func NewBACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged(header BACnetTagHeader, value BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice, tagNumber uint8, tagClass TagClass) *_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged {
+func NewBACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged(header BACnetTagHeader, value BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice) *_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged must not be nil")
 	}
-	return &_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTa
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice) BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTaggedBuilder
 	// Build builds the BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged or returns an error if something is wrong
 	Build() (BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDev
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTaggedBuilder) Build() (BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTa
 }
 
 func BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged, error) {
-	v, err := (&_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDev
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged) IsBACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged() {
 }
 
@@ -344,8 +314,6 @@ func (m *_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDev
 	_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTaggedCopy := &_BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
index 3c6341e5238..c3592d276ac 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
@@ -68,7 +68,7 @@ var _ BACnetConfirmedServiceRequestRemoveListElement = (*_BACnetConfirmedService
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestRemoveListElement)(nil)
 
 // NewBACnetConfirmedServiceRequestRemoveListElement factory function for _BACnetConfirmedServiceRequestRemoveListElement
-func NewBACnetConfirmedServiceRequestRemoveListElement(objectIdentifier BACnetContextTagObjectIdentifier, propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger, listOfElements BACnetConstructedData, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestRemoveListElement {
+func NewBACnetConfirmedServiceRequestRemoveListElement(serviceRequestLength uint32, objectIdentifier BACnetContextTagObjectIdentifier, propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger, listOfElements BACnetConstructedData) *_BACnetConfirmedServiceRequestRemoveListElement {
 	if objectIdentifier == nil {
 		panic("objectIdentifier of type BACnetContextTagObjectIdentifier for BACnetConfirmedServiceRequestRemoveListElement must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRequestKey.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRequestKey.go
index ef50e299b34..d2bd54ddfff 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRequestKey.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRequestKey.go
@@ -53,16 +53,13 @@ type BACnetConfirmedServiceRequestRequestKey interface {
 type _BACnetConfirmedServiceRequestRequestKey struct {
 	BACnetConfirmedServiceRequestContract
 	BytesOfRemovedService []byte
-
-	// Arguments.
-	ServiceRequestPayloadLength uint32
 }
 
 var _ BACnetConfirmedServiceRequestRequestKey = (*_BACnetConfirmedServiceRequestRequestKey)(nil)
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestRequestKey)(nil)
 
 // NewBACnetConfirmedServiceRequestRequestKey factory function for _BACnetConfirmedServiceRequestRequestKey
-func NewBACnetConfirmedServiceRequestRequestKey(bytesOfRemovedService []byte, serviceRequestPayloadLength uint32, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestRequestKey {
+func NewBACnetConfirmedServiceRequestRequestKey(serviceRequestLength uint32, bytesOfRemovedService []byte) *_BACnetConfirmedServiceRequestRequestKey {
 	_result := &_BACnetConfirmedServiceRequestRequestKey{
 		BACnetConfirmedServiceRequestContract: NewBACnetConfirmedServiceRequest(serviceRequestLength),
 		BytesOfRemovedService:                 bytesOfRemovedService,
@@ -83,8 +80,6 @@ type BACnetConfirmedServiceRequestRequestKeyBuilder interface {
 	WithMandatoryFields(bytesOfRemovedService []byte) BACnetConfirmedServiceRequestRequestKeyBuilder
 	// WithBytesOfRemovedService adds BytesOfRemovedService (property field)
 	WithBytesOfRemovedService(...byte) BACnetConfirmedServiceRequestRequestKeyBuilder
-	// WithArgServiceRequestPayloadLength sets a parser argument
-	WithArgServiceRequestPayloadLength(uint32) BACnetConfirmedServiceRequestRequestKeyBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BACnetConfirmedServiceRequestBuilder
 	// Build builds the BACnetConfirmedServiceRequestRequestKey or returns an error if something is wrong
@@ -122,11 +117,6 @@ func (b *_BACnetConfirmedServiceRequestRequestKeyBuilder) WithBytesOfRemovedServ
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestRequestKeyBuilder) WithArgServiceRequestPayloadLength(serviceRequestPayloadLength uint32) BACnetConfirmedServiceRequestRequestKeyBuilder {
-	b.ServiceRequestPayloadLength = serviceRequestPayloadLength
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestRequestKeyBuilder) Build() (BACnetConfirmedServiceRequestRequestKey, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -290,16 +280,6 @@ func (m *_BACnetConfirmedServiceRequestRequestKey) SerializeWithWriteBuffer(ctx
 	return m.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestRequestKey) GetServiceRequestPayloadLength() uint32 {
-	return m.ServiceRequestPayloadLength
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestRequestKey) IsBACnetConfirmedServiceRequestRequestKey() {}
 
 func (m *_BACnetConfirmedServiceRequestRequestKey) DeepCopy() any {
@@ -313,7 +293,6 @@ func (m *_BACnetConfirmedServiceRequestRequestKey) deepCopy() *_BACnetConfirmedS
 	_BACnetConfirmedServiceRequestRequestKeyCopy := &_BACnetConfirmedServiceRequestRequestKey{
 		m.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest).deepCopy(),
 		utils.DeepCopySlice[byte, byte](m.BytesOfRemovedService),
-		m.ServiceRequestPayloadLength,
 	}
 	_BACnetConfirmedServiceRequestRequestKeyCopy.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest)._SubType = m
 	return _BACnetConfirmedServiceRequestRequestKeyCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
index cf23e3684ea..95505d400e6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
@@ -68,7 +68,7 @@ var _ BACnetConfirmedServiceRequestSubscribeCOV = (*_BACnetConfirmedServiceReque
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestSubscribeCOV)(nil)
 
 // NewBACnetConfirmedServiceRequestSubscribeCOV factory function for _BACnetConfirmedServiceRequestSubscribeCOV
-func NewBACnetConfirmedServiceRequestSubscribeCOV(subscriberProcessIdentifier BACnetContextTagUnsignedInteger, monitoredObjectIdentifier BACnetContextTagObjectIdentifier, issueConfirmed BACnetContextTagBoolean, lifetimeInSeconds BACnetContextTagUnsignedInteger, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestSubscribeCOV {
+func NewBACnetConfirmedServiceRequestSubscribeCOV(serviceRequestLength uint32, subscriberProcessIdentifier BACnetContextTagUnsignedInteger, monitoredObjectIdentifier BACnetContextTagObjectIdentifier, issueConfirmed BACnetContextTagBoolean, lifetimeInSeconds BACnetContextTagUnsignedInteger) *_BACnetConfirmedServiceRequestSubscribeCOV {
 	if subscriberProcessIdentifier == nil {
 		panic("subscriberProcessIdentifier of type BACnetContextTagUnsignedInteger for BACnetConfirmedServiceRequestSubscribeCOV must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
index ffd24efbc62..aef14a7b835 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
@@ -74,7 +74,7 @@ var _ BACnetConfirmedServiceRequestSubscribeCOVProperty = (*_BACnetConfirmedServ
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestSubscribeCOVProperty)(nil)
 
 // NewBACnetConfirmedServiceRequestSubscribeCOVProperty factory function for _BACnetConfirmedServiceRequestSubscribeCOVProperty
-func NewBACnetConfirmedServiceRequestSubscribeCOVProperty(subscriberProcessIdentifier BACnetContextTagUnsignedInteger, monitoredObjectIdentifier BACnetContextTagObjectIdentifier, issueConfirmedNotifications BACnetContextTagBoolean, lifetime BACnetContextTagUnsignedInteger, monitoredPropertyIdentifier BACnetPropertyReferenceEnclosed, covIncrement BACnetContextTagReal, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestSubscribeCOVProperty {
+func NewBACnetConfirmedServiceRequestSubscribeCOVProperty(serviceRequestLength uint32, subscriberProcessIdentifier BACnetContextTagUnsignedInteger, monitoredObjectIdentifier BACnetContextTagObjectIdentifier, issueConfirmedNotifications BACnetContextTagBoolean, lifetime BACnetContextTagUnsignedInteger, monitoredPropertyIdentifier BACnetPropertyReferenceEnclosed, covIncrement BACnetContextTagReal) *_BACnetConfirmedServiceRequestSubscribeCOVProperty {
 	if subscriberProcessIdentifier == nil {
 		panic("subscriberProcessIdentifier of type BACnetContextTagUnsignedInteger for BACnetConfirmedServiceRequestSubscribeCOVProperty must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
index 100815722f8..e37e9af2a29 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
@@ -71,7 +71,7 @@ var _ BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple = (*_BACnetConfi
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple)(nil)
 
 // NewBACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple factory function for _BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple
-func NewBACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple(subscriberProcessIdentifier BACnetContextTagUnsignedInteger, issueConfirmedNotifications BACnetContextTagBoolean, lifetime BACnetContextTagUnsignedInteger, maxNotificationDelay BACnetContextTagUnsignedInteger, listOfCovSubscriptionSpecifications BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple {
+func NewBACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple(serviceRequestLength uint32, subscriberProcessIdentifier BACnetContextTagUnsignedInteger, issueConfirmedNotifications BACnetContextTagBoolean, lifetime BACnetContextTagUnsignedInteger, maxNotificationDelay BACnetContextTagUnsignedInteger, listOfCovSubscriptionSpecifications BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList) *_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple {
 	if subscriberProcessIdentifier == nil {
 		panic("subscriberProcessIdentifier of type BACnetContextTagUnsignedInteger for BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications.go
index a2357fa63af..47f2394f6fb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications.go
@@ -298,7 +298,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscript
 }
 
 func BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications, error) {
-	v, err := (&_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList.go
index 222a479a80a..599dea94bb1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList.go
@@ -57,22 +57,19 @@ type _BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscrip
 	OpeningTag     BACnetOpeningTag
 	Specifications []BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications
 	ClosingTag     BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList = (*_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList)(nil)
 
 // NewBACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList factory function for _BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList
-func NewBACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList(openingTag BACnetOpeningTag, specifications []BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList {
+func NewBACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList(openingTag BACnetOpeningTag, specifications []BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications, closingTag BACnetClosingTag) *_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList must not be nil")
 	}
-	return &_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList{OpeningTag: openingTag, Specifications: specifications, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList{OpeningTag: openingTag, Specifications: specifications, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscript
 	WithClosingTag(BACnetClosingTag) BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsListBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsListBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsListBuilder
 	// Build builds the BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList or returns an error if something is wrong
 	Build() (BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubs
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsListBuilder) WithArgTagNumber(tagNumber uint8) BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsListBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsListBuilder) Build() (BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscript
 }
 
 func BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsListParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList, error) {
-	v, err := (&_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubs
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList) IsBACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList() {
 }
 
@@ -374,7 +354,6 @@ func (m *_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubs
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications, BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications](m.Specifications),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsListCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference.go
index 6d1b3164926..8f79ae10d6b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference.go
@@ -273,7 +273,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscript
 }
 
 func BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReferenceParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference, error) {
-	v, err := (&_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestUnknown.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestUnknown.go
index 069262bc5a1..6fa70130bb2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestUnknown.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestUnknown.go
@@ -53,16 +53,13 @@ type BACnetConfirmedServiceRequestUnknown interface {
 type _BACnetConfirmedServiceRequestUnknown struct {
 	BACnetConfirmedServiceRequestContract
 	UnknownBytes []byte
-
-	// Arguments.
-	ServiceRequestPayloadLength uint32
 }
 
 var _ BACnetConfirmedServiceRequestUnknown = (*_BACnetConfirmedServiceRequestUnknown)(nil)
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestUnknown)(nil)
 
 // NewBACnetConfirmedServiceRequestUnknown factory function for _BACnetConfirmedServiceRequestUnknown
-func NewBACnetConfirmedServiceRequestUnknown(unknownBytes []byte, serviceRequestPayloadLength uint32, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestUnknown {
+func NewBACnetConfirmedServiceRequestUnknown(serviceRequestLength uint32, unknownBytes []byte) *_BACnetConfirmedServiceRequestUnknown {
 	_result := &_BACnetConfirmedServiceRequestUnknown{
 		BACnetConfirmedServiceRequestContract: NewBACnetConfirmedServiceRequest(serviceRequestLength),
 		UnknownBytes:                          unknownBytes,
@@ -83,8 +80,6 @@ type BACnetConfirmedServiceRequestUnknownBuilder interface {
 	WithMandatoryFields(unknownBytes []byte) BACnetConfirmedServiceRequestUnknownBuilder
 	// WithUnknownBytes adds UnknownBytes (property field)
 	WithUnknownBytes(...byte) BACnetConfirmedServiceRequestUnknownBuilder
-	// WithArgServiceRequestPayloadLength sets a parser argument
-	WithArgServiceRequestPayloadLength(uint32) BACnetConfirmedServiceRequestUnknownBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BACnetConfirmedServiceRequestBuilder
 	// Build builds the BACnetConfirmedServiceRequestUnknown or returns an error if something is wrong
@@ -122,11 +117,6 @@ func (b *_BACnetConfirmedServiceRequestUnknownBuilder) WithUnknownBytes(unknownB
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestUnknownBuilder) WithArgServiceRequestPayloadLength(serviceRequestPayloadLength uint32) BACnetConfirmedServiceRequestUnknownBuilder {
-	b.ServiceRequestPayloadLength = serviceRequestPayloadLength
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestUnknownBuilder) Build() (BACnetConfirmedServiceRequestUnknown, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -290,16 +280,6 @@ func (m *_BACnetConfirmedServiceRequestUnknown) SerializeWithWriteBuffer(ctx con
 	return m.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestUnknown) GetServiceRequestPayloadLength() uint32 {
-	return m.ServiceRequestPayloadLength
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestUnknown) IsBACnetConfirmedServiceRequestUnknown() {}
 
 func (m *_BACnetConfirmedServiceRequestUnknown) DeepCopy() any {
@@ -313,7 +293,6 @@ func (m *_BACnetConfirmedServiceRequestUnknown) deepCopy() *_BACnetConfirmedServ
 	_BACnetConfirmedServiceRequestUnknownCopy := &_BACnetConfirmedServiceRequestUnknown{
 		m.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest).deepCopy(),
 		utils.DeepCopySlice[byte, byte](m.UnknownBytes),
-		m.ServiceRequestPayloadLength,
 	}
 	_BACnetConfirmedServiceRequestUnknownCopy.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest)._SubType = m
 	return _BACnetConfirmedServiceRequestUnknownCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
index eb33f2b8c3c..def3d4edf26 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
@@ -53,16 +53,13 @@ type BACnetConfirmedServiceRequestVTClose interface {
 type _BACnetConfirmedServiceRequestVTClose struct {
 	BACnetConfirmedServiceRequestContract
 	ListOfRemoteVtSessionIdentifiers []BACnetApplicationTagUnsignedInteger
-
-	// Arguments.
-	ServiceRequestPayloadLength uint32
 }
 
 var _ BACnetConfirmedServiceRequestVTClose = (*_BACnetConfirmedServiceRequestVTClose)(nil)
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestVTClose)(nil)
 
 // NewBACnetConfirmedServiceRequestVTClose factory function for _BACnetConfirmedServiceRequestVTClose
-func NewBACnetConfirmedServiceRequestVTClose(listOfRemoteVtSessionIdentifiers []BACnetApplicationTagUnsignedInteger, serviceRequestPayloadLength uint32, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestVTClose {
+func NewBACnetConfirmedServiceRequestVTClose(serviceRequestLength uint32, listOfRemoteVtSessionIdentifiers []BACnetApplicationTagUnsignedInteger) *_BACnetConfirmedServiceRequestVTClose {
 	_result := &_BACnetConfirmedServiceRequestVTClose{
 		BACnetConfirmedServiceRequestContract: NewBACnetConfirmedServiceRequest(serviceRequestLength),
 		ListOfRemoteVtSessionIdentifiers:      listOfRemoteVtSessionIdentifiers,
@@ -83,8 +80,6 @@ type BACnetConfirmedServiceRequestVTCloseBuilder interface {
 	WithMandatoryFields(listOfRemoteVtSessionIdentifiers []BACnetApplicationTagUnsignedInteger) BACnetConfirmedServiceRequestVTCloseBuilder
 	// WithListOfRemoteVtSessionIdentifiers adds ListOfRemoteVtSessionIdentifiers (property field)
 	WithListOfRemoteVtSessionIdentifiers(...BACnetApplicationTagUnsignedInteger) BACnetConfirmedServiceRequestVTCloseBuilder
-	// WithArgServiceRequestPayloadLength sets a parser argument
-	WithArgServiceRequestPayloadLength(uint32) BACnetConfirmedServiceRequestVTCloseBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BACnetConfirmedServiceRequestBuilder
 	// Build builds the BACnetConfirmedServiceRequestVTClose or returns an error if something is wrong
@@ -122,11 +117,6 @@ func (b *_BACnetConfirmedServiceRequestVTCloseBuilder) WithListOfRemoteVtSession
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestVTCloseBuilder) WithArgServiceRequestPayloadLength(serviceRequestPayloadLength uint32) BACnetConfirmedServiceRequestVTCloseBuilder {
-	b.ServiceRequestPayloadLength = serviceRequestPayloadLength
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestVTCloseBuilder) Build() (BACnetConfirmedServiceRequestVTClose, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -292,16 +282,6 @@ func (m *_BACnetConfirmedServiceRequestVTClose) SerializeWithWriteBuffer(ctx con
 	return m.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestVTClose) GetServiceRequestPayloadLength() uint32 {
-	return m.ServiceRequestPayloadLength
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestVTClose) IsBACnetConfirmedServiceRequestVTClose() {}
 
 func (m *_BACnetConfirmedServiceRequestVTClose) DeepCopy() any {
@@ -315,7 +295,6 @@ func (m *_BACnetConfirmedServiceRequestVTClose) deepCopy() *_BACnetConfirmedServ
 	_BACnetConfirmedServiceRequestVTCloseCopy := &_BACnetConfirmedServiceRequestVTClose{
 		m.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest).deepCopy(),
 		utils.DeepCopySlice[BACnetApplicationTagUnsignedInteger, BACnetApplicationTagUnsignedInteger](m.ListOfRemoteVtSessionIdentifiers),
-		m.ServiceRequestPayloadLength,
 	}
 	_BACnetConfirmedServiceRequestVTCloseCopy.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest)._SubType = m
 	return _BACnetConfirmedServiceRequestVTCloseCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go
index f25009d6e31..bf4b7ccff51 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go
@@ -65,7 +65,7 @@ var _ BACnetConfirmedServiceRequestVTData = (*_BACnetConfirmedServiceRequestVTDa
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestVTData)(nil)
 
 // NewBACnetConfirmedServiceRequestVTData factory function for _BACnetConfirmedServiceRequestVTData
-func NewBACnetConfirmedServiceRequestVTData(vtSessionIdentifier BACnetApplicationTagUnsignedInteger, vtNewData BACnetApplicationTagOctetString, vtDataFlag BACnetApplicationTagUnsignedInteger, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestVTData {
+func NewBACnetConfirmedServiceRequestVTData(serviceRequestLength uint32, vtSessionIdentifier BACnetApplicationTagUnsignedInteger, vtNewData BACnetApplicationTagOctetString, vtDataFlag BACnetApplicationTagUnsignedInteger) *_BACnetConfirmedServiceRequestVTData {
 	if vtSessionIdentifier == nil {
 		panic("vtSessionIdentifier of type BACnetApplicationTagUnsignedInteger for BACnetConfirmedServiceRequestVTData must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go
index 68ba4a71bf9..11d597ec795 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go
@@ -62,7 +62,7 @@ var _ BACnetConfirmedServiceRequestVTOpen = (*_BACnetConfirmedServiceRequestVTOp
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestVTOpen)(nil)
 
 // NewBACnetConfirmedServiceRequestVTOpen factory function for _BACnetConfirmedServiceRequestVTOpen
-func NewBACnetConfirmedServiceRequestVTOpen(vtClass BACnetVTClassTagged, localVtSessionIdentifier BACnetApplicationTagUnsignedInteger, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestVTOpen {
+func NewBACnetConfirmedServiceRequestVTOpen(serviceRequestLength uint32, vtClass BACnetVTClassTagged, localVtSessionIdentifier BACnetApplicationTagUnsignedInteger) *_BACnetConfirmedServiceRequestVTOpen {
 	if vtClass == nil {
 		panic("vtClass of type BACnetVTClassTagged for BACnetConfirmedServiceRequestVTOpen must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
index 4b4cb8bafd6..b976fa0606b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
@@ -71,7 +71,7 @@ var _ BACnetConfirmedServiceRequestWriteProperty = (*_BACnetConfirmedServiceRequ
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestWriteProperty)(nil)
 
 // NewBACnetConfirmedServiceRequestWriteProperty factory function for _BACnetConfirmedServiceRequestWriteProperty
-func NewBACnetConfirmedServiceRequestWriteProperty(objectIdentifier BACnetContextTagObjectIdentifier, propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger, propertyValue BACnetConstructedData, priority BACnetContextTagUnsignedInteger, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestWriteProperty {
+func NewBACnetConfirmedServiceRequestWriteProperty(serviceRequestLength uint32, objectIdentifier BACnetContextTagObjectIdentifier, propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger, propertyValue BACnetConstructedData, priority BACnetContextTagUnsignedInteger) *_BACnetConfirmedServiceRequestWriteProperty {
 	if objectIdentifier == nil {
 		panic("objectIdentifier of type BACnetContextTagObjectIdentifier for BACnetConfirmedServiceRequestWriteProperty must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
index a784d06ac4c..e8b5fa7f2e7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
@@ -53,16 +53,13 @@ type BACnetConfirmedServiceRequestWritePropertyMultiple interface {
 type _BACnetConfirmedServiceRequestWritePropertyMultiple struct {
 	BACnetConfirmedServiceRequestContract
 	Data []BACnetWriteAccessSpecification
-
-	// Arguments.
-	ServiceRequestPayloadLength uint32
 }
 
 var _ BACnetConfirmedServiceRequestWritePropertyMultiple = (*_BACnetConfirmedServiceRequestWritePropertyMultiple)(nil)
 var _ BACnetConfirmedServiceRequestRequirements = (*_BACnetConfirmedServiceRequestWritePropertyMultiple)(nil)
 
 // NewBACnetConfirmedServiceRequestWritePropertyMultiple factory function for _BACnetConfirmedServiceRequestWritePropertyMultiple
-func NewBACnetConfirmedServiceRequestWritePropertyMultiple(data []BACnetWriteAccessSpecification, serviceRequestPayloadLength uint32, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestWritePropertyMultiple {
+func NewBACnetConfirmedServiceRequestWritePropertyMultiple(serviceRequestLength uint32, data []BACnetWriteAccessSpecification) *_BACnetConfirmedServiceRequestWritePropertyMultiple {
 	_result := &_BACnetConfirmedServiceRequestWritePropertyMultiple{
 		BACnetConfirmedServiceRequestContract: NewBACnetConfirmedServiceRequest(serviceRequestLength),
 		Data:                                  data,
@@ -83,8 +80,6 @@ type BACnetConfirmedServiceRequestWritePropertyMultipleBuilder interface {
 	WithMandatoryFields(data []BACnetWriteAccessSpecification) BACnetConfirmedServiceRequestWritePropertyMultipleBuilder
 	// WithData adds Data (property field)
 	WithData(...BACnetWriteAccessSpecification) BACnetConfirmedServiceRequestWritePropertyMultipleBuilder
-	// WithArgServiceRequestPayloadLength sets a parser argument
-	WithArgServiceRequestPayloadLength(uint32) BACnetConfirmedServiceRequestWritePropertyMultipleBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BACnetConfirmedServiceRequestBuilder
 	// Build builds the BACnetConfirmedServiceRequestWritePropertyMultiple or returns an error if something is wrong
@@ -122,11 +117,6 @@ func (b *_BACnetConfirmedServiceRequestWritePropertyMultipleBuilder) WithData(da
 	return b
 }
 
-func (b *_BACnetConfirmedServiceRequestWritePropertyMultipleBuilder) WithArgServiceRequestPayloadLength(serviceRequestPayloadLength uint32) BACnetConfirmedServiceRequestWritePropertyMultipleBuilder {
-	b.ServiceRequestPayloadLength = serviceRequestPayloadLength
-	return b
-}
-
 func (b *_BACnetConfirmedServiceRequestWritePropertyMultipleBuilder) Build() (BACnetConfirmedServiceRequestWritePropertyMultiple, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -292,16 +282,6 @@ func (m *_BACnetConfirmedServiceRequestWritePropertyMultiple) SerializeWithWrite
 	return m.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConfirmedServiceRequestWritePropertyMultiple) GetServiceRequestPayloadLength() uint32 {
-	return m.ServiceRequestPayloadLength
-}
-
-//
-////
-
 func (m *_BACnetConfirmedServiceRequestWritePropertyMultiple) IsBACnetConfirmedServiceRequestWritePropertyMultiple() {
 }
 
@@ -316,7 +296,6 @@ func (m *_BACnetConfirmedServiceRequestWritePropertyMultiple) deepCopy() *_BACne
 	_BACnetConfirmedServiceRequestWritePropertyMultipleCopy := &_BACnetConfirmedServiceRequestWritePropertyMultiple{
 		m.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest).deepCopy(),
 		utils.DeepCopySlice[BACnetWriteAccessSpecification, BACnetWriteAccessSpecification](m.Data),
-		m.ServiceRequestPayloadLength,
 	}
 	_BACnetConfirmedServiceRequestWritePropertyMultipleCopy.BACnetConfirmedServiceRequestContract.(*_BACnetConfirmedServiceRequest)._SubType = m
 	return _BACnetConfirmedServiceRequestWritePropertyMultipleCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedData.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedData.go
index e30f8b65d9a..40d3192c52c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedData.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedData.go
@@ -58,10 +58,6 @@ type BACnetConstructedDataContract interface {
 	GetClosingTag() BACnetClosingTag
 	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
-	// GetTagNumber() returns a parser argument
-	GetTagNumber() uint8
-	// GetArrayIndexArgument() returns a parser argument
-	GetArrayIndexArgument() BACnetTagPayloadUnsignedInteger
 	// IsBACnetConstructedData is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetConstructedData()
 	// CreateBuilder creates a BACnetConstructedDataBuilder
@@ -89,16 +85,12 @@ type _BACnetConstructedData struct {
 	OpeningTag      BACnetOpeningTag
 	PeekedTagHeader BACnetTagHeader
 	ClosingTag      BACnetClosingTag
-
-	// Arguments.
-	TagNumber          uint8
-	ArrayIndexArgument BACnetTagPayloadUnsignedInteger
 }
 
 var _ BACnetConstructedDataContract = (*_BACnetConstructedData)(nil)
 
 // NewBACnetConstructedData factory function for _BACnetConstructedData
-func NewBACnetConstructedData(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedData {
+func NewBACnetConstructedData(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedData {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetConstructedData must not be nil")
 	}
@@ -108,7 +100,7 @@ func NewBACnetConstructedData(openingTag BACnetOpeningTag, peekedTagHeader BACne
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetConstructedData must not be nil")
 	}
-	return &_BACnetConstructedData{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, TagNumber: tagNumber, ArrayIndexArgument: arrayIndexArgument}
+	return &_BACnetConstructedData{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -133,10 +125,6 @@ type BACnetConstructedDataBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetConstructedDataBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetConstructedDataBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetConstructedDataBuilder
-	// WithArgArrayIndexArgument sets a parser argument
-	WithArgArrayIndexArgument(BACnetTagPayloadUnsignedInteger) BACnetConstructedDataBuilder
 	// AsBACnetConstructedDataAbsenteeLimit converts this build to a subType of BACnetConstructedData. It is always possible to return to current builder using Done()
 	AsBACnetConstructedDataAbsenteeLimit() BACnetConstructedDataAbsenteeLimitBuilder
 	// AsBACnetConstructedDataAcceptedModes converts this build to a subType of BACnetConstructedData. It is always possible to return to current builder using Done()
@@ -1531,15 +1519,6 @@ func (b *_BACnetConstructedDataBuilder) WithClosingTagBuilder(builderSupplier fu
 	return b
 }
 
-func (b *_BACnetConstructedDataBuilder) WithArgTagNumber(tagNumber uint8) BACnetConstructedDataBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetConstructedDataBuilder) WithArgArrayIndexArgument(arrayIndexArgument BACnetTagPayloadUnsignedInteger) BACnetConstructedDataBuilder {
-	b.ArrayIndexArgument = arrayIndexArgument
-	return b
-}
-
 func (b *_BACnetConstructedDataBuilder) PartialBuild() (BACnetConstructedDataContract, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -8268,7 +8247,7 @@ func BACnetConstructedDataParseWithBufferProducer[T BACnetConstructedData](tagNu
 }
 
 func BACnetConstructedDataParseWithBuffer[T BACnetConstructedData](ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, propertyIdentifierArgument BACnetPropertyIdentifier, arrayIndexArgument BACnetTagPayloadUnsignedInteger) (T, error) {
-	v, err := (&_BACnetConstructedData{TagNumber: tagNumber, ArrayIndexArgument: arrayIndexArgument}).parse(ctx, readBuffer, tagNumber, objectTypeArgument, propertyIdentifierArgument, arrayIndexArgument)
+	v, err := (new(_BACnetConstructedData)).parse(ctx, readBuffer, tagNumber, objectTypeArgument, propertyIdentifierArgument, arrayIndexArgument)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -10993,19 +10972,6 @@ func (pm *_BACnetConstructedData) serializeParent(ctx context.Context, writeBuff
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConstructedData) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetConstructedData) GetArrayIndexArgument() BACnetTagPayloadUnsignedInteger {
-	return m.ArrayIndexArgument
-}
-
-//
-////
-
 func (m *_BACnetConstructedData) IsBACnetConstructedData() {}
 
 func (m *_BACnetConstructedData) DeepCopy() any {
@@ -11021,8 +10987,6 @@ func (m *_BACnetConstructedData) deepCopy() *_BACnetConstructedData {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetTagHeader](m.PeekedTagHeader),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
-		m.ArrayIndexArgument,
 	}
 	return _BACnetConstructedDataCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDULength.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDULength.go
index f53d4517416..0c57f72f32d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDULength.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDULength.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAPDULength = (*_BACnetConstructedDataAPDULength)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAPDULength)(nil)
 
 // NewBACnetConstructedDataAPDULength factory function for _BACnetConstructedDataAPDULength
-func NewBACnetConstructedDataAPDULength(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, apduLength BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAPDULength {
+func NewBACnetConstructedDataAPDULength(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, apduLength BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataAPDULength {
 	if apduLength == nil {
 		panic("apduLength of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataAPDULength must not be nil")
 	}
 	_result := &_BACnetConstructedDataAPDULength{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ApduLength:                    apduLength,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUSegmentTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUSegmentTimeout.go
index 55d2f8e3eb0..fefe83adeff 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUSegmentTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUSegmentTimeout.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAPDUSegmentTimeout = (*_BACnetConstructedDataAPDUSegm
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAPDUSegmentTimeout)(nil)
 
 // NewBACnetConstructedDataAPDUSegmentTimeout factory function for _BACnetConstructedDataAPDUSegmentTimeout
-func NewBACnetConstructedDataAPDUSegmentTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, apduSegmentTimeout BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAPDUSegmentTimeout {
+func NewBACnetConstructedDataAPDUSegmentTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, apduSegmentTimeout BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataAPDUSegmentTimeout {
 	if apduSegmentTimeout == nil {
 		panic("apduSegmentTimeout of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataAPDUSegmentTimeout must not be nil")
 	}
 	_result := &_BACnetConstructedDataAPDUSegmentTimeout{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ApduSegmentTimeout:            apduSegmentTimeout,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUTimeout.go
index aba407ec2e2..5d7e7c57c0e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUTimeout.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAPDUTimeout = (*_BACnetConstructedDataAPDUTimeout)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAPDUTimeout)(nil)
 
 // NewBACnetConstructedDataAPDUTimeout factory function for _BACnetConstructedDataAPDUTimeout
-func NewBACnetConstructedDataAPDUTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, apduTimeout BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAPDUTimeout {
+func NewBACnetConstructedDataAPDUTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, apduTimeout BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataAPDUTimeout {
 	if apduTimeout == nil {
 		panic("apduTimeout of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataAPDUTimeout must not be nil")
 	}
 	_result := &_BACnetConstructedDataAPDUTimeout{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ApduTimeout:                   apduTimeout,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAbsenteeLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAbsenteeLimit.go
index e9f551cf229..33a038f2b41 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAbsenteeLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAbsenteeLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAbsenteeLimit = (*_BACnetConstructedDataAbsenteeLimit
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAbsenteeLimit)(nil)
 
 // NewBACnetConstructedDataAbsenteeLimit factory function for _BACnetConstructedDataAbsenteeLimit
-func NewBACnetConstructedDataAbsenteeLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, absenteeLimit BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAbsenteeLimit {
+func NewBACnetConstructedDataAbsenteeLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, absenteeLimit BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataAbsenteeLimit {
 	if absenteeLimit == nil {
 		panic("absenteeLimit of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataAbsenteeLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataAbsenteeLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AbsenteeLimit:                 absenteeLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAcceptedModes.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAcceptedModes.go
index 830b1fc062c..dc9f650d4a5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAcceptedModes.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAcceptedModes.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataAcceptedModes = (*_BACnetConstructedDataAcceptedModes
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAcceptedModes)(nil)
 
 // NewBACnetConstructedDataAcceptedModes factory function for _BACnetConstructedDataAcceptedModes
-func NewBACnetConstructedDataAcceptedModes(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, acceptedModes []BACnetLifeSafetyModeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAcceptedModes {
+func NewBACnetConstructedDataAcceptedModes(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, acceptedModes []BACnetLifeSafetyModeTagged) *_BACnetConstructedDataAcceptedModes {
 	_result := &_BACnetConstructedDataAcceptedModes{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AcceptedModes:                 acceptedModes,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessAlarmEvents.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessAlarmEvents.go
index 0c8202e3636..c3b8d38a77a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessAlarmEvents.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessAlarmEvents.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataAccessAlarmEvents = (*_BACnetConstructedDataAccessAla
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessAlarmEvents)(nil)
 
 // NewBACnetConstructedDataAccessAlarmEvents factory function for _BACnetConstructedDataAccessAlarmEvents
-func NewBACnetConstructedDataAccessAlarmEvents(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accessAlarmEvents []BACnetAccessEventTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessAlarmEvents {
+func NewBACnetConstructedDataAccessAlarmEvents(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accessAlarmEvents []BACnetAccessEventTagged) *_BACnetConstructedDataAccessAlarmEvents {
 	_result := &_BACnetConstructedDataAccessAlarmEvents{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AccessAlarmEvents:             accessAlarmEvents,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessCredentialAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessCredentialAll.go
index edc57824251..de11a314e90 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessCredentialAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessCredentialAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataAccessCredentialAll = (*_BACnetConstructedDataAccessC
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessCredentialAll)(nil)
 
 // NewBACnetConstructedDataAccessCredentialAll factory function for _BACnetConstructedDataAccessCredentialAll
-func NewBACnetConstructedDataAccessCredentialAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessCredentialAll {
+func NewBACnetConstructedDataAccessCredentialAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataAccessCredentialAll {
 	_result := &_BACnetConstructedDataAccessCredentialAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAlarmValues.go
index c85e282e402..b6cc5a56e63 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAlarmValues.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataAccessDoorAlarmValues = (*_BACnetConstructedDataAcces
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessDoorAlarmValues)(nil)
 
 // NewBACnetConstructedDataAccessDoorAlarmValues factory function for _BACnetConstructedDataAccessDoorAlarmValues
-func NewBACnetConstructedDataAccessDoorAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetDoorAlarmStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessDoorAlarmValues {
+func NewBACnetConstructedDataAccessDoorAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetDoorAlarmStateTagged) *_BACnetConstructedDataAccessDoorAlarmValues {
 	_result := &_BACnetConstructedDataAccessDoorAlarmValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AlarmValues:                   alarmValues,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAll.go
index d4d2b345cfa..3d88e4fec28 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataAccessDoorAll = (*_BACnetConstructedDataAccessDoorAll
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessDoorAll)(nil)
 
 // NewBACnetConstructedDataAccessDoorAll factory function for _BACnetConstructedDataAccessDoorAll
-func NewBACnetConstructedDataAccessDoorAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessDoorAll {
+func NewBACnetConstructedDataAccessDoorAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataAccessDoorAll {
 	_result := &_BACnetConstructedDataAccessDoorAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorFaultValues.go
index 81887619cda..6954f9daecc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorFaultValues.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataAccessDoorFaultValues = (*_BACnetConstructedDataAcces
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessDoorFaultValues)(nil)
 
 // NewBACnetConstructedDataAccessDoorFaultValues factory function for _BACnetConstructedDataAccessDoorFaultValues
-func NewBACnetConstructedDataAccessDoorFaultValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultValues []BACnetDoorAlarmStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessDoorFaultValues {
+func NewBACnetConstructedDataAccessDoorFaultValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultValues []BACnetDoorAlarmStateTagged) *_BACnetConstructedDataAccessDoorFaultValues {
 	_result := &_BACnetConstructedDataAccessDoorFaultValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultValues:                   faultValues,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorPresentValue.go
index f15285ab4b5..55c74a73b44 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccessDoorPresentValue = (*_BACnetConstructedDataAcce
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessDoorPresentValue)(nil)
 
 // NewBACnetConstructedDataAccessDoorPresentValue factory function for _BACnetConstructedDataAccessDoorPresentValue
-func NewBACnetConstructedDataAccessDoorPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetDoorValueTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessDoorPresentValue {
+func NewBACnetConstructedDataAccessDoorPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetDoorValueTagged) *_BACnetConstructedDataAccessDoorPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetDoorValueTagged for BACnetConstructedDataAccessDoorPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccessDoorPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorRelinquishDefault.go
index 8a6263edd8d..14e928c2afe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccessDoorRelinquishDefault = (*_BACnetConstructedDat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessDoorRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataAccessDoorRelinquishDefault factory function for _BACnetConstructedDataAccessDoorRelinquishDefault
-func NewBACnetConstructedDataAccessDoorRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetDoorValueTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessDoorRelinquishDefault {
+func NewBACnetConstructedDataAccessDoorRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetDoorValueTagged) *_BACnetConstructedDataAccessDoorRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetDoorValueTagged for BACnetConstructedDataAccessDoorRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccessDoorRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoors.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoors.go
index 85b5dbd9063..802a2896b56 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoors.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoors.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataAccessDoors = (*_BACnetConstructedDataAccessDoors)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessDoors)(nil)
 
 // NewBACnetConstructedDataAccessDoors factory function for _BACnetConstructedDataAccessDoors
-func NewBACnetConstructedDataAccessDoors(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, accessDoors []BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessDoors {
+func NewBACnetConstructedDataAccessDoors(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, accessDoors []BACnetDeviceObjectReference) *_BACnetConstructedDataAccessDoors {
 	_result := &_BACnetConstructedDataAccessDoors{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		AccessDoors:                   accessDoors,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEvent.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEvent.go
index 9f82717e631..997af00e303 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEvent.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEvent.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccessEvent = (*_BACnetConstructedDataAccessEvent)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessEvent)(nil)
 
 // NewBACnetConstructedDataAccessEvent factory function for _BACnetConstructedDataAccessEvent
-func NewBACnetConstructedDataAccessEvent(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accessEvent BACnetAccessEventTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessEvent {
+func NewBACnetConstructedDataAccessEvent(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accessEvent BACnetAccessEventTagged) *_BACnetConstructedDataAccessEvent {
 	if accessEvent == nil {
 		panic("accessEvent of type BACnetAccessEventTagged for BACnetConstructedDataAccessEvent must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccessEvent{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AccessEvent:                   accessEvent,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventAuthenticationFactor.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventAuthenticationFactor.go
index d56b0fe9c16..d8cd07d01d4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventAuthenticationFactor.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventAuthenticationFactor.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccessEventAuthenticationFactor = (*_BACnetConstructe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessEventAuthenticationFactor)(nil)
 
 // NewBACnetConstructedDataAccessEventAuthenticationFactor factory function for _BACnetConstructedDataAccessEventAuthenticationFactor
-func NewBACnetConstructedDataAccessEventAuthenticationFactor(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accessEventAuthenticationFactor BACnetAuthenticationFactor, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessEventAuthenticationFactor {
+func NewBACnetConstructedDataAccessEventAuthenticationFactor(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accessEventAuthenticationFactor BACnetAuthenticationFactor) *_BACnetConstructedDataAccessEventAuthenticationFactor {
 	if accessEventAuthenticationFactor == nil {
 		panic("accessEventAuthenticationFactor of type BACnetAuthenticationFactor for BACnetConstructedDataAccessEventAuthenticationFactor must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccessEventAuthenticationFactor{
-		BACnetConstructedDataContract:   NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract:   NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AccessEventAuthenticationFactor: accessEventAuthenticationFactor,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventCredential.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventCredential.go
index 7ed758c5bcc..d86395c2534 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventCredential.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventCredential.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccessEventCredential = (*_BACnetConstructedDataAcces
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessEventCredential)(nil)
 
 // NewBACnetConstructedDataAccessEventCredential factory function for _BACnetConstructedDataAccessEventCredential
-func NewBACnetConstructedDataAccessEventCredential(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accessEventCredential BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessEventCredential {
+func NewBACnetConstructedDataAccessEventCredential(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accessEventCredential BACnetDeviceObjectReference) *_BACnetConstructedDataAccessEventCredential {
 	if accessEventCredential == nil {
 		panic("accessEventCredential of type BACnetDeviceObjectReference for BACnetConstructedDataAccessEventCredential must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccessEventCredential{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AccessEventCredential:         accessEventCredential,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTag.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTag.go
index a5659121922..2664e57879b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTag.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTag.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccessEventTag = (*_BACnetConstructedDataAccessEventT
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessEventTag)(nil)
 
 // NewBACnetConstructedDataAccessEventTag factory function for _BACnetConstructedDataAccessEventTag
-func NewBACnetConstructedDataAccessEventTag(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accessEventTag BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessEventTag {
+func NewBACnetConstructedDataAccessEventTag(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accessEventTag BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataAccessEventTag {
 	if accessEventTag == nil {
 		panic("accessEventTag of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataAccessEventTag must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccessEventTag{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AccessEventTag:                accessEventTag,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTime.go
index 4ca27273280..5033f8b8fd3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccessEventTime = (*_BACnetConstructedDataAccessEvent
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessEventTime)(nil)
 
 // NewBACnetConstructedDataAccessEventTime factory function for _BACnetConstructedDataAccessEventTime
-func NewBACnetConstructedDataAccessEventTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accessEventTime BACnetTimeStamp, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessEventTime {
+func NewBACnetConstructedDataAccessEventTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accessEventTime BACnetTimeStamp) *_BACnetConstructedDataAccessEventTime {
 	if accessEventTime == nil {
 		panic("accessEventTime of type BACnetTimeStamp for BACnetConstructedDataAccessEventTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccessEventTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AccessEventTime:               accessEventTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessPointAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessPointAll.go
index ca02f5c5f71..d7c41ebbe78 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessPointAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessPointAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataAccessPointAll = (*_BACnetConstructedDataAccessPointA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessPointAll)(nil)
 
 // NewBACnetConstructedDataAccessPointAll factory function for _BACnetConstructedDataAccessPointAll
-func NewBACnetConstructedDataAccessPointAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessPointAll {
+func NewBACnetConstructedDataAccessPointAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataAccessPointAll {
 	_result := &_BACnetConstructedDataAccessPointAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessRightsAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessRightsAll.go
index 26dd7a4f9ac..69405e3712c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessRightsAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessRightsAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataAccessRightsAll = (*_BACnetConstructedDataAccessRight
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessRightsAll)(nil)
 
 // NewBACnetConstructedDataAccessRightsAll factory function for _BACnetConstructedDataAccessRightsAll
-func NewBACnetConstructedDataAccessRightsAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessRightsAll {
+func NewBACnetConstructedDataAccessRightsAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataAccessRightsAll {
 	_result := &_BACnetConstructedDataAccessRightsAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessTransactionEvents.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessTransactionEvents.go
index 4450717ddbf..42a9c89eed2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessTransactionEvents.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessTransactionEvents.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataAccessTransactionEvents = (*_BACnetConstructedDataAcc
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessTransactionEvents)(nil)
 
 // NewBACnetConstructedDataAccessTransactionEvents factory function for _BACnetConstructedDataAccessTransactionEvents
-func NewBACnetConstructedDataAccessTransactionEvents(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accessTransactionEvents []BACnetAccessEventTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessTransactionEvents {
+func NewBACnetConstructedDataAccessTransactionEvents(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accessTransactionEvents []BACnetAccessEventTagged) *_BACnetConstructedDataAccessTransactionEvents {
 	_result := &_BACnetConstructedDataAccessTransactionEvents{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AccessTransactionEvents:       accessTransactionEvents,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessUserAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessUserAll.go
index d2d91cdd807..93b03cb2266 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessUserAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessUserAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataAccessUserAll = (*_BACnetConstructedDataAccessUserAll
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessUserAll)(nil)
 
 // NewBACnetConstructedDataAccessUserAll factory function for _BACnetConstructedDataAccessUserAll
-func NewBACnetConstructedDataAccessUserAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessUserAll {
+func NewBACnetConstructedDataAccessUserAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataAccessUserAll {
 	_result := &_BACnetConstructedDataAccessUserAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAdjustValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAdjustValue.go
index 047c3fbc17d..4389324466a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAdjustValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAdjustValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccessZoneAdjustValue = (*_BACnetConstructedDataAcces
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessZoneAdjustValue)(nil)
 
 // NewBACnetConstructedDataAccessZoneAdjustValue factory function for _BACnetConstructedDataAccessZoneAdjustValue
-func NewBACnetConstructedDataAccessZoneAdjustValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, adjustValue BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessZoneAdjustValue {
+func NewBACnetConstructedDataAccessZoneAdjustValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, adjustValue BACnetApplicationTagSignedInteger) *_BACnetConstructedDataAccessZoneAdjustValue {
 	if adjustValue == nil {
 		panic("adjustValue of type BACnetApplicationTagSignedInteger for BACnetConstructedDataAccessZoneAdjustValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccessZoneAdjustValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AdjustValue:                   adjustValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAlarmValues.go
index db35e4d7abc..053614fdf5b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAlarmValues.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataAccessZoneAlarmValues = (*_BACnetConstructedDataAcces
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessZoneAlarmValues)(nil)
 
 // NewBACnetConstructedDataAccessZoneAlarmValues factory function for _BACnetConstructedDataAccessZoneAlarmValues
-func NewBACnetConstructedDataAccessZoneAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetAccessZoneOccupancyStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessZoneAlarmValues {
+func NewBACnetConstructedDataAccessZoneAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetAccessZoneOccupancyStateTagged) *_BACnetConstructedDataAccessZoneAlarmValues {
 	_result := &_BACnetConstructedDataAccessZoneAlarmValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AlarmValues:                   alarmValues,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAll.go
index bca38479dd4..020187835e4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataAccessZoneAll = (*_BACnetConstructedDataAccessZoneAll
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccessZoneAll)(nil)
 
 // NewBACnetConstructedDataAccessZoneAll factory function for _BACnetConstructedDataAccessZoneAll
-func NewBACnetConstructedDataAccessZoneAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccessZoneAll {
+func NewBACnetConstructedDataAccessZoneAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataAccessZoneAll {
 	_result := &_BACnetConstructedDataAccessZoneAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompaniment.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompaniment.go
index 10159e4a6fb..9807d199e29 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompaniment.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompaniment.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccompaniment = (*_BACnetConstructedDataAccompaniment
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccompaniment)(nil)
 
 // NewBACnetConstructedDataAccompaniment factory function for _BACnetConstructedDataAccompaniment
-func NewBACnetConstructedDataAccompaniment(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accompaniment BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccompaniment {
+func NewBACnetConstructedDataAccompaniment(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accompaniment BACnetDeviceObjectReference) *_BACnetConstructedDataAccompaniment {
 	if accompaniment == nil {
 		panic("accompaniment of type BACnetDeviceObjectReference for BACnetConstructedDataAccompaniment must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccompaniment{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Accompaniment:                 accompaniment,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompanimentTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompanimentTime.go
index e7a49cd2e1b..3c9449914ef 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompanimentTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompanimentTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccompanimentTime = (*_BACnetConstructedDataAccompani
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccompanimentTime)(nil)
 
 // NewBACnetConstructedDataAccompanimentTime factory function for _BACnetConstructedDataAccompanimentTime
-func NewBACnetConstructedDataAccompanimentTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accompanimentTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccompanimentTime {
+func NewBACnetConstructedDataAccompanimentTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, accompanimentTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataAccompanimentTime {
 	if accompanimentTime == nil {
 		panic("accompanimentTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataAccompanimentTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccompanimentTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AccompanimentTime:             accompanimentTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorAll.go
index ebc3b9c0f41..7f3477371a4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataAccumulatorAll = (*_BACnetConstructedDataAccumulatorA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccumulatorAll)(nil)
 
 // NewBACnetConstructedDataAccumulatorAll factory function for _BACnetConstructedDataAccumulatorAll
-func NewBACnetConstructedDataAccumulatorAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccumulatorAll {
+func NewBACnetConstructedDataAccumulatorAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataAccumulatorAll {
 	_result := &_BACnetConstructedDataAccumulatorAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultHighLimit.go
index 66686083253..cd29a2f993e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultHighLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccumulatorFaultHighLimit = (*_BACnetConstructedDataA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccumulatorFaultHighLimit)(nil)
 
 // NewBACnetConstructedDataAccumulatorFaultHighLimit factory function for _BACnetConstructedDataAccumulatorFaultHighLimit
-func NewBACnetConstructedDataAccumulatorFaultHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultHighLimit BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccumulatorFaultHighLimit {
+func NewBACnetConstructedDataAccumulatorFaultHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultHighLimit BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataAccumulatorFaultHighLimit {
 	if faultHighLimit == nil {
 		panic("faultHighLimit of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataAccumulatorFaultHighLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccumulatorFaultHighLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultHighLimit:                faultHighLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultLowLimit.go
index 0a21de71d4a..ee2b128f0db 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultLowLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccumulatorFaultLowLimit = (*_BACnetConstructedDataAc
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccumulatorFaultLowLimit)(nil)
 
 // NewBACnetConstructedDataAccumulatorFaultLowLimit factory function for _BACnetConstructedDataAccumulatorFaultLowLimit
-func NewBACnetConstructedDataAccumulatorFaultLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultLowLimit BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccumulatorFaultLowLimit {
+func NewBACnetConstructedDataAccumulatorFaultLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultLowLimit BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataAccumulatorFaultLowLimit {
 	if faultLowLimit == nil {
 		panic("faultLowLimit of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataAccumulatorFaultLowLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccumulatorFaultLowLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultLowLimit:                 faultLowLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorHighLimit.go
index ca39554b24c..fd25b51e58c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorHighLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccumulatorHighLimit = (*_BACnetConstructedDataAccumu
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccumulatorHighLimit)(nil)
 
 // NewBACnetConstructedDataAccumulatorHighLimit factory function for _BACnetConstructedDataAccumulatorHighLimit
-func NewBACnetConstructedDataAccumulatorHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, highLimit BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccumulatorHighLimit {
+func NewBACnetConstructedDataAccumulatorHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, highLimit BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataAccumulatorHighLimit {
 	if highLimit == nil {
 		panic("highLimit of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataAccumulatorHighLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccumulatorHighLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		HighLimit:                     highLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorLowLimit.go
index f380fb30f70..47f613b6de8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorLowLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccumulatorLowLimit = (*_BACnetConstructedDataAccumul
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccumulatorLowLimit)(nil)
 
 // NewBACnetConstructedDataAccumulatorLowLimit factory function for _BACnetConstructedDataAccumulatorLowLimit
-func NewBACnetConstructedDataAccumulatorLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lowLimit BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccumulatorLowLimit {
+func NewBACnetConstructedDataAccumulatorLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lowLimit BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataAccumulatorLowLimit {
 	if lowLimit == nil {
 		panic("lowLimit of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataAccumulatorLowLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccumulatorLowLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LowLimit:                      lowLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMaxPresValue.go
index dec5e102bb1..0d2294c16b9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMaxPresValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccumulatorMaxPresValue = (*_BACnetConstructedDataAcc
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccumulatorMaxPresValue)(nil)
 
 // NewBACnetConstructedDataAccumulatorMaxPresValue factory function for _BACnetConstructedDataAccumulatorMaxPresValue
-func NewBACnetConstructedDataAccumulatorMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccumulatorMaxPresValue {
+func NewBACnetConstructedDataAccumulatorMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataAccumulatorMaxPresValue {
 	if maxPresValue == nil {
 		panic("maxPresValue of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataAccumulatorMaxPresValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccumulatorMaxPresValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxPresValue:                  maxPresValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMinPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMinPresValue.go
index 49292c50126..79a33d807ce 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMinPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMinPresValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAccumulatorMinPresValue = (*_BACnetConstructedDataAcc
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAccumulatorMinPresValue)(nil)
 
 // NewBACnetConstructedDataAccumulatorMinPresValue factory function for _BACnetConstructedDataAccumulatorMinPresValue
-func NewBACnetConstructedDataAccumulatorMinPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minPresValue BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAccumulatorMinPresValue {
+func NewBACnetConstructedDataAccumulatorMinPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minPresValue BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataAccumulatorMinPresValue {
 	if minPresValue == nil {
 		panic("minPresValue of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataAccumulatorMinPresValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAccumulatorMinPresValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MinPresValue:                  minPresValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckRequired.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckRequired.go
index f342035d099..a0d3b6c8867 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckRequired.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckRequired.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAckRequired = (*_BACnetConstructedDataAckRequired)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAckRequired)(nil)
 
 // NewBACnetConstructedDataAckRequired factory function for _BACnetConstructedDataAckRequired
-func NewBACnetConstructedDataAckRequired(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ackRequired BACnetEventTransitionBitsTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAckRequired {
+func NewBACnetConstructedDataAckRequired(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ackRequired BACnetEventTransitionBitsTagged) *_BACnetConstructedDataAckRequired {
 	if ackRequired == nil {
 		panic("ackRequired of type BACnetEventTransitionBitsTagged for BACnetConstructedDataAckRequired must not be nil")
 	}
 	_result := &_BACnetConstructedDataAckRequired{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AckRequired:                   ackRequired,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckedTransitions.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckedTransitions.go
index 694473bb6ae..9a800a2a75e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckedTransitions.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckedTransitions.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAckedTransitions = (*_BACnetConstructedDataAckedTrans
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAckedTransitions)(nil)
 
 // NewBACnetConstructedDataAckedTransitions factory function for _BACnetConstructedDataAckedTransitions
-func NewBACnetConstructedDataAckedTransitions(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ackedTransitions BACnetEventTransitionBitsTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAckedTransitions {
+func NewBACnetConstructedDataAckedTransitions(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ackedTransitions BACnetEventTransitionBitsTagged) *_BACnetConstructedDataAckedTransitions {
 	if ackedTransitions == nil {
 		panic("ackedTransitions of type BACnetEventTransitionBitsTagged for BACnetConstructedDataAckedTransitions must not be nil")
 	}
 	_result := &_BACnetConstructedDataAckedTransitions{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AckedTransitions:              ackedTransitions,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAction.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAction.go
index 66b6e8f3848..195ace78808 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAction.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAction.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataAction = (*_BACnetConstructedDataAction)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAction)(nil)
 
 // NewBACnetConstructedDataAction factory function for _BACnetConstructedDataAction
-func NewBACnetConstructedDataAction(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, actionLists []BACnetActionList, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAction {
+func NewBACnetConstructedDataAction(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, actionLists []BACnetActionList) *_BACnetConstructedDataAction {
 	_result := &_BACnetConstructedDataAction{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		ActionLists:                   actionLists,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActionText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActionText.go
index 25fba3d9c43..ece83b13d2f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActionText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActionText.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataActionText = (*_BACnetConstructedDataActionText)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataActionText)(nil)
 
 // NewBACnetConstructedDataActionText factory function for _BACnetConstructedDataActionText
-func NewBACnetConstructedDataActionText(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, actionText []BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataActionText {
+func NewBACnetConstructedDataActionText(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, actionText []BACnetApplicationTagCharacterString) *_BACnetConstructedDataActionText {
 	_result := &_BACnetConstructedDataActionText{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		ActionText:                    actionText,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActivationTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActivationTime.go
index 76d85e49e7c..f7ad7b08470 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActivationTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActivationTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataActivationTime = (*_BACnetConstructedDataActivationTi
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataActivationTime)(nil)
 
 // NewBACnetConstructedDataActivationTime factory function for _BACnetConstructedDataActivationTime
-func NewBACnetConstructedDataActivationTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, activationTime BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataActivationTime {
+func NewBACnetConstructedDataActivationTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, activationTime BACnetDateTime) *_BACnetConstructedDataActivationTime {
 	if activationTime == nil {
 		panic("activationTime of type BACnetDateTime for BACnetConstructedDataActivationTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataActivationTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ActivationTime:                activationTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveAuthenticationPolicy.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveAuthenticationPolicy.go
index 7a3e8791e7e..fd824380ccc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveAuthenticationPolicy.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveAuthenticationPolicy.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataActiveAuthenticationPolicy = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataActiveAuthenticationPolicy)(nil)
 
 // NewBACnetConstructedDataActiveAuthenticationPolicy factory function for _BACnetConstructedDataActiveAuthenticationPolicy
-func NewBACnetConstructedDataActiveAuthenticationPolicy(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, activeAuthenticationPolicy BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataActiveAuthenticationPolicy {
+func NewBACnetConstructedDataActiveAuthenticationPolicy(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, activeAuthenticationPolicy BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataActiveAuthenticationPolicy {
 	if activeAuthenticationPolicy == nil {
 		panic("activeAuthenticationPolicy of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataActiveAuthenticationPolicy must not be nil")
 	}
 	_result := &_BACnetConstructedDataActiveAuthenticationPolicy{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ActiveAuthenticationPolicy:    activeAuthenticationPolicy,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVMultipleSubscriptions.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVMultipleSubscriptions.go
index 979f9a7b041..9ebc540e478 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVMultipleSubscriptions.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVMultipleSubscriptions.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataActiveCOVMultipleSubscriptions = (*_BACnetConstructed
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataActiveCOVMultipleSubscriptions)(nil)
 
 // NewBACnetConstructedDataActiveCOVMultipleSubscriptions factory function for _BACnetConstructedDataActiveCOVMultipleSubscriptions
-func NewBACnetConstructedDataActiveCOVMultipleSubscriptions(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, activeCOVMultipleSubscriptions []BACnetCOVMultipleSubscription, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataActiveCOVMultipleSubscriptions {
+func NewBACnetConstructedDataActiveCOVMultipleSubscriptions(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, activeCOVMultipleSubscriptions []BACnetCOVMultipleSubscription) *_BACnetConstructedDataActiveCOVMultipleSubscriptions {
 	_result := &_BACnetConstructedDataActiveCOVMultipleSubscriptions{
-		BACnetConstructedDataContract:  NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract:  NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ActiveCOVMultipleSubscriptions: activeCOVMultipleSubscriptions,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVSubscriptions.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVSubscriptions.go
index b38f43c3417..09d01e7791b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVSubscriptions.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVSubscriptions.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataActiveCOVSubscriptions = (*_BACnetConstructedDataActi
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataActiveCOVSubscriptions)(nil)
 
 // NewBACnetConstructedDataActiveCOVSubscriptions factory function for _BACnetConstructedDataActiveCOVSubscriptions
-func NewBACnetConstructedDataActiveCOVSubscriptions(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, activeCOVSubscriptions []BACnetCOVSubscription, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataActiveCOVSubscriptions {
+func NewBACnetConstructedDataActiveCOVSubscriptions(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, activeCOVSubscriptions []BACnetCOVSubscription) *_BACnetConstructedDataActiveCOVSubscriptions {
 	_result := &_BACnetConstructedDataActiveCOVSubscriptions{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ActiveCOVSubscriptions:        activeCOVSubscriptions,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveText.go
index 9195017d7ba..50352e83a1c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveText.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataActiveText = (*_BACnetConstructedDataActiveText)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataActiveText)(nil)
 
 // NewBACnetConstructedDataActiveText factory function for _BACnetConstructedDataActiveText
-func NewBACnetConstructedDataActiveText(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, activeText BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataActiveText {
+func NewBACnetConstructedDataActiveText(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, activeText BACnetApplicationTagCharacterString) *_BACnetConstructedDataActiveText {
 	if activeText == nil {
 		panic("activeText of type BACnetApplicationTagCharacterString for BACnetConstructedDataActiveText must not be nil")
 	}
 	_result := &_BACnetConstructedDataActiveText{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ActiveText:                    activeText,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveVTSessions.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveVTSessions.go
index 9137ddd018b..90c47ab8d59 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveVTSessions.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveVTSessions.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataActiveVTSessions = (*_BACnetConstructedDataActiveVTSe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataActiveVTSessions)(nil)
 
 // NewBACnetConstructedDataActiveVTSessions factory function for _BACnetConstructedDataActiveVTSessions
-func NewBACnetConstructedDataActiveVTSessions(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, activeVTSession []BACnetVTSession, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataActiveVTSessions {
+func NewBACnetConstructedDataActiveVTSessions(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, activeVTSession []BACnetVTSession) *_BACnetConstructedDataActiveVTSessions {
 	_result := &_BACnetConstructedDataActiveVTSessions{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ActiveVTSession:               activeVTSession,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActualShedLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActualShedLevel.go
index 02da7f4b798..29e46988703 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActualShedLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActualShedLevel.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataActualShedLevel = (*_BACnetConstructedDataActualShedL
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataActualShedLevel)(nil)
 
 // NewBACnetConstructedDataActualShedLevel factory function for _BACnetConstructedDataActualShedLevel
-func NewBACnetConstructedDataActualShedLevel(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, actualShedLevel BACnetShedLevel, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataActualShedLevel {
+func NewBACnetConstructedDataActualShedLevel(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, actualShedLevel BACnetShedLevel) *_BACnetConstructedDataActualShedLevel {
 	if actualShedLevel == nil {
 		panic("actualShedLevel of type BACnetShedLevel for BACnetConstructedDataActualShedLevel must not be nil")
 	}
 	_result := &_BACnetConstructedDataActualShedLevel{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ActualShedLevel:               actualShedLevel,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAdjustValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAdjustValue.go
index 3e0463fa5aa..a5b3e8ead21 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAdjustValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAdjustValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAdjustValue = (*_BACnetConstructedDataAdjustValue)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAdjustValue)(nil)
 
 // NewBACnetConstructedDataAdjustValue factory function for _BACnetConstructedDataAdjustValue
-func NewBACnetConstructedDataAdjustValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, adjustValue BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAdjustValue {
+func NewBACnetConstructedDataAdjustValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, adjustValue BACnetApplicationTagSignedInteger) *_BACnetConstructedDataAdjustValue {
 	if adjustValue == nil {
 		panic("adjustValue of type BACnetApplicationTagSignedInteger for BACnetConstructedDataAdjustValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAdjustValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AdjustValue:                   adjustValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValue.go
index 11c5a2d3069..5a8604f0719 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAlarmValue = (*_BACnetConstructedDataAlarmValue)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAlarmValue)(nil)
 
 // NewBACnetConstructedDataAlarmValue factory function for _BACnetConstructedDataAlarmValue
-func NewBACnetConstructedDataAlarmValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, binaryPv BACnetBinaryPVTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAlarmValue {
+func NewBACnetConstructedDataAlarmValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, binaryPv BACnetBinaryPVTagged) *_BACnetConstructedDataAlarmValue {
 	if binaryPv == nil {
 		panic("binaryPv of type BACnetBinaryPVTagged for BACnetConstructedDataAlarmValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAlarmValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BinaryPv:                      binaryPv,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValues.go
index 7b98cd7cfd4..baf082d18b2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValues.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataAlarmValues = (*_BACnetConstructedDataAlarmValues)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAlarmValues)(nil)
 
 // NewBACnetConstructedDataAlarmValues factory function for _BACnetConstructedDataAlarmValues
-func NewBACnetConstructedDataAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, alarmValues []BACnetLifeSafetyStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAlarmValues {
+func NewBACnetConstructedDataAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, alarmValues []BACnetLifeSafetyStateTagged) *_BACnetConstructedDataAlarmValues {
 	_result := &_BACnetConstructedDataAlarmValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		AlarmValues:                   alarmValues,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentAll.go
index d3f1e1902cb..5400310aac7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataAlertEnrollmentAll = (*_BACnetConstructedDataAlertEnr
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAlertEnrollmentAll)(nil)
 
 // NewBACnetConstructedDataAlertEnrollmentAll factory function for _BACnetConstructedDataAlertEnrollmentAll
-func NewBACnetConstructedDataAlertEnrollmentAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAlertEnrollmentAll {
+func NewBACnetConstructedDataAlertEnrollmentAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataAlertEnrollmentAll {
 	_result := &_BACnetConstructedDataAlertEnrollmentAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentPresentValue.go
index 1ebc802733e..989056ded51 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAlertEnrollmentPresentValue = (*_BACnetConstructedDat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAlertEnrollmentPresentValue)(nil)
 
 // NewBACnetConstructedDataAlertEnrollmentPresentValue factory function for _BACnetConstructedDataAlertEnrollmentPresentValue
-func NewBACnetConstructedDataAlertEnrollmentPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagObjectIdentifier, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAlertEnrollmentPresentValue {
+func NewBACnetConstructedDataAlertEnrollmentPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagObjectIdentifier) *_BACnetConstructedDataAlertEnrollmentPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagObjectIdentifier for BACnetConstructedDataAlertEnrollmentPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAlertEnrollmentPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlignIntervals.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlignIntervals.go
index 00ed56e2707..9f00e06c7bc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlignIntervals.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlignIntervals.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAlignIntervals = (*_BACnetConstructedDataAlignInterva
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAlignIntervals)(nil)
 
 // NewBACnetConstructedDataAlignIntervals factory function for _BACnetConstructedDataAlignIntervals
-func NewBACnetConstructedDataAlignIntervals(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alignIntervals BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAlignIntervals {
+func NewBACnetConstructedDataAlignIntervals(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alignIntervals BACnetApplicationTagBoolean) *_BACnetConstructedDataAlignIntervals {
 	if alignIntervals == nil {
 		panic("alignIntervals of type BACnetApplicationTagBoolean for BACnetConstructedDataAlignIntervals must not be nil")
 	}
 	_result := &_BACnetConstructedDataAlignIntervals{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AlignIntervals:                alignIntervals,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllWritesSuccessful.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllWritesSuccessful.go
index d41f0af7dd9..5921a3ba244 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllWritesSuccessful.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllWritesSuccessful.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAllWritesSuccessful = (*_BACnetConstructedDataAllWrit
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAllWritesSuccessful)(nil)
 
 // NewBACnetConstructedDataAllWritesSuccessful factory function for _BACnetConstructedDataAllWritesSuccessful
-func NewBACnetConstructedDataAllWritesSuccessful(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, allWritesSuccessful BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAllWritesSuccessful {
+func NewBACnetConstructedDataAllWritesSuccessful(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, allWritesSuccessful BACnetApplicationTagBoolean) *_BACnetConstructedDataAllWritesSuccessful {
 	if allWritesSuccessful == nil {
 		panic("allWritesSuccessful of type BACnetApplicationTagBoolean for BACnetConstructedDataAllWritesSuccessful must not be nil")
 	}
 	_result := &_BACnetConstructedDataAllWritesSuccessful{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AllWritesSuccessful:           allWritesSuccessful,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllowGroupDelayInhibit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllowGroupDelayInhibit.go
index 593716773d7..8d4a7f9941e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllowGroupDelayInhibit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllowGroupDelayInhibit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAllowGroupDelayInhibit = (*_BACnetConstructedDataAllo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAllowGroupDelayInhibit)(nil)
 
 // NewBACnetConstructedDataAllowGroupDelayInhibit factory function for _BACnetConstructedDataAllowGroupDelayInhibit
-func NewBACnetConstructedDataAllowGroupDelayInhibit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, allowGroupDelayInhibit BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAllowGroupDelayInhibit {
+func NewBACnetConstructedDataAllowGroupDelayInhibit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, allowGroupDelayInhibit BACnetApplicationTagBoolean) *_BACnetConstructedDataAllowGroupDelayInhibit {
 	if allowGroupDelayInhibit == nil {
 		panic("allowGroupDelayInhibit of type BACnetApplicationTagBoolean for BACnetConstructedDataAllowGroupDelayInhibit must not be nil")
 	}
 	_result := &_BACnetConstructedDataAllowGroupDelayInhibit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AllowGroupDelayInhibit:        allowGroupDelayInhibit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputAll.go
index 0d05afeeb43..060e6aefcd8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataAnalogInputAll = (*_BACnetConstructedDataAnalogInputA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogInputAll)(nil)
 
 // NewBACnetConstructedDataAnalogInputAll factory function for _BACnetConstructedDataAnalogInputAll
-func NewBACnetConstructedDataAnalogInputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogInputAll {
+func NewBACnetConstructedDataAnalogInputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataAnalogInputAll {
 	_result := &_BACnetConstructedDataAnalogInputAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultHighLimit.go
index aaa34c8c3e2..769bf298326 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultHighLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAnalogInputFaultHighLimit = (*_BACnetConstructedDataA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogInputFaultHighLimit)(nil)
 
 // NewBACnetConstructedDataAnalogInputFaultHighLimit factory function for _BACnetConstructedDataAnalogInputFaultHighLimit
-func NewBACnetConstructedDataAnalogInputFaultHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultHighLimit BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogInputFaultHighLimit {
+func NewBACnetConstructedDataAnalogInputFaultHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultHighLimit BACnetApplicationTagReal) *_BACnetConstructedDataAnalogInputFaultHighLimit {
 	if faultHighLimit == nil {
 		panic("faultHighLimit of type BACnetApplicationTagReal for BACnetConstructedDataAnalogInputFaultHighLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataAnalogInputFaultHighLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultHighLimit:                faultHighLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultLowLimit.go
index 8aff66f45dc..8053fbfb70d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultLowLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAnalogInputFaultLowLimit = (*_BACnetConstructedDataAn
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogInputFaultLowLimit)(nil)
 
 // NewBACnetConstructedDataAnalogInputFaultLowLimit factory function for _BACnetConstructedDataAnalogInputFaultLowLimit
-func NewBACnetConstructedDataAnalogInputFaultLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultLowLimit BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogInputFaultLowLimit {
+func NewBACnetConstructedDataAnalogInputFaultLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultLowLimit BACnetApplicationTagReal) *_BACnetConstructedDataAnalogInputFaultLowLimit {
 	if faultLowLimit == nil {
 		panic("faultLowLimit of type BACnetApplicationTagReal for BACnetConstructedDataAnalogInputFaultLowLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataAnalogInputFaultLowLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultLowLimit:                 faultLowLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputInterfaceValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputInterfaceValue.go
index 7e6bc9be6e8..be2fa8720d3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputInterfaceValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputInterfaceValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAnalogInputInterfaceValue = (*_BACnetConstructedDataA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogInputInterfaceValue)(nil)
 
 // NewBACnetConstructedDataAnalogInputInterfaceValue factory function for _BACnetConstructedDataAnalogInputInterfaceValue
-func NewBACnetConstructedDataAnalogInputInterfaceValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, interfaceValue BACnetOptionalREAL, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogInputInterfaceValue {
+func NewBACnetConstructedDataAnalogInputInterfaceValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, interfaceValue BACnetOptionalREAL) *_BACnetConstructedDataAnalogInputInterfaceValue {
 	if interfaceValue == nil {
 		panic("interfaceValue of type BACnetOptionalREAL for BACnetConstructedDataAnalogInputInterfaceValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAnalogInputInterfaceValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		InterfaceValue:                interfaceValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputMaxPresValue.go
index 768de7511bd..f031735a4c9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputMaxPresValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAnalogInputMaxPresValue = (*_BACnetConstructedDataAna
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogInputMaxPresValue)(nil)
 
 // NewBACnetConstructedDataAnalogInputMaxPresValue factory function for _BACnetConstructedDataAnalogInputMaxPresValue
-func NewBACnetConstructedDataAnalogInputMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogInputMaxPresValue {
+func NewBACnetConstructedDataAnalogInputMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagReal) *_BACnetConstructedDataAnalogInputMaxPresValue {
 	if maxPresValue == nil {
 		panic("maxPresValue of type BACnetApplicationTagReal for BACnetConstructedDataAnalogInputMaxPresValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAnalogInputMaxPresValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxPresValue:                  maxPresValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputPresentValue.go
index b2a50757bd4..86c7dfab155 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAnalogInputPresentValue = (*_BACnetConstructedDataAna
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogInputPresentValue)(nil)
 
 // NewBACnetConstructedDataAnalogInputPresentValue factory function for _BACnetConstructedDataAnalogInputPresentValue
-func NewBACnetConstructedDataAnalogInputPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogInputPresentValue {
+func NewBACnetConstructedDataAnalogInputPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagReal) *_BACnetConstructedDataAnalogInputPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagReal for BACnetConstructedDataAnalogInputPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAnalogInputPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputAll.go
index 6bc1ffbab86..225084c5ea1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataAnalogOutputAll = (*_BACnetConstructedDataAnalogOutpu
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogOutputAll)(nil)
 
 // NewBACnetConstructedDataAnalogOutputAll factory function for _BACnetConstructedDataAnalogOutputAll
-func NewBACnetConstructedDataAnalogOutputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogOutputAll {
+func NewBACnetConstructedDataAnalogOutputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataAnalogOutputAll {
 	_result := &_BACnetConstructedDataAnalogOutputAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputInterfaceValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputInterfaceValue.go
index 971f3089ecd..3f7211567b0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputInterfaceValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputInterfaceValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAnalogOutputInterfaceValue = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogOutputInterfaceValue)(nil)
 
 // NewBACnetConstructedDataAnalogOutputInterfaceValue factory function for _BACnetConstructedDataAnalogOutputInterfaceValue
-func NewBACnetConstructedDataAnalogOutputInterfaceValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, interfaceValue BACnetOptionalREAL, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogOutputInterfaceValue {
+func NewBACnetConstructedDataAnalogOutputInterfaceValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, interfaceValue BACnetOptionalREAL) *_BACnetConstructedDataAnalogOutputInterfaceValue {
 	if interfaceValue == nil {
 		panic("interfaceValue of type BACnetOptionalREAL for BACnetConstructedDataAnalogOutputInterfaceValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAnalogOutputInterfaceValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		InterfaceValue:                interfaceValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputMaxPresValue.go
index c5a0d5abc82..63a92e8d63a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputMaxPresValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAnalogOutputMaxPresValue = (*_BACnetConstructedDataAn
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogOutputMaxPresValue)(nil)
 
 // NewBACnetConstructedDataAnalogOutputMaxPresValue factory function for _BACnetConstructedDataAnalogOutputMaxPresValue
-func NewBACnetConstructedDataAnalogOutputMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogOutputMaxPresValue {
+func NewBACnetConstructedDataAnalogOutputMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagReal) *_BACnetConstructedDataAnalogOutputMaxPresValue {
 	if maxPresValue == nil {
 		panic("maxPresValue of type BACnetApplicationTagReal for BACnetConstructedDataAnalogOutputMaxPresValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAnalogOutputMaxPresValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxPresValue:                  maxPresValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputPresentValue.go
index fca8e1f36c7..c86b263eeae 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAnalogOutputPresentValue = (*_BACnetConstructedDataAn
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogOutputPresentValue)(nil)
 
 // NewBACnetConstructedDataAnalogOutputPresentValue factory function for _BACnetConstructedDataAnalogOutputPresentValue
-func NewBACnetConstructedDataAnalogOutputPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogOutputPresentValue {
+func NewBACnetConstructedDataAnalogOutputPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagReal) *_BACnetConstructedDataAnalogOutputPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagReal for BACnetConstructedDataAnalogOutputPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAnalogOutputPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputRelinquishDefault.go
index 7580ee50ad5..941e412e7e4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAnalogOutputRelinquishDefault = (*_BACnetConstructedD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogOutputRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataAnalogOutputRelinquishDefault factory function for _BACnetConstructedDataAnalogOutputRelinquishDefault
-func NewBACnetConstructedDataAnalogOutputRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogOutputRelinquishDefault {
+func NewBACnetConstructedDataAnalogOutputRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagReal) *_BACnetConstructedDataAnalogOutputRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagReal for BACnetConstructedDataAnalogOutputRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataAnalogOutputRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueAll.go
index e8d2d5efafa..11945a85e9a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataAnalogValueAll = (*_BACnetConstructedDataAnalogValueA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogValueAll)(nil)
 
 // NewBACnetConstructedDataAnalogValueAll factory function for _BACnetConstructedDataAnalogValueAll
-func NewBACnetConstructedDataAnalogValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogValueAll {
+func NewBACnetConstructedDataAnalogValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataAnalogValueAll {
 	_result := &_BACnetConstructedDataAnalogValueAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultHighLimit.go
index ca18b829a04..704481773da 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultHighLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAnalogValueFaultHighLimit = (*_BACnetConstructedDataA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogValueFaultHighLimit)(nil)
 
 // NewBACnetConstructedDataAnalogValueFaultHighLimit factory function for _BACnetConstructedDataAnalogValueFaultHighLimit
-func NewBACnetConstructedDataAnalogValueFaultHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultHighLimit BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogValueFaultHighLimit {
+func NewBACnetConstructedDataAnalogValueFaultHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultHighLimit BACnetApplicationTagReal) *_BACnetConstructedDataAnalogValueFaultHighLimit {
 	if faultHighLimit == nil {
 		panic("faultHighLimit of type BACnetApplicationTagReal for BACnetConstructedDataAnalogValueFaultHighLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataAnalogValueFaultHighLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultHighLimit:                faultHighLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultLowLimit.go
index 9e154070fa7..79db1c43079 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultLowLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAnalogValueFaultLowLimit = (*_BACnetConstructedDataAn
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogValueFaultLowLimit)(nil)
 
 // NewBACnetConstructedDataAnalogValueFaultLowLimit factory function for _BACnetConstructedDataAnalogValueFaultLowLimit
-func NewBACnetConstructedDataAnalogValueFaultLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultLowLimit BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogValueFaultLowLimit {
+func NewBACnetConstructedDataAnalogValueFaultLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultLowLimit BACnetApplicationTagReal) *_BACnetConstructedDataAnalogValueFaultLowLimit {
 	if faultLowLimit == nil {
 		panic("faultLowLimit of type BACnetApplicationTagReal for BACnetConstructedDataAnalogValueFaultLowLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataAnalogValueFaultLowLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultLowLimit:                 faultLowLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueMaxPresValue.go
index f2abd733685..15c25038679 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueMaxPresValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAnalogValueMaxPresValue = (*_BACnetConstructedDataAna
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogValueMaxPresValue)(nil)
 
 // NewBACnetConstructedDataAnalogValueMaxPresValue factory function for _BACnetConstructedDataAnalogValueMaxPresValue
-func NewBACnetConstructedDataAnalogValueMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogValueMaxPresValue {
+func NewBACnetConstructedDataAnalogValueMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagReal) *_BACnetConstructedDataAnalogValueMaxPresValue {
 	if maxPresValue == nil {
 		panic("maxPresValue of type BACnetApplicationTagReal for BACnetConstructedDataAnalogValueMaxPresValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAnalogValueMaxPresValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxPresValue:                  maxPresValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValuePresentValue.go
index 4be14b6af01..5997a897916 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValuePresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAnalogValuePresentValue = (*_BACnetConstructedDataAna
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogValuePresentValue)(nil)
 
 // NewBACnetConstructedDataAnalogValuePresentValue factory function for _BACnetConstructedDataAnalogValuePresentValue
-func NewBACnetConstructedDataAnalogValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogValuePresentValue {
+func NewBACnetConstructedDataAnalogValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagReal) *_BACnetConstructedDataAnalogValuePresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagReal for BACnetConstructedDataAnalogValuePresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAnalogValuePresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueRelinquishDefault.go
index 1eb493f5f75..a5ba7e9f912 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAnalogValueRelinquishDefault = (*_BACnetConstructedDa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAnalogValueRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataAnalogValueRelinquishDefault factory function for _BACnetConstructedDataAnalogValueRelinquishDefault
-func NewBACnetConstructedDataAnalogValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAnalogValueRelinquishDefault {
+func NewBACnetConstructedDataAnalogValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagReal) *_BACnetConstructedDataAnalogValueRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagReal for BACnetConstructedDataAnalogValueRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataAnalogValueRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataApplicationSoftwareVersion.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataApplicationSoftwareVersion.go
index b3debcda7af..e118feea08c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataApplicationSoftwareVersion.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataApplicationSoftwareVersion.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataApplicationSoftwareVersion = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataApplicationSoftwareVersion)(nil)
 
 // NewBACnetConstructedDataApplicationSoftwareVersion factory function for _BACnetConstructedDataApplicationSoftwareVersion
-func NewBACnetConstructedDataApplicationSoftwareVersion(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, applicationSoftwareVersion BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataApplicationSoftwareVersion {
+func NewBACnetConstructedDataApplicationSoftwareVersion(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, applicationSoftwareVersion BACnetApplicationTagCharacterString) *_BACnetConstructedDataApplicationSoftwareVersion {
 	if applicationSoftwareVersion == nil {
 		panic("applicationSoftwareVersion of type BACnetApplicationTagCharacterString for BACnetConstructedDataApplicationSoftwareVersion must not be nil")
 	}
 	_result := &_BACnetConstructedDataApplicationSoftwareVersion{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ApplicationSoftwareVersion:    applicationSoftwareVersion,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataArchive.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataArchive.go
index 36fccc11740..a894809340d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataArchive.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataArchive.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataArchive = (*_BACnetConstructedDataArchive)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataArchive)(nil)
 
 // NewBACnetConstructedDataArchive factory function for _BACnetConstructedDataArchive
-func NewBACnetConstructedDataArchive(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, archive BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataArchive {
+func NewBACnetConstructedDataArchive(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, archive BACnetApplicationTagBoolean) *_BACnetConstructedDataArchive {
 	if archive == nil {
 		panic("archive of type BACnetApplicationTagBoolean for BACnetConstructedDataArchive must not be nil")
 	}
 	_result := &_BACnetConstructedDataArchive{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Archive:                       archive,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedAccessRights.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedAccessRights.go
index c9c01d139d0..731d20bf7c0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedAccessRights.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedAccessRights.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataAssignedAccessRights = (*_BACnetConstructedDataAssign
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAssignedAccessRights)(nil)
 
 // NewBACnetConstructedDataAssignedAccessRights factory function for _BACnetConstructedDataAssignedAccessRights
-func NewBACnetConstructedDataAssignedAccessRights(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, assignedAccessRights []BACnetAssignedAccessRights, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAssignedAccessRights {
+func NewBACnetConstructedDataAssignedAccessRights(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, assignedAccessRights []BACnetAssignedAccessRights) *_BACnetConstructedDataAssignedAccessRights {
 	_result := &_BACnetConstructedDataAssignedAccessRights{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		AssignedAccessRights:          assignedAccessRights,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedLandingCalls.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedLandingCalls.go
index 3ca2e95fb7e..817a7fc746b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedLandingCalls.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedLandingCalls.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataAssignedLandingCalls = (*_BACnetConstructedDataAssign
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAssignedLandingCalls)(nil)
 
 // NewBACnetConstructedDataAssignedLandingCalls factory function for _BACnetConstructedDataAssignedLandingCalls
-func NewBACnetConstructedDataAssignedLandingCalls(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, assignedLandingCalls []BACnetAssignedLandingCalls, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAssignedLandingCalls {
+func NewBACnetConstructedDataAssignedLandingCalls(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, assignedLandingCalls []BACnetAssignedLandingCalls) *_BACnetConstructedDataAssignedLandingCalls {
 	_result := &_BACnetConstructedDataAssignedLandingCalls{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		AssignedLandingCalls:          assignedLandingCalls,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAttemptedSamples.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAttemptedSamples.go
index 1a9b36ba93b..c0ec63cd540 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAttemptedSamples.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAttemptedSamples.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAttemptedSamples = (*_BACnetConstructedDataAttemptedS
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAttemptedSamples)(nil)
 
 // NewBACnetConstructedDataAttemptedSamples factory function for _BACnetConstructedDataAttemptedSamples
-func NewBACnetConstructedDataAttemptedSamples(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, attemptedSamples BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAttemptedSamples {
+func NewBACnetConstructedDataAttemptedSamples(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, attemptedSamples BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataAttemptedSamples {
 	if attemptedSamples == nil {
 		panic("attemptedSamples of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataAttemptedSamples must not be nil")
 	}
 	_result := &_BACnetConstructedDataAttemptedSamples{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AttemptedSamples:              attemptedSamples,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationFactors.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationFactors.go
index 3f183c1cc49..14c63e5a2ca 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationFactors.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationFactors.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataAuthenticationFactors = (*_BACnetConstructedDataAuthe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAuthenticationFactors)(nil)
 
 // NewBACnetConstructedDataAuthenticationFactors factory function for _BACnetConstructedDataAuthenticationFactors
-func NewBACnetConstructedDataAuthenticationFactors(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, authenticationFactors []BACnetCredentialAuthenticationFactor, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAuthenticationFactors {
+func NewBACnetConstructedDataAuthenticationFactors(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, authenticationFactors []BACnetCredentialAuthenticationFactor) *_BACnetConstructedDataAuthenticationFactors {
 	_result := &_BACnetConstructedDataAuthenticationFactors{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		AuthenticationFactors:         authenticationFactors,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyList.go
index 18cfbe60058..0f8bebccc0b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyList.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataAuthenticationPolicyList = (*_BACnetConstructedDataAu
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAuthenticationPolicyList)(nil)
 
 // NewBACnetConstructedDataAuthenticationPolicyList factory function for _BACnetConstructedDataAuthenticationPolicyList
-func NewBACnetConstructedDataAuthenticationPolicyList(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, authenticationPolicyList []BACnetAuthenticationPolicy, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAuthenticationPolicyList {
+func NewBACnetConstructedDataAuthenticationPolicyList(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, authenticationPolicyList []BACnetAuthenticationPolicy) *_BACnetConstructedDataAuthenticationPolicyList {
 	_result := &_BACnetConstructedDataAuthenticationPolicyList{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		AuthenticationPolicyList:      authenticationPolicyList,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyNames.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyNames.go
index ceb74d96504..af10849c8e2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyNames.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyNames.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataAuthenticationPolicyNames = (*_BACnetConstructedDataA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAuthenticationPolicyNames)(nil)
 
 // NewBACnetConstructedDataAuthenticationPolicyNames factory function for _BACnetConstructedDataAuthenticationPolicyNames
-func NewBACnetConstructedDataAuthenticationPolicyNames(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, authenticationPolicyNames []BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAuthenticationPolicyNames {
+func NewBACnetConstructedDataAuthenticationPolicyNames(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, authenticationPolicyNames []BACnetApplicationTagCharacterString) *_BACnetConstructedDataAuthenticationPolicyNames {
 	_result := &_BACnetConstructedDataAuthenticationPolicyNames{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		AuthenticationPolicyNames:     authenticationPolicyNames,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationStatus.go
index a840f9bfb84..d629dbd9a2c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationStatus.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAuthenticationStatus = (*_BACnetConstructedDataAuthen
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAuthenticationStatus)(nil)
 
 // NewBACnetConstructedDataAuthenticationStatus factory function for _BACnetConstructedDataAuthenticationStatus
-func NewBACnetConstructedDataAuthenticationStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, authenticationStatus BACnetAuthenticationStatusTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAuthenticationStatus {
+func NewBACnetConstructedDataAuthenticationStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, authenticationStatus BACnetAuthenticationStatusTagged) *_BACnetConstructedDataAuthenticationStatus {
 	if authenticationStatus == nil {
 		panic("authenticationStatus of type BACnetAuthenticationStatusTagged for BACnetConstructedDataAuthenticationStatus must not be nil")
 	}
 	_result := &_BACnetConstructedDataAuthenticationStatus{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AuthenticationStatus:          authenticationStatus,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationExemptions.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationExemptions.go
index a099f402129..d647d114fba 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationExemptions.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationExemptions.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataAuthorizationExemptions = (*_BACnetConstructedDataAut
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAuthorizationExemptions)(nil)
 
 // NewBACnetConstructedDataAuthorizationExemptions factory function for _BACnetConstructedDataAuthorizationExemptions
-func NewBACnetConstructedDataAuthorizationExemptions(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, authorizationExemption []BACnetAuthorizationExemptionTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAuthorizationExemptions {
+func NewBACnetConstructedDataAuthorizationExemptions(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, authorizationExemption []BACnetAuthorizationExemptionTagged) *_BACnetConstructedDataAuthorizationExemptions {
 	_result := &_BACnetConstructedDataAuthorizationExemptions{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AuthorizationExemption:        authorizationExemption,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationMode.go
index 42d9eca4111..31b59bfc2ba 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationMode.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAuthorizationMode = (*_BACnetConstructedDataAuthoriza
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAuthorizationMode)(nil)
 
 // NewBACnetConstructedDataAuthorizationMode factory function for _BACnetConstructedDataAuthorizationMode
-func NewBACnetConstructedDataAuthorizationMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, authorizationMode BACnetAuthorizationModeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAuthorizationMode {
+func NewBACnetConstructedDataAuthorizationMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, authorizationMode BACnetAuthorizationModeTagged) *_BACnetConstructedDataAuthorizationMode {
 	if authorizationMode == nil {
 		panic("authorizationMode of type BACnetAuthorizationModeTagged for BACnetConstructedDataAuthorizationMode must not be nil")
 	}
 	_result := &_BACnetConstructedDataAuthorizationMode{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AuthorizationMode:             authorizationMode,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAutoSlaveDiscovery.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAutoSlaveDiscovery.go
index 0082088c4d1..197d0c7aeaa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAutoSlaveDiscovery.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAutoSlaveDiscovery.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAutoSlaveDiscovery = (*_BACnetConstructedDataAutoSlav
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAutoSlaveDiscovery)(nil)
 
 // NewBACnetConstructedDataAutoSlaveDiscovery factory function for _BACnetConstructedDataAutoSlaveDiscovery
-func NewBACnetConstructedDataAutoSlaveDiscovery(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, autoSlaveDiscovery BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAutoSlaveDiscovery {
+func NewBACnetConstructedDataAutoSlaveDiscovery(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, autoSlaveDiscovery BACnetApplicationTagBoolean) *_BACnetConstructedDataAutoSlaveDiscovery {
 	if autoSlaveDiscovery == nil {
 		panic("autoSlaveDiscovery of type BACnetApplicationTagBoolean for BACnetConstructedDataAutoSlaveDiscovery must not be nil")
 	}
 	_result := &_BACnetConstructedDataAutoSlaveDiscovery{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AutoSlaveDiscovery:            autoSlaveDiscovery,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAverageValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAverageValue.go
index ed002ce800d..03ebce00377 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAverageValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAverageValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataAverageValue = (*_BACnetConstructedDataAverageValue)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAverageValue)(nil)
 
 // NewBACnetConstructedDataAverageValue factory function for _BACnetConstructedDataAverageValue
-func NewBACnetConstructedDataAverageValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, averageValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAverageValue {
+func NewBACnetConstructedDataAverageValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, averageValue BACnetApplicationTagReal) *_BACnetConstructedDataAverageValue {
 	if averageValue == nil {
 		panic("averageValue of type BACnetApplicationTagReal for BACnetConstructedDataAverageValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataAverageValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AverageValue:                  averageValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAveragingAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAveragingAll.go
index fff608e5ca3..6b9f0b4ad4a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAveragingAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAveragingAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataAveragingAll = (*_BACnetConstructedDataAveragingAll)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataAveragingAll)(nil)
 
 // NewBACnetConstructedDataAveragingAll factory function for _BACnetConstructedDataAveragingAll
-func NewBACnetConstructedDataAveragingAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataAveragingAll {
+func NewBACnetConstructedDataAveragingAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataAveragingAll {
 	_result := &_BACnetConstructedDataAveragingAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPGlobalAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPGlobalAddress.go
index 74e82a70d2a..6cef974351e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPGlobalAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPGlobalAddress.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBACnetIPGlobalAddress = (*_BACnetConstructedDataBACne
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBACnetIPGlobalAddress)(nil)
 
 // NewBACnetConstructedDataBACnetIPGlobalAddress factory function for _BACnetConstructedDataBACnetIPGlobalAddress
-func NewBACnetConstructedDataBACnetIPGlobalAddress(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bacnetIpGlobalAddress BACnetHostNPort, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBACnetIPGlobalAddress {
+func NewBACnetConstructedDataBACnetIPGlobalAddress(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bacnetIpGlobalAddress BACnetHostNPort) *_BACnetConstructedDataBACnetIPGlobalAddress {
 	if bacnetIpGlobalAddress == nil {
 		panic("bacnetIpGlobalAddress of type BACnetHostNPort for BACnetConstructedDataBACnetIPGlobalAddress must not be nil")
 	}
 	_result := &_BACnetConstructedDataBACnetIPGlobalAddress{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BacnetIpGlobalAddress:         bacnetIpGlobalAddress,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMode.go
index 4b0ce3282aa..18c32b44840 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMode.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBACnetIPMode = (*_BACnetConstructedDataBACnetIPMode)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBACnetIPMode)(nil)
 
 // NewBACnetConstructedDataBACnetIPMode factory function for _BACnetConstructedDataBACnetIPMode
-func NewBACnetConstructedDataBACnetIPMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bacnetIpMode BACnetIPModeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBACnetIPMode {
+func NewBACnetConstructedDataBACnetIPMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bacnetIpMode BACnetIPModeTagged) *_BACnetConstructedDataBACnetIPMode {
 	if bacnetIpMode == nil {
 		panic("bacnetIpMode of type BACnetIPModeTagged for BACnetConstructedDataBACnetIPMode must not be nil")
 	}
 	_result := &_BACnetConstructedDataBACnetIPMode{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BacnetIpMode:                  bacnetIpMode,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMulticastAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMulticastAddress.go
index d7630233af3..e0ff51c335a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMulticastAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMulticastAddress.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBACnetIPMulticastAddress = (*_BACnetConstructedDataBA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBACnetIPMulticastAddress)(nil)
 
 // NewBACnetConstructedDataBACnetIPMulticastAddress factory function for _BACnetConstructedDataBACnetIPMulticastAddress
-func NewBACnetConstructedDataBACnetIPMulticastAddress(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipMulticastAddress BACnetApplicationTagOctetString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBACnetIPMulticastAddress {
+func NewBACnetConstructedDataBACnetIPMulticastAddress(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipMulticastAddress BACnetApplicationTagOctetString) *_BACnetConstructedDataBACnetIPMulticastAddress {
 	if ipMulticastAddress == nil {
 		panic("ipMulticastAddress of type BACnetApplicationTagOctetString for BACnetConstructedDataBACnetIPMulticastAddress must not be nil")
 	}
 	_result := &_BACnetConstructedDataBACnetIPMulticastAddress{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		IpMulticastAddress:            ipMulticastAddress,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPNATTraversal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPNATTraversal.go
index 217b549be7f..d56f76d5b7d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPNATTraversal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPNATTraversal.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBACnetIPNATTraversal = (*_BACnetConstructedDataBACnet
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBACnetIPNATTraversal)(nil)
 
 // NewBACnetConstructedDataBACnetIPNATTraversal factory function for _BACnetConstructedDataBACnetIPNATTraversal
-func NewBACnetConstructedDataBACnetIPNATTraversal(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bacnetIPNATTraversal BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBACnetIPNATTraversal {
+func NewBACnetConstructedDataBACnetIPNATTraversal(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bacnetIPNATTraversal BACnetApplicationTagBoolean) *_BACnetConstructedDataBACnetIPNATTraversal {
 	if bacnetIPNATTraversal == nil {
 		panic("bacnetIPNATTraversal of type BACnetApplicationTagBoolean for BACnetConstructedDataBACnetIPNATTraversal must not be nil")
 	}
 	_result := &_BACnetConstructedDataBACnetIPNATTraversal{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BacnetIPNATTraversal:          bacnetIPNATTraversal,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPUDPPort.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPUDPPort.go
index 255e7d9fd6e..f12c57eb379 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPUDPPort.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPUDPPort.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBACnetIPUDPPort = (*_BACnetConstructedDataBACnetIPUDP
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBACnetIPUDPPort)(nil)
 
 // NewBACnetConstructedDataBACnetIPUDPPort factory function for _BACnetConstructedDataBACnetIPUDPPort
-func NewBACnetConstructedDataBACnetIPUDPPort(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipUdpPort BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBACnetIPUDPPort {
+func NewBACnetConstructedDataBACnetIPUDPPort(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipUdpPort BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataBACnetIPUDPPort {
 	if ipUdpPort == nil {
 		panic("ipUdpPort of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataBACnetIPUDPPort must not be nil")
 	}
 	_result := &_BACnetConstructedDataBACnetIPUDPPort{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		IpUdpPort:                     ipUdpPort,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6Mode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6Mode.go
index 0d0aff42135..d1ef4bbf408 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6Mode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6Mode.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBACnetIPv6Mode = (*_BACnetConstructedDataBACnetIPv6Mo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBACnetIPv6Mode)(nil)
 
 // NewBACnetConstructedDataBACnetIPv6Mode factory function for _BACnetConstructedDataBACnetIPv6Mode
-func NewBACnetConstructedDataBACnetIPv6Mode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bacnetIpv6Mode BACnetIPModeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBACnetIPv6Mode {
+func NewBACnetConstructedDataBACnetIPv6Mode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bacnetIpv6Mode BACnetIPModeTagged) *_BACnetConstructedDataBACnetIPv6Mode {
 	if bacnetIpv6Mode == nil {
 		panic("bacnetIpv6Mode of type BACnetIPModeTagged for BACnetConstructedDataBACnetIPv6Mode must not be nil")
 	}
 	_result := &_BACnetConstructedDataBACnetIPv6Mode{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BacnetIpv6Mode:                bacnetIpv6Mode,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6MulticastAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6MulticastAddress.go
index 3eb5e39fd7d..cfa912d2419 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6MulticastAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6MulticastAddress.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBACnetIPv6MulticastAddress = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBACnetIPv6MulticastAddress)(nil)
 
 // NewBACnetConstructedDataBACnetIPv6MulticastAddress factory function for _BACnetConstructedDataBACnetIPv6MulticastAddress
-func NewBACnetConstructedDataBACnetIPv6MulticastAddress(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6MulticastAddress BACnetApplicationTagOctetString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBACnetIPv6MulticastAddress {
+func NewBACnetConstructedDataBACnetIPv6MulticastAddress(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6MulticastAddress BACnetApplicationTagOctetString) *_BACnetConstructedDataBACnetIPv6MulticastAddress {
 	if ipv6MulticastAddress == nil {
 		panic("ipv6MulticastAddress of type BACnetApplicationTagOctetString for BACnetConstructedDataBACnetIPv6MulticastAddress must not be nil")
 	}
 	_result := &_BACnetConstructedDataBACnetIPv6MulticastAddress{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Ipv6MulticastAddress:          ipv6MulticastAddress,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6UDPPort.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6UDPPort.go
index 7ca7c2b9898..ed679af5f64 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6UDPPort.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6UDPPort.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBACnetIPv6UDPPort = (*_BACnetConstructedDataBACnetIPv
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBACnetIPv6UDPPort)(nil)
 
 // NewBACnetConstructedDataBACnetIPv6UDPPort factory function for _BACnetConstructedDataBACnetIPv6UDPPort
-func NewBACnetConstructedDataBACnetIPv6UDPPort(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6UdpPort BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBACnetIPv6UDPPort {
+func NewBACnetConstructedDataBACnetIPv6UDPPort(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6UdpPort BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataBACnetIPv6UDPPort {
 	if ipv6UdpPort == nil {
 		panic("ipv6UdpPort of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataBACnetIPv6UDPPort must not be nil")
 	}
 	_result := &_BACnetConstructedDataBACnetIPv6UDPPort{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Ipv6UdpPort:                   ipv6UdpPort,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDAcceptFDRegistrations.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDAcceptFDRegistrations.go
index e806fd787c8..a606fedbc3a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDAcceptFDRegistrations.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDAcceptFDRegistrations.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBBMDAcceptFDRegistrations = (*_BACnetConstructedDataB
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBBMDAcceptFDRegistrations)(nil)
 
 // NewBACnetConstructedDataBBMDAcceptFDRegistrations factory function for _BACnetConstructedDataBBMDAcceptFDRegistrations
-func NewBACnetConstructedDataBBMDAcceptFDRegistrations(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bbmdAcceptFDRegistrations BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBBMDAcceptFDRegistrations {
+func NewBACnetConstructedDataBBMDAcceptFDRegistrations(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bbmdAcceptFDRegistrations BACnetApplicationTagBoolean) *_BACnetConstructedDataBBMDAcceptFDRegistrations {
 	if bbmdAcceptFDRegistrations == nil {
 		panic("bbmdAcceptFDRegistrations of type BACnetApplicationTagBoolean for BACnetConstructedDataBBMDAcceptFDRegistrations must not be nil")
 	}
 	_result := &_BACnetConstructedDataBBMDAcceptFDRegistrations{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BbmdAcceptFDRegistrations:     bbmdAcceptFDRegistrations,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDBroadcastDistributionTable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDBroadcastDistributionTable.go
index f3a9b2b6ccb..0491b66a76a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDBroadcastDistributionTable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDBroadcastDistributionTable.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataBBMDBroadcastDistributionTable = (*_BACnetConstructed
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBBMDBroadcastDistributionTable)(nil)
 
 // NewBACnetConstructedDataBBMDBroadcastDistributionTable factory function for _BACnetConstructedDataBBMDBroadcastDistributionTable
-func NewBACnetConstructedDataBBMDBroadcastDistributionTable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bbmdBroadcastDistributionTable []BACnetBDTEntry, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBBMDBroadcastDistributionTable {
+func NewBACnetConstructedDataBBMDBroadcastDistributionTable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bbmdBroadcastDistributionTable []BACnetBDTEntry) *_BACnetConstructedDataBBMDBroadcastDistributionTable {
 	_result := &_BACnetConstructedDataBBMDBroadcastDistributionTable{
-		BACnetConstructedDataContract:  NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract:  NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BbmdBroadcastDistributionTable: bbmdBroadcastDistributionTable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDForeignDeviceTable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDForeignDeviceTable.go
index f0a3a9a6b83..e729ea18243 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDForeignDeviceTable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDForeignDeviceTable.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataBBMDForeignDeviceTable = (*_BACnetConstructedDataBBMD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBBMDForeignDeviceTable)(nil)
 
 // NewBACnetConstructedDataBBMDForeignDeviceTable factory function for _BACnetConstructedDataBBMDForeignDeviceTable
-func NewBACnetConstructedDataBBMDForeignDeviceTable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bbmdForeignDeviceTable []BACnetBDTEntry, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBBMDForeignDeviceTable {
+func NewBACnetConstructedDataBBMDForeignDeviceTable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bbmdForeignDeviceTable []BACnetBDTEntry) *_BACnetConstructedDataBBMDForeignDeviceTable {
 	_result := &_BACnetConstructedDataBBMDForeignDeviceTable{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BbmdForeignDeviceTable:        bbmdForeignDeviceTable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupAndRestoreState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupAndRestoreState.go
index 08f6726a699..90a35f5ac1d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupAndRestoreState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupAndRestoreState.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBackupAndRestoreState = (*_BACnetConstructedDataBacku
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBackupAndRestoreState)(nil)
 
 // NewBACnetConstructedDataBackupAndRestoreState factory function for _BACnetConstructedDataBackupAndRestoreState
-func NewBACnetConstructedDataBackupAndRestoreState(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, backupAndRestoreState BACnetBackupStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBackupAndRestoreState {
+func NewBACnetConstructedDataBackupAndRestoreState(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, backupAndRestoreState BACnetBackupStateTagged) *_BACnetConstructedDataBackupAndRestoreState {
 	if backupAndRestoreState == nil {
 		panic("backupAndRestoreState of type BACnetBackupStateTagged for BACnetConstructedDataBackupAndRestoreState must not be nil")
 	}
 	_result := &_BACnetConstructedDataBackupAndRestoreState{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BackupAndRestoreState:         backupAndRestoreState,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupFailureTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupFailureTimeout.go
index 2663e49c352..e678ddf047f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupFailureTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupFailureTimeout.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBackupFailureTimeout = (*_BACnetConstructedDataBackup
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBackupFailureTimeout)(nil)
 
 // NewBACnetConstructedDataBackupFailureTimeout factory function for _BACnetConstructedDataBackupFailureTimeout
-func NewBACnetConstructedDataBackupFailureTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, backupFailureTimeout BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBackupFailureTimeout {
+func NewBACnetConstructedDataBackupFailureTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, backupFailureTimeout BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataBackupFailureTimeout {
 	if backupFailureTimeout == nil {
 		panic("backupFailureTimeout of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataBackupFailureTimeout must not be nil")
 	}
 	_result := &_BACnetConstructedDataBackupFailureTimeout{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BackupFailureTimeout:          backupFailureTimeout,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupPreparationTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupPreparationTime.go
index c97ca91f7c0..a399e2ebb32 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupPreparationTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupPreparationTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBackupPreparationTime = (*_BACnetConstructedDataBacku
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBackupPreparationTime)(nil)
 
 // NewBACnetConstructedDataBackupPreparationTime factory function for _BACnetConstructedDataBackupPreparationTime
-func NewBACnetConstructedDataBackupPreparationTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, backupPreparationTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBackupPreparationTime {
+func NewBACnetConstructedDataBackupPreparationTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, backupPreparationTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataBackupPreparationTime {
 	if backupPreparationTime == nil {
 		panic("backupPreparationTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataBackupPreparationTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataBackupPreparationTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BackupPreparationTime:         backupPreparationTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBaseDeviceSecurityPolicy.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBaseDeviceSecurityPolicy.go
index f0525ed76af..6e79e45ea57 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBaseDeviceSecurityPolicy.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBaseDeviceSecurityPolicy.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBaseDeviceSecurityPolicy = (*_BACnetConstructedDataBa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBaseDeviceSecurityPolicy)(nil)
 
 // NewBACnetConstructedDataBaseDeviceSecurityPolicy factory function for _BACnetConstructedDataBaseDeviceSecurityPolicy
-func NewBACnetConstructedDataBaseDeviceSecurityPolicy(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, baseDeviceSecurityPolicy BACnetSecurityLevelTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBaseDeviceSecurityPolicy {
+func NewBACnetConstructedDataBaseDeviceSecurityPolicy(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, baseDeviceSecurityPolicy BACnetSecurityLevelTagged) *_BACnetConstructedDataBaseDeviceSecurityPolicy {
 	if baseDeviceSecurityPolicy == nil {
 		panic("baseDeviceSecurityPolicy of type BACnetSecurityLevelTagged for BACnetConstructedDataBaseDeviceSecurityPolicy must not be nil")
 	}
 	_result := &_BACnetConstructedDataBaseDeviceSecurityPolicy{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BaseDeviceSecurityPolicy:      baseDeviceSecurityPolicy,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBelongsTo.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBelongsTo.go
index 14565b4d3b0..b9b9c1166a3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBelongsTo.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBelongsTo.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBelongsTo = (*_BACnetConstructedDataBelongsTo)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBelongsTo)(nil)
 
 // NewBACnetConstructedDataBelongsTo factory function for _BACnetConstructedDataBelongsTo
-func NewBACnetConstructedDataBelongsTo(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, belongsTo BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBelongsTo {
+func NewBACnetConstructedDataBelongsTo(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, belongsTo BACnetDeviceObjectReference) *_BACnetConstructedDataBelongsTo {
 	if belongsTo == nil {
 		panic("belongsTo of type BACnetDeviceObjectReference for BACnetConstructedDataBelongsTo must not be nil")
 	}
 	_result := &_BACnetConstructedDataBelongsTo{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BelongsTo:                     belongsTo,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBias.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBias.go
index 6edfb98c4de..6adacd926fe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBias.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBias.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBias = (*_BACnetConstructedDataBias)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBias)(nil)
 
 // NewBACnetConstructedDataBias factory function for _BACnetConstructedDataBias
-func NewBACnetConstructedDataBias(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bias BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBias {
+func NewBACnetConstructedDataBias(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bias BACnetApplicationTagReal) *_BACnetConstructedDataBias {
 	if bias == nil {
 		panic("bias of type BACnetApplicationTagReal for BACnetConstructedDataBias must not be nil")
 	}
 	_result := &_BACnetConstructedDataBias{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Bias:                          bias,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputAll.go
index 04deb00fe43..4815d9f843b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataBinaryInputAll = (*_BACnetConstructedDataBinaryInputA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBinaryInputAll)(nil)
 
 // NewBACnetConstructedDataBinaryInputAll factory function for _BACnetConstructedDataBinaryInputAll
-func NewBACnetConstructedDataBinaryInputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBinaryInputAll {
+func NewBACnetConstructedDataBinaryInputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataBinaryInputAll {
 	_result := &_BACnetConstructedDataBinaryInputAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputInterfaceValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputInterfaceValue.go
index c29f12b3fb8..8ceec0f02e2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputInterfaceValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputInterfaceValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBinaryInputInterfaceValue = (*_BACnetConstructedDataB
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBinaryInputInterfaceValue)(nil)
 
 // NewBACnetConstructedDataBinaryInputInterfaceValue factory function for _BACnetConstructedDataBinaryInputInterfaceValue
-func NewBACnetConstructedDataBinaryInputInterfaceValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, interfaceValue BACnetOptionalBinaryPV, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBinaryInputInterfaceValue {
+func NewBACnetConstructedDataBinaryInputInterfaceValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, interfaceValue BACnetOptionalBinaryPV) *_BACnetConstructedDataBinaryInputInterfaceValue {
 	if interfaceValue == nil {
 		panic("interfaceValue of type BACnetOptionalBinaryPV for BACnetConstructedDataBinaryInputInterfaceValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataBinaryInputInterfaceValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		InterfaceValue:                interfaceValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputPresentValue.go
index 5b8bcd3720b..fbffeb048b3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBinaryInputPresentValue = (*_BACnetConstructedDataBin
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBinaryInputPresentValue)(nil)
 
 // NewBACnetConstructedDataBinaryInputPresentValue factory function for _BACnetConstructedDataBinaryInputPresentValue
-func NewBACnetConstructedDataBinaryInputPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetBinaryPVTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBinaryInputPresentValue {
+func NewBACnetConstructedDataBinaryInputPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetBinaryPVTagged) *_BACnetConstructedDataBinaryInputPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetBinaryPVTagged for BACnetConstructedDataBinaryInputPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataBinaryInputPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputAll.go
index 8920c9f96ad..3e9bed5a7f0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataBinaryLightingOutputAll = (*_BACnetConstructedDataBin
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBinaryLightingOutputAll)(nil)
 
 // NewBACnetConstructedDataBinaryLightingOutputAll factory function for _BACnetConstructedDataBinaryLightingOutputAll
-func NewBACnetConstructedDataBinaryLightingOutputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBinaryLightingOutputAll {
+func NewBACnetConstructedDataBinaryLightingOutputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataBinaryLightingOutputAll {
 	_result := &_BACnetConstructedDataBinaryLightingOutputAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputFeedbackValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputFeedbackValue.go
index 1f26327c58e..2dd68b00daf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputFeedbackValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputFeedbackValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBinaryLightingOutputFeedbackValue = (*_BACnetConstruc
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBinaryLightingOutputFeedbackValue)(nil)
 
 // NewBACnetConstructedDataBinaryLightingOutputFeedbackValue factory function for _BACnetConstructedDataBinaryLightingOutputFeedbackValue
-func NewBACnetConstructedDataBinaryLightingOutputFeedbackValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, feedbackValue BACnetBinaryLightingPVTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBinaryLightingOutputFeedbackValue {
+func NewBACnetConstructedDataBinaryLightingOutputFeedbackValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, feedbackValue BACnetBinaryLightingPVTagged) *_BACnetConstructedDataBinaryLightingOutputFeedbackValue {
 	if feedbackValue == nil {
 		panic("feedbackValue of type BACnetBinaryLightingPVTagged for BACnetConstructedDataBinaryLightingOutputFeedbackValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataBinaryLightingOutputFeedbackValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FeedbackValue:                 feedbackValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputPresentValue.go
index 7d76aae7ae0..3c5a578b922 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBinaryLightingOutputPresentValue = (*_BACnetConstruct
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBinaryLightingOutputPresentValue)(nil)
 
 // NewBACnetConstructedDataBinaryLightingOutputPresentValue factory function for _BACnetConstructedDataBinaryLightingOutputPresentValue
-func NewBACnetConstructedDataBinaryLightingOutputPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetBinaryLightingPVTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBinaryLightingOutputPresentValue {
+func NewBACnetConstructedDataBinaryLightingOutputPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetBinaryLightingPVTagged) *_BACnetConstructedDataBinaryLightingOutputPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetBinaryLightingPVTagged for BACnetConstructedDataBinaryLightingOutputPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataBinaryLightingOutputPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.go
index 4f0759626ac..9a530bef24c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBinaryLightingOutputRelinquishDefault = (*_BACnetCons
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBinaryLightingOutputRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataBinaryLightingOutputRelinquishDefault factory function for _BACnetConstructedDataBinaryLightingOutputRelinquishDefault
-func NewBACnetConstructedDataBinaryLightingOutputRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetBinaryLightingPVTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBinaryLightingOutputRelinquishDefault {
+func NewBACnetConstructedDataBinaryLightingOutputRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetBinaryLightingPVTagged) *_BACnetConstructedDataBinaryLightingOutputRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetBinaryLightingPVTagged for BACnetConstructedDataBinaryLightingOutputRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataBinaryLightingOutputRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputAll.go
index 6fdd89b744c..13fe08a1dd1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataBinaryOutputAll = (*_BACnetConstructedDataBinaryOutpu
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBinaryOutputAll)(nil)
 
 // NewBACnetConstructedDataBinaryOutputAll factory function for _BACnetConstructedDataBinaryOutputAll
-func NewBACnetConstructedDataBinaryOutputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBinaryOutputAll {
+func NewBACnetConstructedDataBinaryOutputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataBinaryOutputAll {
 	_result := &_BACnetConstructedDataBinaryOutputAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputFeedbackValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputFeedbackValue.go
index 0fdf50730db..0683b394b67 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputFeedbackValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputFeedbackValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBinaryOutputFeedbackValue = (*_BACnetConstructedDataB
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBinaryOutputFeedbackValue)(nil)
 
 // NewBACnetConstructedDataBinaryOutputFeedbackValue factory function for _BACnetConstructedDataBinaryOutputFeedbackValue
-func NewBACnetConstructedDataBinaryOutputFeedbackValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, feedbackValue BACnetBinaryPVTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBinaryOutputFeedbackValue {
+func NewBACnetConstructedDataBinaryOutputFeedbackValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, feedbackValue BACnetBinaryPVTagged) *_BACnetConstructedDataBinaryOutputFeedbackValue {
 	if feedbackValue == nil {
 		panic("feedbackValue of type BACnetBinaryPVTagged for BACnetConstructedDataBinaryOutputFeedbackValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataBinaryOutputFeedbackValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FeedbackValue:                 feedbackValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputInterfaceValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputInterfaceValue.go
index b546470605c..0d7db5d5ac9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputInterfaceValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputInterfaceValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBinaryOutputInterfaceValue = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBinaryOutputInterfaceValue)(nil)
 
 // NewBACnetConstructedDataBinaryOutputInterfaceValue factory function for _BACnetConstructedDataBinaryOutputInterfaceValue
-func NewBACnetConstructedDataBinaryOutputInterfaceValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, interfaceValue BACnetOptionalBinaryPV, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBinaryOutputInterfaceValue {
+func NewBACnetConstructedDataBinaryOutputInterfaceValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, interfaceValue BACnetOptionalBinaryPV) *_BACnetConstructedDataBinaryOutputInterfaceValue {
 	if interfaceValue == nil {
 		panic("interfaceValue of type BACnetOptionalBinaryPV for BACnetConstructedDataBinaryOutputInterfaceValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataBinaryOutputInterfaceValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		InterfaceValue:                interfaceValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputPresentValue.go
index 5b4e8d21314..02a9e5ef5d0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBinaryOutputPresentValue = (*_BACnetConstructedDataBi
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBinaryOutputPresentValue)(nil)
 
 // NewBACnetConstructedDataBinaryOutputPresentValue factory function for _BACnetConstructedDataBinaryOutputPresentValue
-func NewBACnetConstructedDataBinaryOutputPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetBinaryPVTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBinaryOutputPresentValue {
+func NewBACnetConstructedDataBinaryOutputPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetBinaryPVTagged) *_BACnetConstructedDataBinaryOutputPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetBinaryPVTagged for BACnetConstructedDataBinaryOutputPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataBinaryOutputPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputRelinquishDefault.go
index ae59acc43e1..d7f1c0b8dfe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBinaryOutputRelinquishDefault = (*_BACnetConstructedD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBinaryOutputRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataBinaryOutputRelinquishDefault factory function for _BACnetConstructedDataBinaryOutputRelinquishDefault
-func NewBACnetConstructedDataBinaryOutputRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetBinaryPVTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBinaryOutputRelinquishDefault {
+func NewBACnetConstructedDataBinaryOutputRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetBinaryPVTagged) *_BACnetConstructedDataBinaryOutputRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetBinaryPVTagged for BACnetConstructedDataBinaryOutputRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataBinaryOutputRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueAll.go
index 5e8f4978797..1e7a539621e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataBinaryValueAll = (*_BACnetConstructedDataBinaryValueA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBinaryValueAll)(nil)
 
 // NewBACnetConstructedDataBinaryValueAll factory function for _BACnetConstructedDataBinaryValueAll
-func NewBACnetConstructedDataBinaryValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBinaryValueAll {
+func NewBACnetConstructedDataBinaryValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataBinaryValueAll {
 	_result := &_BACnetConstructedDataBinaryValueAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValuePresentValue.go
index 664cbd4cd18..713c54ca008 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValuePresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBinaryValuePresentValue = (*_BACnetConstructedDataBin
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBinaryValuePresentValue)(nil)
 
 // NewBACnetConstructedDataBinaryValuePresentValue factory function for _BACnetConstructedDataBinaryValuePresentValue
-func NewBACnetConstructedDataBinaryValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetBinaryPVTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBinaryValuePresentValue {
+func NewBACnetConstructedDataBinaryValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetBinaryPVTagged) *_BACnetConstructedDataBinaryValuePresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetBinaryPVTagged for BACnetConstructedDataBinaryValuePresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataBinaryValuePresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueRelinquishDefault.go
index a26fe4e9709..51c9d9cfc71 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBinaryValueRelinquishDefault = (*_BACnetConstructedDa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBinaryValueRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataBinaryValueRelinquishDefault factory function for _BACnetConstructedDataBinaryValueRelinquishDefault
-func NewBACnetConstructedDataBinaryValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetBinaryPVTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBinaryValueRelinquishDefault {
+func NewBACnetConstructedDataBinaryValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetBinaryPVTagged) *_BACnetConstructedDataBinaryValueRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetBinaryPVTagged for BACnetConstructedDataBinaryValueRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataBinaryValueRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitMask.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitMask.go
index 3c55a5e1b02..cb368c7fe69 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitMask.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitMask.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBitMask = (*_BACnetConstructedDataBitMask)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBitMask)(nil)
 
 // NewBACnetConstructedDataBitMask factory function for _BACnetConstructedDataBitMask
-func NewBACnetConstructedDataBitMask(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bitString BACnetApplicationTagBitString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBitMask {
+func NewBACnetConstructedDataBitMask(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bitString BACnetApplicationTagBitString) *_BACnetConstructedDataBitMask {
 	if bitString == nil {
 		panic("bitString of type BACnetApplicationTagBitString for BACnetConstructedDataBitMask must not be nil")
 	}
 	_result := &_BACnetConstructedDataBitMask{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BitString:                     bitString,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueAlarmValues.go
index 7e8d301e09c..15d833b1ec2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueAlarmValues.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataBitStringValueAlarmValues = (*_BACnetConstructedDataB
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBitStringValueAlarmValues)(nil)
 
 // NewBACnetConstructedDataBitStringValueAlarmValues factory function for _BACnetConstructedDataBitStringValueAlarmValues
-func NewBACnetConstructedDataBitStringValueAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, alarmValues []BACnetApplicationTagBitString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBitStringValueAlarmValues {
+func NewBACnetConstructedDataBitStringValueAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, alarmValues []BACnetApplicationTagBitString) *_BACnetConstructedDataBitStringValueAlarmValues {
 	_result := &_BACnetConstructedDataBitStringValueAlarmValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		AlarmValues:                   alarmValues,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValuePresentValue.go
index fa2ea3db981..300838bc2c6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValuePresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBitStringValuePresentValue = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBitStringValuePresentValue)(nil)
 
 // NewBACnetConstructedDataBitStringValuePresentValue factory function for _BACnetConstructedDataBitStringValuePresentValue
-func NewBACnetConstructedDataBitStringValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagBitString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBitStringValuePresentValue {
+func NewBACnetConstructedDataBitStringValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagBitString) *_BACnetConstructedDataBitStringValuePresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagBitString for BACnetConstructedDataBitStringValuePresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataBitStringValuePresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueRelinquishDefault.go
index 1db94d2b173..5619c327ec1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBitStringValueRelinquishDefault = (*_BACnetConstructe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBitStringValueRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataBitStringValueRelinquishDefault factory function for _BACnetConstructedDataBitStringValueRelinquishDefault
-func NewBACnetConstructedDataBitStringValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagBitString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBitStringValueRelinquishDefault {
+func NewBACnetConstructedDataBitStringValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagBitString) *_BACnetConstructedDataBitStringValueRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagBitString for BACnetConstructedDataBitStringValueRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataBitStringValueRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitText.go
index 2be6f777171..b783299a31e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitText.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataBitText = (*_BACnetConstructedDataBitText)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBitText)(nil)
 
 // NewBACnetConstructedDataBitText factory function for _BACnetConstructedDataBitText
-func NewBACnetConstructedDataBitText(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, bitText []BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBitText {
+func NewBACnetConstructedDataBitText(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, bitText []BACnetApplicationTagCharacterString) *_BACnetConstructedDataBitText {
 	_result := &_BACnetConstructedDataBitText{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		BitText:                       bitText,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitstringValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitstringValueAll.go
index 7a9f60a6f06..050c141d225 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitstringValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitstringValueAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataBitstringValueAll = (*_BACnetConstructedDataBitstring
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBitstringValueAll)(nil)
 
 // NewBACnetConstructedDataBitstringValueAll factory function for _BACnetConstructedDataBitstringValueAll
-func NewBACnetConstructedDataBitstringValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBitstringValueAll {
+func NewBACnetConstructedDataBitstringValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataBitstringValueAll {
 	_result := &_BACnetConstructedDataBitstringValueAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBlinkWarnEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBlinkWarnEnable.go
index 0b4c0dd96d1..1a8c477ac3d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBlinkWarnEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBlinkWarnEnable.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBlinkWarnEnable = (*_BACnetConstructedDataBlinkWarnEn
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBlinkWarnEnable)(nil)
 
 // NewBACnetConstructedDataBlinkWarnEnable factory function for _BACnetConstructedDataBlinkWarnEnable
-func NewBACnetConstructedDataBlinkWarnEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, blinkWarnEnable BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBlinkWarnEnable {
+func NewBACnetConstructedDataBlinkWarnEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, blinkWarnEnable BACnetApplicationTagBoolean) *_BACnetConstructedDataBlinkWarnEnable {
 	if blinkWarnEnable == nil {
 		panic("blinkWarnEnable of type BACnetApplicationTagBoolean for BACnetConstructedDataBlinkWarnEnable must not be nil")
 	}
 	_result := &_BACnetConstructedDataBlinkWarnEnable{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BlinkWarnEnable:               blinkWarnEnable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBufferSize.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBufferSize.go
index c9be3d798af..be7f1bce7b2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBufferSize.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBufferSize.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataBufferSize = (*_BACnetConstructedDataBufferSize)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataBufferSize)(nil)
 
 // NewBACnetConstructedDataBufferSize factory function for _BACnetConstructedDataBufferSize
-func NewBACnetConstructedDataBufferSize(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bufferSize BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataBufferSize {
+func NewBACnetConstructedDataBufferSize(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bufferSize BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataBufferSize {
 	if bufferSize == nil {
 		panic("bufferSize of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataBufferSize must not be nil")
 	}
 	_result := &_BACnetConstructedDataBufferSize{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BufferSize:                    bufferSize,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVIncrement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVIncrement.go
index 9f47c588931..f24d5a0177d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVIncrement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVIncrement.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCOVIncrement = (*_BACnetConstructedDataCOVIncrement)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCOVIncrement)(nil)
 
 // NewBACnetConstructedDataCOVIncrement factory function for _BACnetConstructedDataCOVIncrement
-func NewBACnetConstructedDataCOVIncrement(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covIncrement BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCOVIncrement {
+func NewBACnetConstructedDataCOVIncrement(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covIncrement BACnetApplicationTagReal) *_BACnetConstructedDataCOVIncrement {
 	if covIncrement == nil {
 		panic("covIncrement of type BACnetApplicationTagReal for BACnetConstructedDataCOVIncrement must not be nil")
 	}
 	_result := &_BACnetConstructedDataCOVIncrement{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CovIncrement:                  covIncrement,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVPeriod.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVPeriod.go
index 56f34634c24..e9a9324c973 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVPeriod.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVPeriod.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCOVPeriod = (*_BACnetConstructedDataCOVPeriod)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCOVPeriod)(nil)
 
 // NewBACnetConstructedDataCOVPeriod factory function for _BACnetConstructedDataCOVPeriod
-func NewBACnetConstructedDataCOVPeriod(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covPeriod BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCOVPeriod {
+func NewBACnetConstructedDataCOVPeriod(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covPeriod BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataCOVPeriod {
 	if covPeriod == nil {
 		panic("covPeriod of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataCOVPeriod must not be nil")
 	}
 	_result := &_BACnetConstructedDataCOVPeriod{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CovPeriod:                     covPeriod,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVResubscriptionInterval.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVResubscriptionInterval.go
index 895bfe36e75..20714600fe0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVResubscriptionInterval.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVResubscriptionInterval.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCOVResubscriptionInterval = (*_BACnetConstructedDataC
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCOVResubscriptionInterval)(nil)
 
 // NewBACnetConstructedDataCOVResubscriptionInterval factory function for _BACnetConstructedDataCOVResubscriptionInterval
-func NewBACnetConstructedDataCOVResubscriptionInterval(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covResubscriptionInterval BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCOVResubscriptionInterval {
+func NewBACnetConstructedDataCOVResubscriptionInterval(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covResubscriptionInterval BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataCOVResubscriptionInterval {
 	if covResubscriptionInterval == nil {
 		panic("covResubscriptionInterval of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataCOVResubscriptionInterval must not be nil")
 	}
 	_result := &_BACnetConstructedDataCOVResubscriptionInterval{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CovResubscriptionInterval:     covResubscriptionInterval,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVUPeriod.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVUPeriod.go
index 1974a7266bd..e31e925d65b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVUPeriod.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVUPeriod.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCOVUPeriod = (*_BACnetConstructedDataCOVUPeriod)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCOVUPeriod)(nil)
 
 // NewBACnetConstructedDataCOVUPeriod factory function for _BACnetConstructedDataCOVUPeriod
-func NewBACnetConstructedDataCOVUPeriod(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covuPeriod BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCOVUPeriod {
+func NewBACnetConstructedDataCOVUPeriod(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covuPeriod BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataCOVUPeriod {
 	if covuPeriod == nil {
 		panic("covuPeriod of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataCOVUPeriod must not be nil")
 	}
 	_result := &_BACnetConstructedDataCOVUPeriod{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CovuPeriod:                    covuPeriod,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVURecipients.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVURecipients.go
index 66fe2487d14..862d8a5dc40 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVURecipients.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVURecipients.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataCOVURecipients = (*_BACnetConstructedDataCOVURecipien
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCOVURecipients)(nil)
 
 // NewBACnetConstructedDataCOVURecipients factory function for _BACnetConstructedDataCOVURecipients
-func NewBACnetConstructedDataCOVURecipients(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covuRecipients []BACnetRecipient, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCOVURecipients {
+func NewBACnetConstructedDataCOVURecipients(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covuRecipients []BACnetRecipient) *_BACnetConstructedDataCOVURecipients {
 	_result := &_BACnetConstructedDataCOVURecipients{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CovuRecipients:                covuRecipients,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarAll.go
index 40bcd59b808..a0a29f924be 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataCalendarAll = (*_BACnetConstructedDataCalendarAll)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCalendarAll)(nil)
 
 // NewBACnetConstructedDataCalendarAll factory function for _BACnetConstructedDataCalendarAll
-func NewBACnetConstructedDataCalendarAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCalendarAll {
+func NewBACnetConstructedDataCalendarAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataCalendarAll {
 	_result := &_BACnetConstructedDataCalendarAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarPresentValue.go
index 56fe7fa2ce2..c9ad62c85b4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCalendarPresentValue = (*_BACnetConstructedDataCalend
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCalendarPresentValue)(nil)
 
 // NewBACnetConstructedDataCalendarPresentValue factory function for _BACnetConstructedDataCalendarPresentValue
-func NewBACnetConstructedDataCalendarPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCalendarPresentValue {
+func NewBACnetConstructedDataCalendarPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagBoolean) *_BACnetConstructedDataCalendarPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagBoolean for BACnetConstructedDataCalendarPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataCalendarPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarAssignedDirection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarAssignedDirection.go
index cc0bd2df882..cb0990eeeb6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarAssignedDirection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarAssignedDirection.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCarAssignedDirection = (*_BACnetConstructedDataCarAss
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCarAssignedDirection)(nil)
 
 // NewBACnetConstructedDataCarAssignedDirection factory function for _BACnetConstructedDataCarAssignedDirection
-func NewBACnetConstructedDataCarAssignedDirection(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, assignedDirection BACnetLiftCarDirectionTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCarAssignedDirection {
+func NewBACnetConstructedDataCarAssignedDirection(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, assignedDirection BACnetLiftCarDirectionTagged) *_BACnetConstructedDataCarAssignedDirection {
 	if assignedDirection == nil {
 		panic("assignedDirection of type BACnetLiftCarDirectionTagged for BACnetConstructedDataCarAssignedDirection must not be nil")
 	}
 	_result := &_BACnetConstructedDataCarAssignedDirection{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AssignedDirection:             assignedDirection,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorCommand.go
index 140998a7989..53aafb839e0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorCommand.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataCarDoorCommand = (*_BACnetConstructedDataCarDoorComma
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCarDoorCommand)(nil)
 
 // NewBACnetConstructedDataCarDoorCommand factory function for _BACnetConstructedDataCarDoorCommand
-func NewBACnetConstructedDataCarDoorCommand(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, carDoorCommand []BACnetLiftCarDoorCommandTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCarDoorCommand {
+func NewBACnetConstructedDataCarDoorCommand(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, carDoorCommand []BACnetLiftCarDoorCommandTagged) *_BACnetConstructedDataCarDoorCommand {
 	_result := &_BACnetConstructedDataCarDoorCommand{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		CarDoorCommand:                carDoorCommand,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorStatus.go
index 3dd49a9150c..641171bc86b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorStatus.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataCarDoorStatus = (*_BACnetConstructedDataCarDoorStatus
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCarDoorStatus)(nil)
 
 // NewBACnetConstructedDataCarDoorStatus factory function for _BACnetConstructedDataCarDoorStatus
-func NewBACnetConstructedDataCarDoorStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, carDoorStatus []BACnetDoorStatusTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCarDoorStatus {
+func NewBACnetConstructedDataCarDoorStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, carDoorStatus []BACnetDoorStatusTagged) *_BACnetConstructedDataCarDoorStatus {
 	_result := &_BACnetConstructedDataCarDoorStatus{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		CarDoorStatus:                 carDoorStatus,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorText.go
index 9ef6ab39865..4827ad7836a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorText.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataCarDoorText = (*_BACnetConstructedDataCarDoorText)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCarDoorText)(nil)
 
 // NewBACnetConstructedDataCarDoorText factory function for _BACnetConstructedDataCarDoorText
-func NewBACnetConstructedDataCarDoorText(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, carDoorText []BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCarDoorText {
+func NewBACnetConstructedDataCarDoorText(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, carDoorText []BACnetApplicationTagCharacterString) *_BACnetConstructedDataCarDoorText {
 	_result := &_BACnetConstructedDataCarDoorText{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		CarDoorText:                   carDoorText,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorZone.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorZone.go
index e173b146365..240426902f7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorZone.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorZone.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCarDoorZone = (*_BACnetConstructedDataCarDoorZone)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCarDoorZone)(nil)
 
 // NewBACnetConstructedDataCarDoorZone factory function for _BACnetConstructedDataCarDoorZone
-func NewBACnetConstructedDataCarDoorZone(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, carDoorZone BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCarDoorZone {
+func NewBACnetConstructedDataCarDoorZone(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, carDoorZone BACnetApplicationTagBoolean) *_BACnetConstructedDataCarDoorZone {
 	if carDoorZone == nil {
 		panic("carDoorZone of type BACnetApplicationTagBoolean for BACnetConstructedDataCarDoorZone must not be nil")
 	}
 	_result := &_BACnetConstructedDataCarDoorZone{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CarDoorZone:                   carDoorZone,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDriveStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDriveStatus.go
index b4604d907d2..6e5c0c43298 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDriveStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDriveStatus.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCarDriveStatus = (*_BACnetConstructedDataCarDriveStat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCarDriveStatus)(nil)
 
 // NewBACnetConstructedDataCarDriveStatus factory function for _BACnetConstructedDataCarDriveStatus
-func NewBACnetConstructedDataCarDriveStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, carDriveStatus BACnetLiftCarDriveStatusTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCarDriveStatus {
+func NewBACnetConstructedDataCarDriveStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, carDriveStatus BACnetLiftCarDriveStatusTagged) *_BACnetConstructedDataCarDriveStatus {
 	if carDriveStatus == nil {
 		panic("carDriveStatus of type BACnetLiftCarDriveStatusTagged for BACnetConstructedDataCarDriveStatus must not be nil")
 	}
 	_result := &_BACnetConstructedDataCarDriveStatus{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CarDriveStatus:                carDriveStatus,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoad.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoad.go
index dfa2f2fb12f..035cc48566c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoad.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoad.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCarLoad = (*_BACnetConstructedDataCarLoad)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCarLoad)(nil)
 
 // NewBACnetConstructedDataCarLoad factory function for _BACnetConstructedDataCarLoad
-func NewBACnetConstructedDataCarLoad(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, carLoad BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCarLoad {
+func NewBACnetConstructedDataCarLoad(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, carLoad BACnetApplicationTagReal) *_BACnetConstructedDataCarLoad {
 	if carLoad == nil {
 		panic("carLoad of type BACnetApplicationTagReal for BACnetConstructedDataCarLoad must not be nil")
 	}
 	_result := &_BACnetConstructedDataCarLoad{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CarLoad:                       carLoad,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoadUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoadUnits.go
index d575f92b68e..91622908b36 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoadUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoadUnits.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCarLoadUnits = (*_BACnetConstructedDataCarLoadUnits)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCarLoadUnits)(nil)
 
 // NewBACnetConstructedDataCarLoadUnits factory function for _BACnetConstructedDataCarLoadUnits
-func NewBACnetConstructedDataCarLoadUnits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, units BACnetEngineeringUnitsTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCarLoadUnits {
+func NewBACnetConstructedDataCarLoadUnits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, units BACnetEngineeringUnitsTagged) *_BACnetConstructedDataCarLoadUnits {
 	if units == nil {
 		panic("units of type BACnetEngineeringUnitsTagged for BACnetConstructedDataCarLoadUnits must not be nil")
 	}
 	_result := &_BACnetConstructedDataCarLoadUnits{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Units:                         units,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMode.go
index e0dfeefdc67..735bd350470 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMode.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCarMode = (*_BACnetConstructedDataCarMode)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCarMode)(nil)
 
 // NewBACnetConstructedDataCarMode factory function for _BACnetConstructedDataCarMode
-func NewBACnetConstructedDataCarMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, carMode BACnetLiftCarModeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCarMode {
+func NewBACnetConstructedDataCarMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, carMode BACnetLiftCarModeTagged) *_BACnetConstructedDataCarMode {
 	if carMode == nil {
 		panic("carMode of type BACnetLiftCarModeTagged for BACnetConstructedDataCarMode must not be nil")
 	}
 	_result := &_BACnetConstructedDataCarMode{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CarMode:                       carMode,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMovingDirection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMovingDirection.go
index 535b1e8b238..0f08c9fcf8b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMovingDirection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMovingDirection.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCarMovingDirection = (*_BACnetConstructedDataCarMovin
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCarMovingDirection)(nil)
 
 // NewBACnetConstructedDataCarMovingDirection factory function for _BACnetConstructedDataCarMovingDirection
-func NewBACnetConstructedDataCarMovingDirection(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, carMovingDirection BACnetLiftCarDirectionTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCarMovingDirection {
+func NewBACnetConstructedDataCarMovingDirection(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, carMovingDirection BACnetLiftCarDirectionTagged) *_BACnetConstructedDataCarMovingDirection {
 	if carMovingDirection == nil {
 		panic("carMovingDirection of type BACnetLiftCarDirectionTagged for BACnetConstructedDataCarMovingDirection must not be nil")
 	}
 	_result := &_BACnetConstructedDataCarMovingDirection{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CarMovingDirection:            carMovingDirection,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarPosition.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarPosition.go
index 9b2d5983e06..83784903a6f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarPosition.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarPosition.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCarPosition = (*_BACnetConstructedDataCarPosition)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCarPosition)(nil)
 
 // NewBACnetConstructedDataCarPosition factory function for _BACnetConstructedDataCarPosition
-func NewBACnetConstructedDataCarPosition(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, carPosition BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCarPosition {
+func NewBACnetConstructedDataCarPosition(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, carPosition BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataCarPosition {
 	if carPosition == nil {
 		panic("carPosition of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataCarPosition must not be nil")
 	}
 	_result := &_BACnetConstructedDataCarPosition{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CarPosition:                   carPosition,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateCount.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateCount.go
index 81f121357c6..0607de9873d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateCount.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateCount.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataChangeOfStateCount = (*_BACnetConstructedDataChangeOf
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataChangeOfStateCount)(nil)
 
 // NewBACnetConstructedDataChangeOfStateCount factory function for _BACnetConstructedDataChangeOfStateCount
-func NewBACnetConstructedDataChangeOfStateCount(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, changeIfStateCount BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataChangeOfStateCount {
+func NewBACnetConstructedDataChangeOfStateCount(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, changeIfStateCount BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataChangeOfStateCount {
 	if changeIfStateCount == nil {
 		panic("changeIfStateCount of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataChangeOfStateCount must not be nil")
 	}
 	_result := &_BACnetConstructedDataChangeOfStateCount{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ChangeIfStateCount:            changeIfStateCount,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateTime.go
index 51a84fd6b87..3c860490304 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataChangeOfStateTime = (*_BACnetConstructedDataChangeOfS
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataChangeOfStateTime)(nil)
 
 // NewBACnetConstructedDataChangeOfStateTime factory function for _BACnetConstructedDataChangeOfStateTime
-func NewBACnetConstructedDataChangeOfStateTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, changeOfStateTime BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataChangeOfStateTime {
+func NewBACnetConstructedDataChangeOfStateTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, changeOfStateTime BACnetDateTime) *_BACnetConstructedDataChangeOfStateTime {
 	if changeOfStateTime == nil {
 		panic("changeOfStateTime of type BACnetDateTime for BACnetConstructedDataChangeOfStateTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataChangeOfStateTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ChangeOfStateTime:             changeOfStateTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangesPending.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangesPending.go
index 517f0d2cf75..c1d4f83d786 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangesPending.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangesPending.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataChangesPending = (*_BACnetConstructedDataChangesPendi
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataChangesPending)(nil)
 
 // NewBACnetConstructedDataChangesPending factory function for _BACnetConstructedDataChangesPending
-func NewBACnetConstructedDataChangesPending(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, changesPending BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataChangesPending {
+func NewBACnetConstructedDataChangesPending(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, changesPending BACnetApplicationTagBoolean) *_BACnetConstructedDataChangesPending {
 	if changesPending == nil {
 		panic("changesPending of type BACnetApplicationTagBoolean for BACnetConstructedDataChangesPending must not be nil")
 	}
 	_result := &_BACnetConstructedDataChangesPending{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ChangesPending:                changesPending,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelAll.go
index fd161c8f70f..3baf4c1fe61 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataChannelAll = (*_BACnetConstructedDataChannelAll)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataChannelAll)(nil)
 
 // NewBACnetConstructedDataChannelAll factory function for _BACnetConstructedDataChannelAll
-func NewBACnetConstructedDataChannelAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataChannelAll {
+func NewBACnetConstructedDataChannelAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataChannelAll {
 	_result := &_BACnetConstructedDataChannelAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelListOfObjectPropertyReferences.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelListOfObjectPropertyReferences.go
index 1418deb3611..04863ecbebf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelListOfObjectPropertyReferences.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelListOfObjectPropertyReferences.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataChannelListOfObjectPropertyReferences = (*_BACnetCons
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataChannelListOfObjectPropertyReferences)(nil)
 
 // NewBACnetConstructedDataChannelListOfObjectPropertyReferences factory function for _BACnetConstructedDataChannelListOfObjectPropertyReferences
-func NewBACnetConstructedDataChannelListOfObjectPropertyReferences(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, references []BACnetDeviceObjectPropertyReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataChannelListOfObjectPropertyReferences {
+func NewBACnetConstructedDataChannelListOfObjectPropertyReferences(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, references []BACnetDeviceObjectPropertyReference) *_BACnetConstructedDataChannelListOfObjectPropertyReferences {
 	_result := &_BACnetConstructedDataChannelListOfObjectPropertyReferences{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		References:                    references,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelNumber.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelNumber.go
index 325a1c38f3c..9f475c1d747 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelNumber.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelNumber.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataChannelNumber = (*_BACnetConstructedDataChannelNumber
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataChannelNumber)(nil)
 
 // NewBACnetConstructedDataChannelNumber factory function for _BACnetConstructedDataChannelNumber
-func NewBACnetConstructedDataChannelNumber(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, channelNumber BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataChannelNumber {
+func NewBACnetConstructedDataChannelNumber(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, channelNumber BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataChannelNumber {
 	if channelNumber == nil {
 		panic("channelNumber of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataChannelNumber must not be nil")
 	}
 	_result := &_BACnetConstructedDataChannelNumber{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ChannelNumber:                 channelNumber,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelPresentValue.go
index b4397ecec79..4b98e98f8da 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataChannelPresentValue = (*_BACnetConstructedDataChannel
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataChannelPresentValue)(nil)
 
 // NewBACnetConstructedDataChannelPresentValue factory function for _BACnetConstructedDataChannelPresentValue
-func NewBACnetConstructedDataChannelPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetChannelValue, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataChannelPresentValue {
+func NewBACnetConstructedDataChannelPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetChannelValue) *_BACnetConstructedDataChannelPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetChannelValue for BACnetConstructedDataChannelPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataChannelPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueAlarmValues.go
index 1ed56583ee8..2aef5c35053 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueAlarmValues.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataCharacterStringValueAlarmValues = (*_BACnetConstructe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCharacterStringValueAlarmValues)(nil)
 
 // NewBACnetConstructedDataCharacterStringValueAlarmValues factory function for _BACnetConstructedDataCharacterStringValueAlarmValues
-func NewBACnetConstructedDataCharacterStringValueAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, alarmValues []BACnetOptionalCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCharacterStringValueAlarmValues {
+func NewBACnetConstructedDataCharacterStringValueAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, alarmValues []BACnetOptionalCharacterString) *_BACnetConstructedDataCharacterStringValueAlarmValues {
 	_result := &_BACnetConstructedDataCharacterStringValueAlarmValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		AlarmValues:                   alarmValues,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueFaultValues.go
index 4ebd17c3e8a..ec1cba18636 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueFaultValues.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataCharacterStringValueFaultValues = (*_BACnetConstructe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCharacterStringValueFaultValues)(nil)
 
 // NewBACnetConstructedDataCharacterStringValueFaultValues factory function for _BACnetConstructedDataCharacterStringValueFaultValues
-func NewBACnetConstructedDataCharacterStringValueFaultValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, faultValues []BACnetOptionalCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCharacterStringValueFaultValues {
+func NewBACnetConstructedDataCharacterStringValueFaultValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, faultValues []BACnetOptionalCharacterString) *_BACnetConstructedDataCharacterStringValueFaultValues {
 	_result := &_BACnetConstructedDataCharacterStringValueFaultValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		FaultValues:                   faultValues,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValuePresentValue.go
index 16d4ef59068..718761f4fdf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValuePresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCharacterStringValuePresentValue = (*_BACnetConstruct
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCharacterStringValuePresentValue)(nil)
 
 // NewBACnetConstructedDataCharacterStringValuePresentValue factory function for _BACnetConstructedDataCharacterStringValuePresentValue
-func NewBACnetConstructedDataCharacterStringValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCharacterStringValuePresentValue {
+func NewBACnetConstructedDataCharacterStringValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagCharacterString) *_BACnetConstructedDataCharacterStringValuePresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagCharacterString for BACnetConstructedDataCharacterStringValuePresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataCharacterStringValuePresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueRelinquishDefault.go
index c66299697ae..b3626d78b3b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCharacterStringValueRelinquishDefault = (*_BACnetCons
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCharacterStringValueRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataCharacterStringValueRelinquishDefault factory function for _BACnetConstructedDataCharacterStringValueRelinquishDefault
-func NewBACnetConstructedDataCharacterStringValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCharacterStringValueRelinquishDefault {
+func NewBACnetConstructedDataCharacterStringValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagCharacterString) *_BACnetConstructedDataCharacterStringValueRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagCharacterString for BACnetConstructedDataCharacterStringValueRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataCharacterStringValueRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterstringValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterstringValueAll.go
index 41c5f20eac2..b9274ed0df5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterstringValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterstringValueAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataCharacterstringValueAll = (*_BACnetConstructedDataCha
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCharacterstringValueAll)(nil)
 
 // NewBACnetConstructedDataCharacterstringValueAll factory function for _BACnetConstructedDataCharacterstringValueAll
-func NewBACnetConstructedDataCharacterstringValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCharacterstringValueAll {
+func NewBACnetConstructedDataCharacterstringValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataCharacterstringValueAll {
 	_result := &_BACnetConstructedDataCharacterstringValueAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataClientCOVIncrement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataClientCOVIncrement.go
index 24a4c01e061..b5b4bb7f95f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataClientCOVIncrement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataClientCOVIncrement.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataClientCOVIncrement = (*_BACnetConstructedDataClientCO
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataClientCOVIncrement)(nil)
 
 // NewBACnetConstructedDataClientCOVIncrement factory function for _BACnetConstructedDataClientCOVIncrement
-func NewBACnetConstructedDataClientCOVIncrement(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covIncrement BACnetClientCOV, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataClientCOVIncrement {
+func NewBACnetConstructedDataClientCOVIncrement(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covIncrement BACnetClientCOV) *_BACnetConstructedDataClientCOVIncrement {
 	if covIncrement == nil {
 		panic("covIncrement of type BACnetClientCOV for BACnetConstructedDataClientCOVIncrement must not be nil")
 	}
 	_result := &_BACnetConstructedDataClientCOVIncrement{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CovIncrement:                  covIncrement,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommand.go
index 2d4a4f36bb1..74204ca0024 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommand.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCommand = (*_BACnetConstructedDataCommand)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCommand)(nil)
 
 // NewBACnetConstructedDataCommand factory function for _BACnetConstructedDataCommand
-func NewBACnetConstructedDataCommand(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, command BACnetNetworkPortCommandTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCommand {
+func NewBACnetConstructedDataCommand(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, command BACnetNetworkPortCommandTagged) *_BACnetConstructedDataCommand {
 	if command == nil {
 		panic("command of type BACnetNetworkPortCommandTagged for BACnetConstructedDataCommand must not be nil")
 	}
 	_result := &_BACnetConstructedDataCommand{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Command:                       command,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAction.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAction.go
index a0258418def..91fc5393dae 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAction.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAction.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataCommandAction = (*_BACnetConstructedDataCommandAction
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCommandAction)(nil)
 
 // NewBACnetConstructedDataCommandAction factory function for _BACnetConstructedDataCommandAction
-func NewBACnetConstructedDataCommandAction(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, actionLists []BACnetActionList, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCommandAction {
+func NewBACnetConstructedDataCommandAction(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, actionLists []BACnetActionList) *_BACnetConstructedDataCommandAction {
 	_result := &_BACnetConstructedDataCommandAction{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		ActionLists:                   actionLists,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAll.go
index 099bfa838f3..f787ad988a1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataCommandAll = (*_BACnetConstructedDataCommandAll)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCommandAll)(nil)
 
 // NewBACnetConstructedDataCommandAll factory function for _BACnetConstructedDataCommandAll
-func NewBACnetConstructedDataCommandAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCommandAll {
+func NewBACnetConstructedDataCommandAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataCommandAll {
 	_result := &_BACnetConstructedDataCommandAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandTimeArray.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandTimeArray.go
index 367b7ceebea..e6a34972969 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandTimeArray.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandTimeArray.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataCommandTimeArray = (*_BACnetConstructedDataCommandTim
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCommandTimeArray)(nil)
 
 // NewBACnetConstructedDataCommandTimeArray factory function for _BACnetConstructedDataCommandTimeArray
-func NewBACnetConstructedDataCommandTimeArray(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, commandTimeArray []BACnetTimeStamp, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCommandTimeArray {
+func NewBACnetConstructedDataCommandTimeArray(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, commandTimeArray []BACnetTimeStamp) *_BACnetConstructedDataCommandTimeArray {
 	_result := &_BACnetConstructedDataCommandTimeArray{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		CommandTimeArray:              commandTimeArray,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataConfigurationFiles.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataConfigurationFiles.go
index 823351718e3..7ff8c64ae56 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataConfigurationFiles.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataConfigurationFiles.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataConfigurationFiles = (*_BACnetConstructedDataConfigur
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataConfigurationFiles)(nil)
 
 // NewBACnetConstructedDataConfigurationFiles factory function for _BACnetConstructedDataConfigurationFiles
-func NewBACnetConstructedDataConfigurationFiles(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, configurationFiles []BACnetApplicationTagObjectIdentifier, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataConfigurationFiles {
+func NewBACnetConstructedDataConfigurationFiles(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, configurationFiles []BACnetApplicationTagObjectIdentifier) *_BACnetConstructedDataConfigurationFiles {
 	_result := &_BACnetConstructedDataConfigurationFiles{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		ConfigurationFiles:            configurationFiles,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlGroups.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlGroups.go
index 41a72561822..49532e62a20 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlGroups.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlGroups.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataControlGroups = (*_BACnetConstructedDataControlGroups
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataControlGroups)(nil)
 
 // NewBACnetConstructedDataControlGroups factory function for _BACnetConstructedDataControlGroups
-func NewBACnetConstructedDataControlGroups(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, controlGroups []BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataControlGroups {
+func NewBACnetConstructedDataControlGroups(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, controlGroups []BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataControlGroups {
 	_result := &_BACnetConstructedDataControlGroups{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		ControlGroups:                 controlGroups,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableReference.go
index 7fc43c40439..afdb8edce16 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableReference.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataControlledVariableReference = (*_BACnetConstructedDat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataControlledVariableReference)(nil)
 
 // NewBACnetConstructedDataControlledVariableReference factory function for _BACnetConstructedDataControlledVariableReference
-func NewBACnetConstructedDataControlledVariableReference(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, controlledVariableReference BACnetObjectPropertyReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataControlledVariableReference {
+func NewBACnetConstructedDataControlledVariableReference(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, controlledVariableReference BACnetObjectPropertyReference) *_BACnetConstructedDataControlledVariableReference {
 	if controlledVariableReference == nil {
 		panic("controlledVariableReference of type BACnetObjectPropertyReference for BACnetConstructedDataControlledVariableReference must not be nil")
 	}
 	_result := &_BACnetConstructedDataControlledVariableReference{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ControlledVariableReference:   controlledVariableReference,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableUnits.go
index e8ca31bda22..6275820a51d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableUnits.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataControlledVariableUnits = (*_BACnetConstructedDataCon
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataControlledVariableUnits)(nil)
 
 // NewBACnetConstructedDataControlledVariableUnits factory function for _BACnetConstructedDataControlledVariableUnits
-func NewBACnetConstructedDataControlledVariableUnits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, units BACnetEngineeringUnitsTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataControlledVariableUnits {
+func NewBACnetConstructedDataControlledVariableUnits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, units BACnetEngineeringUnitsTagged) *_BACnetConstructedDataControlledVariableUnits {
 	if units == nil {
 		panic("units of type BACnetEngineeringUnitsTagged for BACnetConstructedDataControlledVariableUnits must not be nil")
 	}
 	_result := &_BACnetConstructedDataControlledVariableUnits{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Units:                         units,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableValue.go
index 8f345ec34cf..5091997da0d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataControlledVariableValue = (*_BACnetConstructedDataCon
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataControlledVariableValue)(nil)
 
 // NewBACnetConstructedDataControlledVariableValue factory function for _BACnetConstructedDataControlledVariableValue
-func NewBACnetConstructedDataControlledVariableValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, controlledVariableValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataControlledVariableValue {
+func NewBACnetConstructedDataControlledVariableValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, controlledVariableValue BACnetApplicationTagReal) *_BACnetConstructedDataControlledVariableValue {
 	if controlledVariableValue == nil {
 		panic("controlledVariableValue of type BACnetApplicationTagReal for BACnetConstructedDataControlledVariableValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataControlledVariableValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ControlledVariableValue:       controlledVariableValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCount.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCount.go
index cd6e87a64e4..7ee18699e8b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCount.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCount.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCount = (*_BACnetConstructedDataCount)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCount)(nil)
 
 // NewBACnetConstructedDataCount factory function for _BACnetConstructedDataCount
-func NewBACnetConstructedDataCount(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, count BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCount {
+func NewBACnetConstructedDataCount(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, count BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataCount {
 	if count == nil {
 		panic("count of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataCount must not be nil")
 	}
 	_result := &_BACnetConstructedDataCount{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Count:                         count,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountBeforeChange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountBeforeChange.go
index 5cfeac62fd8..25931db5835 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountBeforeChange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountBeforeChange.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCountBeforeChange = (*_BACnetConstructedDataCountBefo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCountBeforeChange)(nil)
 
 // NewBACnetConstructedDataCountBeforeChange factory function for _BACnetConstructedDataCountBeforeChange
-func NewBACnetConstructedDataCountBeforeChange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, countBeforeChange BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCountBeforeChange {
+func NewBACnetConstructedDataCountBeforeChange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, countBeforeChange BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataCountBeforeChange {
 	if countBeforeChange == nil {
 		panic("countBeforeChange of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataCountBeforeChange must not be nil")
 	}
 	_result := &_BACnetConstructedDataCountBeforeChange{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CountBeforeChange:             countBeforeChange,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountChangeTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountChangeTime.go
index 5c8eebe3bea..b339420e692 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountChangeTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountChangeTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCountChangeTime = (*_BACnetConstructedDataCountChange
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCountChangeTime)(nil)
 
 // NewBACnetConstructedDataCountChangeTime factory function for _BACnetConstructedDataCountChangeTime
-func NewBACnetConstructedDataCountChangeTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, countChangeTime BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCountChangeTime {
+func NewBACnetConstructedDataCountChangeTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, countChangeTime BACnetDateTime) *_BACnetConstructedDataCountChangeTime {
 	if countChangeTime == nil {
 		panic("countChangeTime of type BACnetDateTime for BACnetConstructedDataCountChangeTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataCountChangeTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CountChangeTime:               countChangeTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputAll.go
index d3d6f6ea517..14f242c0865 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataCredentialDataInputAll = (*_BACnetConstructedDataCred
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCredentialDataInputAll)(nil)
 
 // NewBACnetConstructedDataCredentialDataInputAll factory function for _BACnetConstructedDataCredentialDataInputAll
-func NewBACnetConstructedDataCredentialDataInputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCredentialDataInputAll {
+func NewBACnetConstructedDataCredentialDataInputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataCredentialDataInputAll {
 	_result := &_BACnetConstructedDataCredentialDataInputAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputPresentValue.go
index 06c9b876a06..130c29787e3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCredentialDataInputPresentValue = (*_BACnetConstructe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCredentialDataInputPresentValue)(nil)
 
 // NewBACnetConstructedDataCredentialDataInputPresentValue factory function for _BACnetConstructedDataCredentialDataInputPresentValue
-func NewBACnetConstructedDataCredentialDataInputPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetAuthenticationFactor, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCredentialDataInputPresentValue {
+func NewBACnetConstructedDataCredentialDataInputPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetAuthenticationFactor) *_BACnetConstructedDataCredentialDataInputPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetAuthenticationFactor for BACnetConstructedDataCredentialDataInputPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataCredentialDataInputPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputUpdateTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputUpdateTime.go
index 631f6a6f484..b179fa16ea3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputUpdateTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputUpdateTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCredentialDataInputUpdateTime = (*_BACnetConstructedD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCredentialDataInputUpdateTime)(nil)
 
 // NewBACnetConstructedDataCredentialDataInputUpdateTime factory function for _BACnetConstructedDataCredentialDataInputUpdateTime
-func NewBACnetConstructedDataCredentialDataInputUpdateTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, updateTime BACnetTimeStamp, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCredentialDataInputUpdateTime {
+func NewBACnetConstructedDataCredentialDataInputUpdateTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, updateTime BACnetTimeStamp) *_BACnetConstructedDataCredentialDataInputUpdateTime {
 	if updateTime == nil {
 		panic("updateTime of type BACnetTimeStamp for BACnetConstructedDataCredentialDataInputUpdateTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataCredentialDataInputUpdateTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		UpdateTime:                    updateTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDisable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDisable.go
index c95e8a76f16..81eeac3bfb0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDisable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDisable.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCredentialDisable = (*_BACnetConstructedDataCredentia
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCredentialDisable)(nil)
 
 // NewBACnetConstructedDataCredentialDisable factory function for _BACnetConstructedDataCredentialDisable
-func NewBACnetConstructedDataCredentialDisable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, credentialDisable BACnetAccessCredentialDisableTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCredentialDisable {
+func NewBACnetConstructedDataCredentialDisable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, credentialDisable BACnetAccessCredentialDisableTagged) *_BACnetConstructedDataCredentialDisable {
 	if credentialDisable == nil {
 		panic("credentialDisable of type BACnetAccessCredentialDisableTagged for BACnetConstructedDataCredentialDisable must not be nil")
 	}
 	_result := &_BACnetConstructedDataCredentialDisable{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CredentialDisable:             credentialDisable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialStatus.go
index 9fc5f9fd835..624e8a3105f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialStatus.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCredentialStatus = (*_BACnetConstructedDataCredential
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCredentialStatus)(nil)
 
 // NewBACnetConstructedDataCredentialStatus factory function for _BACnetConstructedDataCredentialStatus
-func NewBACnetConstructedDataCredentialStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, binaryPv BACnetBinaryPVTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCredentialStatus {
+func NewBACnetConstructedDataCredentialStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, binaryPv BACnetBinaryPVTagged) *_BACnetConstructedDataCredentialStatus {
 	if binaryPv == nil {
 		panic("binaryPv of type BACnetBinaryPVTagged for BACnetConstructedDataCredentialStatus must not be nil")
 	}
 	_result := &_BACnetConstructedDataCredentialStatus{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		BinaryPv:                      binaryPv,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentials.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentials.go
index 3d89c362df6..2698bfb7b31 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentials.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentials.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataCredentials = (*_BACnetConstructedDataCredentials)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCredentials)(nil)
 
 // NewBACnetConstructedDataCredentials factory function for _BACnetConstructedDataCredentials
-func NewBACnetConstructedDataCredentials(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, credentials []BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCredentials {
+func NewBACnetConstructedDataCredentials(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, credentials []BACnetDeviceObjectReference) *_BACnetConstructedDataCredentials {
 	_result := &_BACnetConstructedDataCredentials{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Credentials:                   credentials,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialsInZone.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialsInZone.go
index 7728e0e05cb..2eeecb06e9d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialsInZone.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialsInZone.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataCredentialsInZone = (*_BACnetConstructedDataCredentia
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCredentialsInZone)(nil)
 
 // NewBACnetConstructedDataCredentialsInZone factory function for _BACnetConstructedDataCredentialsInZone
-func NewBACnetConstructedDataCredentialsInZone(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, credentialsInZone []BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCredentialsInZone {
+func NewBACnetConstructedDataCredentialsInZone(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, credentialsInZone []BACnetDeviceObjectReference) *_BACnetConstructedDataCredentialsInZone {
 	_result := &_BACnetConstructedDataCredentialsInZone{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CredentialsInZone:             credentialsInZone,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCurrentCommandPriority.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCurrentCommandPriority.go
index a33b085ad58..c07c4e7158a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCurrentCommandPriority.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCurrentCommandPriority.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataCurrentCommandPriority = (*_BACnetConstructedDataCurr
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataCurrentCommandPriority)(nil)
 
 // NewBACnetConstructedDataCurrentCommandPriority factory function for _BACnetConstructedDataCurrentCommandPriority
-func NewBACnetConstructedDataCurrentCommandPriority(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, currentCommandPriority BACnetOptionalUnsigned, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataCurrentCommandPriority {
+func NewBACnetConstructedDataCurrentCommandPriority(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, currentCommandPriority BACnetOptionalUnsigned) *_BACnetConstructedDataCurrentCommandPriority {
 	if currentCommandPriority == nil {
 		panic("currentCommandPriority of type BACnetOptionalUnsigned for BACnetConstructedDataCurrentCommandPriority must not be nil")
 	}
 	_result := &_BACnetConstructedDataCurrentCommandPriority{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CurrentCommandPriority:        currentCommandPriority,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatabaseRevision.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatabaseRevision.go
index dd7099eace1..80e38e57ded 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatabaseRevision.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatabaseRevision.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDatabaseRevision = (*_BACnetConstructedDataDatabaseRe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDatabaseRevision)(nil)
 
 // NewBACnetConstructedDataDatabaseRevision factory function for _BACnetConstructedDataDatabaseRevision
-func NewBACnetConstructedDataDatabaseRevision(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, databaseRevision BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDatabaseRevision {
+func NewBACnetConstructedDataDatabaseRevision(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, databaseRevision BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataDatabaseRevision {
 	if databaseRevision == nil {
 		panic("databaseRevision of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataDatabaseRevision must not be nil")
 	}
 	_result := &_BACnetConstructedDataDatabaseRevision{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DatabaseRevision:              databaseRevision,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateList.go
index 55941fe8aa4..bfd2963ae4e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateList.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataDateList = (*_BACnetConstructedDataDateList)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDateList)(nil)
 
 // NewBACnetConstructedDataDateList factory function for _BACnetConstructedDataDateList
-func NewBACnetConstructedDataDateList(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, dateList []BACnetCalendarEntry, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDateList {
+func NewBACnetConstructedDataDateList(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, dateList []BACnetCalendarEntry) *_BACnetConstructedDataDateList {
 	_result := &_BACnetConstructedDataDateList{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DateList:                      dateList,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValuePresentValue.go
index 4edd0a9c2fa..d1c58240fe7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValuePresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDatePatternValuePresentValue = (*_BACnetConstructedDa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDatePatternValuePresentValue)(nil)
 
 // NewBACnetConstructedDataDatePatternValuePresentValue factory function for _BACnetConstructedDataDatePatternValuePresentValue
-func NewBACnetConstructedDataDatePatternValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagDate, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDatePatternValuePresentValue {
+func NewBACnetConstructedDataDatePatternValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagDate) *_BACnetConstructedDataDatePatternValuePresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagDate for BACnetConstructedDataDatePatternValuePresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataDatePatternValuePresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValueRelinquishDefault.go
index b3b6b18b48e..4e132defea2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValueRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDatePatternValueRelinquishDefault = (*_BACnetConstruc
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDatePatternValueRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataDatePatternValueRelinquishDefault factory function for _BACnetConstructedDataDatePatternValueRelinquishDefault
-func NewBACnetConstructedDataDatePatternValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagDate, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDatePatternValueRelinquishDefault {
+func NewBACnetConstructedDataDatePatternValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagDate) *_BACnetConstructedDataDatePatternValueRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagDate for BACnetConstructedDataDatePatternValueRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataDatePatternValueRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValuePresentValue.go
index bcef4f76b8b..0fce08f4dcb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValuePresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDateTimePatternValuePresentValue = (*_BACnetConstruct
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDateTimePatternValuePresentValue)(nil)
 
 // NewBACnetConstructedDataDateTimePatternValuePresentValue factory function for _BACnetConstructedDataDateTimePatternValuePresentValue
-func NewBACnetConstructedDataDateTimePatternValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDateTimePatternValuePresentValue {
+func NewBACnetConstructedDataDateTimePatternValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetDateTime) *_BACnetConstructedDataDateTimePatternValuePresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetDateTime for BACnetConstructedDataDateTimePatternValuePresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataDateTimePatternValuePresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValueRelinquishDefault.go
index 2cb78a7fe5a..e8f447667e9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValueRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDateTimePatternValueRelinquishDefault = (*_BACnetCons
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDateTimePatternValueRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataDateTimePatternValueRelinquishDefault factory function for _BACnetConstructedDataDateTimePatternValueRelinquishDefault
-func NewBACnetConstructedDataDateTimePatternValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDateTimePatternValueRelinquishDefault {
+func NewBACnetConstructedDataDateTimePatternValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetDateTime) *_BACnetConstructedDataDateTimePatternValueRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetDateTime for BACnetConstructedDataDateTimePatternValueRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataDateTimePatternValueRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValuePresentValue.go
index af34fecb706..aabc669949c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValuePresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDateTimeValuePresentValue = (*_BACnetConstructedDataD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDateTimeValuePresentValue)(nil)
 
 // NewBACnetConstructedDataDateTimeValuePresentValue factory function for _BACnetConstructedDataDateTimeValuePresentValue
-func NewBACnetConstructedDataDateTimeValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDateTimeValuePresentValue {
+func NewBACnetConstructedDataDateTimeValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetDateTime) *_BACnetConstructedDataDateTimeValuePresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetDateTime for BACnetConstructedDataDateTimeValuePresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataDateTimeValuePresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValueRelinquishDefault.go
index df1322e545f..957f7acd84a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValueRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDateTimeValueRelinquishDefault = (*_BACnetConstructed
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDateTimeValueRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataDateTimeValueRelinquishDefault factory function for _BACnetConstructedDataDateTimeValueRelinquishDefault
-func NewBACnetConstructedDataDateTimeValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDateTimeValueRelinquishDefault {
+func NewBACnetConstructedDataDateTimeValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetDateTime) *_BACnetConstructedDataDateTimeValueRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetDateTime for BACnetConstructedDataDateTimeValueRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataDateTimeValueRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueAll.go
index ffe65c06e0f..8e5f3290325 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataDateValueAll = (*_BACnetConstructedDataDateValueAll)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDateValueAll)(nil)
 
 // NewBACnetConstructedDataDateValueAll factory function for _BACnetConstructedDataDateValueAll
-func NewBACnetConstructedDataDateValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDateValueAll {
+func NewBACnetConstructedDataDateValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataDateValueAll {
 	_result := &_BACnetConstructedDataDateValueAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValuePresentValue.go
index 4f296b5b5e0..aa9f038d8c4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValuePresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDateValuePresentValue = (*_BACnetConstructedDataDateV
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDateValuePresentValue)(nil)
 
 // NewBACnetConstructedDataDateValuePresentValue factory function for _BACnetConstructedDataDateValuePresentValue
-func NewBACnetConstructedDataDateValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagDate, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDateValuePresentValue {
+func NewBACnetConstructedDataDateValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagDate) *_BACnetConstructedDataDateValuePresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagDate for BACnetConstructedDataDateValuePresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataDateValuePresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueRelinquishDefault.go
index fc00ef3c0cc..cbd686ef2b6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDateValueRelinquishDefault = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDateValueRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataDateValueRelinquishDefault factory function for _BACnetConstructedDataDateValueRelinquishDefault
-func NewBACnetConstructedDataDateValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagDate, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDateValueRelinquishDefault {
+func NewBACnetConstructedDataDateValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagDate) *_BACnetConstructedDataDateValueRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagDate for BACnetConstructedDataDateValueRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataDateValueRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatepatternValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatepatternValueAll.go
index 897905dc452..79738087651 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatepatternValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatepatternValueAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataDatepatternValueAll = (*_BACnetConstructedDataDatepat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDatepatternValueAll)(nil)
 
 // NewBACnetConstructedDataDatepatternValueAll factory function for _BACnetConstructedDataDatepatternValueAll
-func NewBACnetConstructedDataDatepatternValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDatepatternValueAll {
+func NewBACnetConstructedDataDatepatternValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataDatepatternValueAll {
 	_result := &_BACnetConstructedDataDatepatternValueAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimeValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimeValueAll.go
index 4fbd27a44fb..ee76bdc5a02 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimeValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimeValueAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataDatetimeValueAll = (*_BACnetConstructedDataDatetimeVa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDatetimeValueAll)(nil)
 
 // NewBACnetConstructedDataDatetimeValueAll factory function for _BACnetConstructedDataDatetimeValueAll
-func NewBACnetConstructedDataDatetimeValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDatetimeValueAll {
+func NewBACnetConstructedDataDatetimeValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataDatetimeValueAll {
 	_result := &_BACnetConstructedDataDatetimeValueAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimepatternValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimepatternValueAll.go
index 53c948ce1b3..e46c450967d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimepatternValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimepatternValueAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataDatetimepatternValueAll = (*_BACnetConstructedDataDat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDatetimepatternValueAll)(nil)
 
 // NewBACnetConstructedDataDatetimepatternValueAll factory function for _BACnetConstructedDataDatetimepatternValueAll
-func NewBACnetConstructedDataDatetimepatternValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDatetimepatternValueAll {
+func NewBACnetConstructedDataDatetimepatternValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataDatetimepatternValueAll {
 	_result := &_BACnetConstructedDataDatetimepatternValueAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaylightSavingsStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaylightSavingsStatus.go
index ed7ff334d50..8573dea8863 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaylightSavingsStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaylightSavingsStatus.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDaylightSavingsStatus = (*_BACnetConstructedDataDayli
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDaylightSavingsStatus)(nil)
 
 // NewBACnetConstructedDataDaylightSavingsStatus factory function for _BACnetConstructedDataDaylightSavingsStatus
-func NewBACnetConstructedDataDaylightSavingsStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, daylightSavingsStatus BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDaylightSavingsStatus {
+func NewBACnetConstructedDataDaylightSavingsStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, daylightSavingsStatus BACnetApplicationTagBoolean) *_BACnetConstructedDataDaylightSavingsStatus {
 	if daylightSavingsStatus == nil {
 		panic("daylightSavingsStatus of type BACnetApplicationTagBoolean for BACnetConstructedDataDaylightSavingsStatus must not be nil")
 	}
 	_result := &_BACnetConstructedDataDaylightSavingsStatus{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DaylightSavingsStatus:         daylightSavingsStatus,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaysRemaining.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaysRemaining.go
index e2636e94842..cff6d4f7351 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaysRemaining.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaysRemaining.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDaysRemaining = (*_BACnetConstructedDataDaysRemaining
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDaysRemaining)(nil)
 
 // NewBACnetConstructedDataDaysRemaining factory function for _BACnetConstructedDataDaysRemaining
-func NewBACnetConstructedDataDaysRemaining(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, daysRemaining BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDaysRemaining {
+func NewBACnetConstructedDataDaysRemaining(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, daysRemaining BACnetApplicationTagSignedInteger) *_BACnetConstructedDataDaysRemaining {
 	if daysRemaining == nil {
 		panic("daysRemaining of type BACnetApplicationTagSignedInteger for BACnetConstructedDataDaysRemaining must not be nil")
 	}
 	_result := &_BACnetConstructedDataDaysRemaining{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DaysRemaining:                 daysRemaining,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeadband.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeadband.go
index 6f9b81e2804..25cfaffb200 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeadband.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeadband.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDeadband = (*_BACnetConstructedDataDeadband)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDeadband)(nil)
 
 // NewBACnetConstructedDataDeadband factory function for _BACnetConstructedDataDeadband
-func NewBACnetConstructedDataDeadband(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, deadband BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDeadband {
+func NewBACnetConstructedDataDeadband(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, deadband BACnetApplicationTagReal) *_BACnetConstructedDataDeadband {
 	if deadband == nil {
 		panic("deadband of type BACnetApplicationTagReal for BACnetConstructedDataDeadband must not be nil")
 	}
 	_result := &_BACnetConstructedDataDeadband{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Deadband:                      deadband,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultFadeTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultFadeTime.go
index e4870c06fed..12e7b49e4ed 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultFadeTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultFadeTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDefaultFadeTime = (*_BACnetConstructedDataDefaultFade
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDefaultFadeTime)(nil)
 
 // NewBACnetConstructedDataDefaultFadeTime factory function for _BACnetConstructedDataDefaultFadeTime
-func NewBACnetConstructedDataDefaultFadeTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, defaultFadeTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDefaultFadeTime {
+func NewBACnetConstructedDataDefaultFadeTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, defaultFadeTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataDefaultFadeTime {
 	if defaultFadeTime == nil {
 		panic("defaultFadeTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataDefaultFadeTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataDefaultFadeTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DefaultFadeTime:               defaultFadeTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultRampRate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultRampRate.go
index 7fbd3f9025f..a003866132e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultRampRate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultRampRate.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDefaultRampRate = (*_BACnetConstructedDataDefaultRamp
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDefaultRampRate)(nil)
 
 // NewBACnetConstructedDataDefaultRampRate factory function for _BACnetConstructedDataDefaultRampRate
-func NewBACnetConstructedDataDefaultRampRate(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, defaultRampRate BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDefaultRampRate {
+func NewBACnetConstructedDataDefaultRampRate(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, defaultRampRate BACnetApplicationTagReal) *_BACnetConstructedDataDefaultRampRate {
 	if defaultRampRate == nil {
 		panic("defaultRampRate of type BACnetApplicationTagReal for BACnetConstructedDataDefaultRampRate must not be nil")
 	}
 	_result := &_BACnetConstructedDataDefaultRampRate{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DefaultRampRate:               defaultRampRate,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultStepIncrement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultStepIncrement.go
index a65b215bc46..70de01d820e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultStepIncrement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultStepIncrement.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDefaultStepIncrement = (*_BACnetConstructedDataDefaul
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDefaultStepIncrement)(nil)
 
 // NewBACnetConstructedDataDefaultStepIncrement factory function for _BACnetConstructedDataDefaultStepIncrement
-func NewBACnetConstructedDataDefaultStepIncrement(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, defaultStepIncrement BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDefaultStepIncrement {
+func NewBACnetConstructedDataDefaultStepIncrement(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, defaultStepIncrement BACnetApplicationTagReal) *_BACnetConstructedDataDefaultStepIncrement {
 	if defaultStepIncrement == nil {
 		panic("defaultStepIncrement of type BACnetApplicationTagReal for BACnetConstructedDataDefaultStepIncrement must not be nil")
 	}
 	_result := &_BACnetConstructedDataDefaultStepIncrement{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DefaultStepIncrement:          defaultStepIncrement,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultSubordinateRelationship.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultSubordinateRelationship.go
index ec256581ccb..83a361dfe46 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultSubordinateRelationship.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultSubordinateRelationship.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDefaultSubordinateRelationship = (*_BACnetConstructed
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDefaultSubordinateRelationship)(nil)
 
 // NewBACnetConstructedDataDefaultSubordinateRelationship factory function for _BACnetConstructedDataDefaultSubordinateRelationship
-func NewBACnetConstructedDataDefaultSubordinateRelationship(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, defaultSubordinateRelationship BACnetRelationshipTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDefaultSubordinateRelationship {
+func NewBACnetConstructedDataDefaultSubordinateRelationship(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, defaultSubordinateRelationship BACnetRelationshipTagged) *_BACnetConstructedDataDefaultSubordinateRelationship {
 	if defaultSubordinateRelationship == nil {
 		panic("defaultSubordinateRelationship of type BACnetRelationshipTagged for BACnetConstructedDataDefaultSubordinateRelationship must not be nil")
 	}
 	_result := &_BACnetConstructedDataDefaultSubordinateRelationship{
-		BACnetConstructedDataContract:  NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract:  NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DefaultSubordinateRelationship: defaultSubordinateRelationship,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultTimeout.go
index 2599a0742b7..b1595001be1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultTimeout.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDefaultTimeout = (*_BACnetConstructedDataDefaultTimeo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDefaultTimeout)(nil)
 
 // NewBACnetConstructedDataDefaultTimeout factory function for _BACnetConstructedDataDefaultTimeout
-func NewBACnetConstructedDataDefaultTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, defaultTimeout BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDefaultTimeout {
+func NewBACnetConstructedDataDefaultTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, defaultTimeout BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataDefaultTimeout {
 	if defaultTimeout == nil {
 		panic("defaultTimeout of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataDefaultTimeout must not be nil")
 	}
 	_result := &_BACnetConstructedDataDefaultTimeout{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DefaultTimeout:                defaultTimeout,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeployedProfileLocation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeployedProfileLocation.go
index 641e01e886b..1d2d91a0da1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeployedProfileLocation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeployedProfileLocation.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDeployedProfileLocation = (*_BACnetConstructedDataDep
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDeployedProfileLocation)(nil)
 
 // NewBACnetConstructedDataDeployedProfileLocation factory function for _BACnetConstructedDataDeployedProfileLocation
-func NewBACnetConstructedDataDeployedProfileLocation(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, deployedProfileLocation BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDeployedProfileLocation {
+func NewBACnetConstructedDataDeployedProfileLocation(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, deployedProfileLocation BACnetApplicationTagCharacterString) *_BACnetConstructedDataDeployedProfileLocation {
 	if deployedProfileLocation == nil {
 		panic("deployedProfileLocation of type BACnetApplicationTagCharacterString for BACnetConstructedDataDeployedProfileLocation must not be nil")
 	}
 	_result := &_BACnetConstructedDataDeployedProfileLocation{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DeployedProfileLocation:       deployedProfileLocation,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstant.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstant.go
index 520b1c3b9a1..99f47399ce2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstant.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstant.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDerivativeConstant = (*_BACnetConstructedDataDerivati
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDerivativeConstant)(nil)
 
 // NewBACnetConstructedDataDerivativeConstant factory function for _BACnetConstructedDataDerivativeConstant
-func NewBACnetConstructedDataDerivativeConstant(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, derivativeConstant BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDerivativeConstant {
+func NewBACnetConstructedDataDerivativeConstant(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, derivativeConstant BACnetApplicationTagReal) *_BACnetConstructedDataDerivativeConstant {
 	if derivativeConstant == nil {
 		panic("derivativeConstant of type BACnetApplicationTagReal for BACnetConstructedDataDerivativeConstant must not be nil")
 	}
 	_result := &_BACnetConstructedDataDerivativeConstant{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DerivativeConstant:            derivativeConstant,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstantUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstantUnits.go
index 9fb2f03e81d..596dc434dbe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstantUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstantUnits.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDerivativeConstantUnits = (*_BACnetConstructedDataDer
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDerivativeConstantUnits)(nil)
 
 // NewBACnetConstructedDataDerivativeConstantUnits factory function for _BACnetConstructedDataDerivativeConstantUnits
-func NewBACnetConstructedDataDerivativeConstantUnits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, units BACnetEngineeringUnitsTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDerivativeConstantUnits {
+func NewBACnetConstructedDataDerivativeConstantUnits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, units BACnetEngineeringUnitsTagged) *_BACnetConstructedDataDerivativeConstantUnits {
 	if units == nil {
 		panic("units of type BACnetEngineeringUnitsTagged for BACnetConstructedDataDerivativeConstantUnits must not be nil")
 	}
 	_result := &_BACnetConstructedDataDerivativeConstantUnits{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Units:                         units,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescription.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescription.go
index 840d91ad670..75177f365f9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescription.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescription.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDescription = (*_BACnetConstructedDataDescription)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDescription)(nil)
 
 // NewBACnetConstructedDataDescription factory function for _BACnetConstructedDataDescription
-func NewBACnetConstructedDataDescription(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, description BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDescription {
+func NewBACnetConstructedDataDescription(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, description BACnetApplicationTagCharacterString) *_BACnetConstructedDataDescription {
 	if description == nil {
 		panic("description of type BACnetApplicationTagCharacterString for BACnetConstructedDataDescription must not be nil")
 	}
 	_result := &_BACnetConstructedDataDescription{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Description:                   description,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescriptionOfHalt.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescriptionOfHalt.go
index c408e70755c..8bd1262cce7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescriptionOfHalt.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescriptionOfHalt.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDescriptionOfHalt = (*_BACnetConstructedDataDescripti
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDescriptionOfHalt)(nil)
 
 // NewBACnetConstructedDataDescriptionOfHalt factory function for _BACnetConstructedDataDescriptionOfHalt
-func NewBACnetConstructedDataDescriptionOfHalt(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, descriptionForHalt BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDescriptionOfHalt {
+func NewBACnetConstructedDataDescriptionOfHalt(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, descriptionForHalt BACnetApplicationTagCharacterString) *_BACnetConstructedDataDescriptionOfHalt {
 	if descriptionForHalt == nil {
 		panic("descriptionForHalt of type BACnetApplicationTagCharacterString for BACnetConstructedDataDescriptionOfHalt must not be nil")
 	}
 	_result := &_BACnetConstructedDataDescriptionOfHalt{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DescriptionForHalt:            descriptionForHalt,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAddressBinding.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAddressBinding.go
index 5a5f5ba26ed..360cbb1bf31 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAddressBinding.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAddressBinding.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataDeviceAddressBinding = (*_BACnetConstructedDataDevice
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDeviceAddressBinding)(nil)
 
 // NewBACnetConstructedDataDeviceAddressBinding factory function for _BACnetConstructedDataDeviceAddressBinding
-func NewBACnetConstructedDataDeviceAddressBinding(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, deviceAddressBinding []BACnetAddressBinding, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDeviceAddressBinding {
+func NewBACnetConstructedDataDeviceAddressBinding(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, deviceAddressBinding []BACnetAddressBinding) *_BACnetConstructedDataDeviceAddressBinding {
 	_result := &_BACnetConstructedDataDeviceAddressBinding{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DeviceAddressBinding:          deviceAddressBinding,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAll.go
index ff6576e1c8d..8e1ee0d750b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataDeviceAll = (*_BACnetConstructedDataDeviceAll)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDeviceAll)(nil)
 
 // NewBACnetConstructedDataDeviceAll factory function for _BACnetConstructedDataDeviceAll
-func NewBACnetConstructedDataDeviceAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDeviceAll {
+func NewBACnetConstructedDataDeviceAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataDeviceAll {
 	_result := &_BACnetConstructedDataDeviceAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxInfoFrames.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxInfoFrames.go
index 37b4357ec14..0b27127dab2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxInfoFrames.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxInfoFrames.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDeviceMaxInfoFrames = (*_BACnetConstructedDataDeviceM
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDeviceMaxInfoFrames)(nil)
 
 // NewBACnetConstructedDataDeviceMaxInfoFrames factory function for _BACnetConstructedDataDeviceMaxInfoFrames
-func NewBACnetConstructedDataDeviceMaxInfoFrames(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxInfoFrames BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDeviceMaxInfoFrames {
+func NewBACnetConstructedDataDeviceMaxInfoFrames(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxInfoFrames BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataDeviceMaxInfoFrames {
 	if maxInfoFrames == nil {
 		panic("maxInfoFrames of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataDeviceMaxInfoFrames must not be nil")
 	}
 	_result := &_BACnetConstructedDataDeviceMaxInfoFrames{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxInfoFrames:                 maxInfoFrames,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxMaster.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxMaster.go
index 8376c0572e7..5f6fec68412 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxMaster.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxMaster.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDeviceMaxMaster = (*_BACnetConstructedDataDeviceMaxMa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDeviceMaxMaster)(nil)
 
 // NewBACnetConstructedDataDeviceMaxMaster factory function for _BACnetConstructedDataDeviceMaxMaster
-func NewBACnetConstructedDataDeviceMaxMaster(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxMaster BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDeviceMaxMaster {
+func NewBACnetConstructedDataDeviceMaxMaster(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxMaster BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataDeviceMaxMaster {
 	if maxMaster == nil {
 		panic("maxMaster of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataDeviceMaxMaster must not be nil")
 	}
 	_result := &_BACnetConstructedDataDeviceMaxMaster{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxMaster:                     maxMaster,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceType.go
index ce1c00e26d3..4111fafe774 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceType.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDeviceType = (*_BACnetConstructedDataDeviceType)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDeviceType)(nil)
 
 // NewBACnetConstructedDataDeviceType factory function for _BACnetConstructedDataDeviceType
-func NewBACnetConstructedDataDeviceType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, deviceType BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDeviceType {
+func NewBACnetConstructedDataDeviceType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, deviceType BACnetApplicationTagCharacterString) *_BACnetConstructedDataDeviceType {
 	if deviceType == nil {
 		panic("deviceType of type BACnetApplicationTagCharacterString for BACnetConstructedDataDeviceType must not be nil")
 	}
 	_result := &_BACnetConstructedDataDeviceType{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DeviceType:                    deviceType,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDirectReading.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDirectReading.go
index 68e392fe4da..35409a41fb7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDirectReading.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDirectReading.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDirectReading = (*_BACnetConstructedDataDirectReading
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDirectReading)(nil)
 
 // NewBACnetConstructedDataDirectReading factory function for _BACnetConstructedDataDirectReading
-func NewBACnetConstructedDataDirectReading(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, directReading BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDirectReading {
+func NewBACnetConstructedDataDirectReading(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, directReading BACnetApplicationTagReal) *_BACnetConstructedDataDirectReading {
 	if directReading == nil {
 		panic("directReading of type BACnetApplicationTagReal for BACnetConstructedDataDirectReading must not be nil")
 	}
 	_result := &_BACnetConstructedDataDirectReading{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DirectReading:                 directReading,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDistributionKeyRevision.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDistributionKeyRevision.go
index 970ea01e74c..7d0bec8f138 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDistributionKeyRevision.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDistributionKeyRevision.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDistributionKeyRevision = (*_BACnetConstructedDataDis
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDistributionKeyRevision)(nil)
 
 // NewBACnetConstructedDataDistributionKeyRevision factory function for _BACnetConstructedDataDistributionKeyRevision
-func NewBACnetConstructedDataDistributionKeyRevision(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, distributionKeyRevision BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDistributionKeyRevision {
+func NewBACnetConstructedDataDistributionKeyRevision(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, distributionKeyRevision BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataDistributionKeyRevision {
 	if distributionKeyRevision == nil {
 		panic("distributionKeyRevision of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataDistributionKeyRevision must not be nil")
 	}
 	_result := &_BACnetConstructedDataDistributionKeyRevision{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DistributionKeyRevision:       distributionKeyRevision,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoNotHide.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoNotHide.go
index 5080b1d918f..4ad90d1c955 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoNotHide.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoNotHide.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDoNotHide = (*_BACnetConstructedDataDoNotHide)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDoNotHide)(nil)
 
 // NewBACnetConstructedDataDoNotHide factory function for _BACnetConstructedDataDoNotHide
-func NewBACnetConstructedDataDoNotHide(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doNotHide BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDoNotHide {
+func NewBACnetConstructedDataDoNotHide(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doNotHide BACnetApplicationTagBoolean) *_BACnetConstructedDataDoNotHide {
 	if doNotHide == nil {
 		panic("doNotHide of type BACnetApplicationTagBoolean for BACnetConstructedDataDoNotHide must not be nil")
 	}
 	_result := &_BACnetConstructedDataDoNotHide{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DoNotHide:                     doNotHide,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorAlarmState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorAlarmState.go
index 4143b86a161..bfeb02846b5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorAlarmState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorAlarmState.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDoorAlarmState = (*_BACnetConstructedDataDoorAlarmSta
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDoorAlarmState)(nil)
 
 // NewBACnetConstructedDataDoorAlarmState factory function for _BACnetConstructedDataDoorAlarmState
-func NewBACnetConstructedDataDoorAlarmState(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doorAlarmState BACnetDoorAlarmStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDoorAlarmState {
+func NewBACnetConstructedDataDoorAlarmState(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doorAlarmState BACnetDoorAlarmStateTagged) *_BACnetConstructedDataDoorAlarmState {
 	if doorAlarmState == nil {
 		panic("doorAlarmState of type BACnetDoorAlarmStateTagged for BACnetConstructedDataDoorAlarmState must not be nil")
 	}
 	_result := &_BACnetConstructedDataDoorAlarmState{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DoorAlarmState:                doorAlarmState,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorExtendedPulseTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorExtendedPulseTime.go
index ef33bc74c87..f76418667df 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorExtendedPulseTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorExtendedPulseTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDoorExtendedPulseTime = (*_BACnetConstructedDataDoorE
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDoorExtendedPulseTime)(nil)
 
 // NewBACnetConstructedDataDoorExtendedPulseTime factory function for _BACnetConstructedDataDoorExtendedPulseTime
-func NewBACnetConstructedDataDoorExtendedPulseTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doorExtendedPulseTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDoorExtendedPulseTime {
+func NewBACnetConstructedDataDoorExtendedPulseTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doorExtendedPulseTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataDoorExtendedPulseTime {
 	if doorExtendedPulseTime == nil {
 		panic("doorExtendedPulseTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataDoorExtendedPulseTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataDoorExtendedPulseTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DoorExtendedPulseTime:         doorExtendedPulseTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorMembers.go
index d9934ac4df9..d6bb5f88781 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorMembers.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataDoorMembers = (*_BACnetConstructedDataDoorMembers)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDoorMembers)(nil)
 
 // NewBACnetConstructedDataDoorMembers factory function for _BACnetConstructedDataDoorMembers
-func NewBACnetConstructedDataDoorMembers(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, doorMembers []BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDoorMembers {
+func NewBACnetConstructedDataDoorMembers(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, doorMembers []BACnetDeviceObjectReference) *_BACnetConstructedDataDoorMembers {
 	_result := &_BACnetConstructedDataDoorMembers{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		DoorMembers:                   doorMembers,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorOpenTooLongTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorOpenTooLongTime.go
index 791c1ede1ea..07361984c31 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorOpenTooLongTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorOpenTooLongTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDoorOpenTooLongTime = (*_BACnetConstructedDataDoorOpe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDoorOpenTooLongTime)(nil)
 
 // NewBACnetConstructedDataDoorOpenTooLongTime factory function for _BACnetConstructedDataDoorOpenTooLongTime
-func NewBACnetConstructedDataDoorOpenTooLongTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doorOpenTooLongTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDoorOpenTooLongTime {
+func NewBACnetConstructedDataDoorOpenTooLongTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doorOpenTooLongTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataDoorOpenTooLongTime {
 	if doorOpenTooLongTime == nil {
 		panic("doorOpenTooLongTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataDoorOpenTooLongTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataDoorOpenTooLongTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DoorOpenTooLongTime:           doorOpenTooLongTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorPulseTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorPulseTime.go
index e35cf4c55fe..a5cdc9fc117 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorPulseTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorPulseTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDoorPulseTime = (*_BACnetConstructedDataDoorPulseTime
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDoorPulseTime)(nil)
 
 // NewBACnetConstructedDataDoorPulseTime factory function for _BACnetConstructedDataDoorPulseTime
-func NewBACnetConstructedDataDoorPulseTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doorPulseTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDoorPulseTime {
+func NewBACnetConstructedDataDoorPulseTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doorPulseTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataDoorPulseTime {
 	if doorPulseTime == nil {
 		panic("doorPulseTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataDoorPulseTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataDoorPulseTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DoorPulseTime:                 doorPulseTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorStatus.go
index e46e1384507..8404f595cc8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorStatus.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDoorStatus = (*_BACnetConstructedDataDoorStatus)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDoorStatus)(nil)
 
 // NewBACnetConstructedDataDoorStatus factory function for _BACnetConstructedDataDoorStatus
-func NewBACnetConstructedDataDoorStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doorStatus BACnetDoorStatusTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDoorStatus {
+func NewBACnetConstructedDataDoorStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doorStatus BACnetDoorStatusTagged) *_BACnetConstructedDataDoorStatus {
 	if doorStatus == nil {
 		panic("doorStatus of type BACnetDoorStatusTagged for BACnetConstructedDataDoorStatus must not be nil")
 	}
 	_result := &_BACnetConstructedDataDoorStatus{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DoorStatus:                    doorStatus,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorUnlockDelayTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorUnlockDelayTime.go
index 4bc7c7fd6a4..e5378ea98d1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorUnlockDelayTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorUnlockDelayTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDoorUnlockDelayTime = (*_BACnetConstructedDataDoorUnl
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDoorUnlockDelayTime)(nil)
 
 // NewBACnetConstructedDataDoorUnlockDelayTime factory function for _BACnetConstructedDataDoorUnlockDelayTime
-func NewBACnetConstructedDataDoorUnlockDelayTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doorUnlockDelayTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDoorUnlockDelayTime {
+func NewBACnetConstructedDataDoorUnlockDelayTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doorUnlockDelayTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataDoorUnlockDelayTime {
 	if doorUnlockDelayTime == nil {
 		panic("doorUnlockDelayTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataDoorUnlockDelayTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataDoorUnlockDelayTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DoorUnlockDelayTime:           doorUnlockDelayTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDutyWindow.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDutyWindow.go
index 48420ad0f26..0ee6ea8e37f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDutyWindow.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDutyWindow.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataDutyWindow = (*_BACnetConstructedDataDutyWindow)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataDutyWindow)(nil)
 
 // NewBACnetConstructedDataDutyWindow factory function for _BACnetConstructedDataDutyWindow
-func NewBACnetConstructedDataDutyWindow(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, dutyWindow BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataDutyWindow {
+func NewBACnetConstructedDataDutyWindow(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, dutyWindow BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataDutyWindow {
 	if dutyWindow == nil {
 		panic("dutyWindow of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataDutyWindow must not be nil")
 	}
 	_result := &_BACnetConstructedDataDutyWindow{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DutyWindow:                    dutyWindow,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEffectivePeriod.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEffectivePeriod.go
index 0bcf7f84055..456333999a8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEffectivePeriod.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEffectivePeriod.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataEffectivePeriod = (*_BACnetConstructedDataEffectivePe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEffectivePeriod)(nil)
 
 // NewBACnetConstructedDataEffectivePeriod factory function for _BACnetConstructedDataEffectivePeriod
-func NewBACnetConstructedDataEffectivePeriod(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, dateRange BACnetDateRange, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEffectivePeriod {
+func NewBACnetConstructedDataEffectivePeriod(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, dateRange BACnetDateRange) *_BACnetConstructedDataEffectivePeriod {
 	if dateRange == nil {
 		panic("dateRange of type BACnetDateRange for BACnetConstructedDataEffectivePeriod must not be nil")
 	}
 	_result := &_BACnetConstructedDataEffectivePeriod{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DateRange:                     dateRange,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressActive.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressActive.go
index 33a1257a86b..46a03bc7917 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressActive.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressActive.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataEgressActive = (*_BACnetConstructedDataEgressActive)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEgressActive)(nil)
 
 // NewBACnetConstructedDataEgressActive factory function for _BACnetConstructedDataEgressActive
-func NewBACnetConstructedDataEgressActive(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, egressActive BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEgressActive {
+func NewBACnetConstructedDataEgressActive(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, egressActive BACnetApplicationTagBoolean) *_BACnetConstructedDataEgressActive {
 	if egressActive == nil {
 		panic("egressActive of type BACnetApplicationTagBoolean for BACnetConstructedDataEgressActive must not be nil")
 	}
 	_result := &_BACnetConstructedDataEgressActive{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		EgressActive:                  egressActive,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressTime.go
index 9e039427bef..85e1fbd778e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataEgressTime = (*_BACnetConstructedDataEgressTime)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEgressTime)(nil)
 
 // NewBACnetConstructedDataEgressTime factory function for _BACnetConstructedDataEgressTime
-func NewBACnetConstructedDataEgressTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, egressTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEgressTime {
+func NewBACnetConstructedDataEgressTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, egressTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataEgressTime {
 	if egressTime == nil {
 		panic("egressTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataEgressTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataEgressTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		EgressTime:                    egressTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElapsedActiveTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElapsedActiveTime.go
index 0d7a649f1e5..fffe338821f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElapsedActiveTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElapsedActiveTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataElapsedActiveTime = (*_BACnetConstructedDataElapsedAc
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataElapsedActiveTime)(nil)
 
 // NewBACnetConstructedDataElapsedActiveTime factory function for _BACnetConstructedDataElapsedActiveTime
-func NewBACnetConstructedDataElapsedActiveTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, elapsedActiveTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataElapsedActiveTime {
+func NewBACnetConstructedDataElapsedActiveTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, elapsedActiveTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataElapsedActiveTime {
 	if elapsedActiveTime == nil {
 		panic("elapsedActiveTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataElapsedActiveTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataElapsedActiveTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ElapsedActiveTime:             elapsedActiveTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go
index 5f9f4c2d3e4..69083943874 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go
@@ -68,21 +68,16 @@ type _BACnetConstructedDataElement struct {
 	ApplicationTag  BACnetApplicationTag
 	ContextTag      BACnetContextTag
 	ConstructedData BACnetConstructedData
-
-	// Arguments.
-	ObjectTypeArgument         BACnetObjectType
-	PropertyIdentifierArgument BACnetPropertyIdentifier
-	ArrayIndexArgument         BACnetTagPayloadUnsignedInteger
 }
 
 var _ BACnetConstructedDataElement = (*_BACnetConstructedDataElement)(nil)
 
 // NewBACnetConstructedDataElement factory function for _BACnetConstructedDataElement
-func NewBACnetConstructedDataElement(peekedTagHeader BACnetTagHeader, applicationTag BACnetApplicationTag, contextTag BACnetContextTag, constructedData BACnetConstructedData, objectTypeArgument BACnetObjectType, propertyIdentifierArgument BACnetPropertyIdentifier, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataElement {
+func NewBACnetConstructedDataElement(peekedTagHeader BACnetTagHeader, applicationTag BACnetApplicationTag, contextTag BACnetContextTag, constructedData BACnetConstructedData) *_BACnetConstructedDataElement {
 	if peekedTagHeader == nil {
 		panic("peekedTagHeader of type BACnetTagHeader for BACnetConstructedDataElement must not be nil")
 	}
-	return &_BACnetConstructedDataElement{PeekedTagHeader: peekedTagHeader, ApplicationTag: applicationTag, ContextTag: contextTag, ConstructedData: constructedData, ObjectTypeArgument: objectTypeArgument, PropertyIdentifierArgument: propertyIdentifierArgument, ArrayIndexArgument: arrayIndexArgument}
+	return &_BACnetConstructedDataElement{PeekedTagHeader: peekedTagHeader, ApplicationTag: applicationTag, ContextTag: contextTag, ConstructedData: constructedData}
 }
 
 ///////////////////////////////////////////////////////////
@@ -111,12 +106,6 @@ type BACnetConstructedDataElementBuilder interface {
 	WithOptionalConstructedData(BACnetConstructedData) BACnetConstructedDataElementBuilder
 	// WithOptionalConstructedDataBuilder adds ConstructedData (property field) which is build by the builder
 	WithOptionalConstructedDataBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetConstructedDataElementBuilder
-	// WithArgObjectTypeArgument sets a parser argument
-	WithArgObjectTypeArgument(BACnetObjectType) BACnetConstructedDataElementBuilder
-	// WithArgPropertyIdentifierArgument sets a parser argument
-	WithArgPropertyIdentifierArgument(BACnetPropertyIdentifier) BACnetConstructedDataElementBuilder
-	// WithArgArrayIndexArgument sets a parser argument
-	WithArgArrayIndexArgument(BACnetTagPayloadUnsignedInteger) BACnetConstructedDataElementBuilder
 	// Build builds the BACnetConstructedDataElement or returns an error if something is wrong
 	Build() (BACnetConstructedDataElement, error)
 	// MustBuild does the same as Build but panics on error
@@ -200,19 +189,6 @@ func (b *_BACnetConstructedDataElementBuilder) WithOptionalConstructedDataBuilde
 	return b
 }
 
-func (b *_BACnetConstructedDataElementBuilder) WithArgObjectTypeArgument(objectTypeArgument BACnetObjectType) BACnetConstructedDataElementBuilder {
-	b.ObjectTypeArgument = objectTypeArgument
-	return b
-}
-func (b *_BACnetConstructedDataElementBuilder) WithArgPropertyIdentifierArgument(propertyIdentifierArgument BACnetPropertyIdentifier) BACnetConstructedDataElementBuilder {
-	b.PropertyIdentifierArgument = propertyIdentifierArgument
-	return b
-}
-func (b *_BACnetConstructedDataElementBuilder) WithArgArrayIndexArgument(arrayIndexArgument BACnetTagPayloadUnsignedInteger) BACnetConstructedDataElementBuilder {
-	b.ArrayIndexArgument = arrayIndexArgument
-	return b
-}
-
 func (b *_BACnetConstructedDataElementBuilder) Build() (BACnetConstructedDataElement, error) {
 	if b.PeekedTagHeader == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'peekedTagHeader' not set"))
@@ -394,7 +370,7 @@ func BACnetConstructedDataElementParseWithBufferProducer(objectTypeArgument BACn
 }
 
 func BACnetConstructedDataElementParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, objectTypeArgument BACnetObjectType, propertyIdentifierArgument BACnetPropertyIdentifier, arrayIndexArgument BACnetTagPayloadUnsignedInteger) (BACnetConstructedDataElement, error) {
-	v, err := (&_BACnetConstructedDataElement{ObjectTypeArgument: objectTypeArgument, PropertyIdentifierArgument: propertyIdentifierArgument, ArrayIndexArgument: arrayIndexArgument}).parse(ctx, readBuffer, objectTypeArgument, propertyIdentifierArgument, arrayIndexArgument)
+	v, err := (new(_BACnetConstructedDataElement)).parse(ctx, readBuffer, objectTypeArgument, propertyIdentifierArgument, arrayIndexArgument)
 	if err != nil {
 		return nil, err
 	}
@@ -546,22 +522,6 @@ func (m *_BACnetConstructedDataElement) SerializeWithWriteBuffer(ctx context.Con
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetConstructedDataElement) GetObjectTypeArgument() BACnetObjectType {
-	return m.ObjectTypeArgument
-}
-func (m *_BACnetConstructedDataElement) GetPropertyIdentifierArgument() BACnetPropertyIdentifier {
-	return m.PropertyIdentifierArgument
-}
-func (m *_BACnetConstructedDataElement) GetArrayIndexArgument() BACnetTagPayloadUnsignedInteger {
-	return m.ArrayIndexArgument
-}
-
-//
-////
-
 func (m *_BACnetConstructedDataElement) IsBACnetConstructedDataElement() {}
 
 func (m *_BACnetConstructedDataElement) DeepCopy() any {
@@ -577,9 +537,6 @@ func (m *_BACnetConstructedDataElement) deepCopy() *_BACnetConstructedDataElemen
 		utils.DeepCopy[BACnetApplicationTag](m.ApplicationTag),
 		utils.DeepCopy[BACnetContextTag](m.ContextTag),
 		utils.DeepCopy[BACnetConstructedData](m.ConstructedData),
-		m.ObjectTypeArgument,
-		m.PropertyIdentifierArgument,
-		m.ArrayIndexArgument,
 	}
 	return _BACnetConstructedDataElementCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroup.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroup.go
index 21452e9367e..a4e363b44af 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroup.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroup.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataElevatorGroup = (*_BACnetConstructedDataElevatorGroup
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataElevatorGroup)(nil)
 
 // NewBACnetConstructedDataElevatorGroup factory function for _BACnetConstructedDataElevatorGroup
-func NewBACnetConstructedDataElevatorGroup(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, elevatorGroup BACnetApplicationTagObjectIdentifier, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataElevatorGroup {
+func NewBACnetConstructedDataElevatorGroup(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, elevatorGroup BACnetApplicationTagObjectIdentifier) *_BACnetConstructedDataElevatorGroup {
 	if elevatorGroup == nil {
 		panic("elevatorGroup of type BACnetApplicationTagObjectIdentifier for BACnetConstructedDataElevatorGroup must not be nil")
 	}
 	_result := &_BACnetConstructedDataElevatorGroup{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ElevatorGroup:                 elevatorGroup,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupAll.go
index 24223097ca9..94cb8440b53 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataElevatorGroupAll = (*_BACnetConstructedDataElevatorGr
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataElevatorGroupAll)(nil)
 
 // NewBACnetConstructedDataElevatorGroupAll factory function for _BACnetConstructedDataElevatorGroupAll
-func NewBACnetConstructedDataElevatorGroupAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataElevatorGroupAll {
+func NewBACnetConstructedDataElevatorGroupAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataElevatorGroupAll {
 	_result := &_BACnetConstructedDataElevatorGroupAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupGroupMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupGroupMembers.go
index cbbc208fd11..36d3800e811 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupGroupMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupGroupMembers.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataElevatorGroupGroupMembers = (*_BACnetConstructedDataE
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataElevatorGroupGroupMembers)(nil)
 
 // NewBACnetConstructedDataElevatorGroupGroupMembers factory function for _BACnetConstructedDataElevatorGroupGroupMembers
-func NewBACnetConstructedDataElevatorGroupGroupMembers(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, groupMembers []BACnetApplicationTagObjectIdentifier, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataElevatorGroupGroupMembers {
+func NewBACnetConstructedDataElevatorGroupGroupMembers(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, groupMembers []BACnetApplicationTagObjectIdentifier) *_BACnetConstructedDataElevatorGroupGroupMembers {
 	_result := &_BACnetConstructedDataElevatorGroupGroupMembers{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		GroupMembers:                  groupMembers,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnable.go
index e1ed30ad5e2..28a649ec61b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnable.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataEnable = (*_BACnetConstructedDataEnable)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEnable)(nil)
 
 // NewBACnetConstructedDataEnable factory function for _BACnetConstructedDataEnable
-func NewBACnetConstructedDataEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, enable BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEnable {
+func NewBACnetConstructedDataEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, enable BACnetApplicationTagBoolean) *_BACnetConstructedDataEnable {
 	if enable == nil {
 		panic("enable of type BACnetApplicationTagBoolean for BACnetConstructedDataEnable must not be nil")
 	}
 	_result := &_BACnetConstructedDataEnable{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Enable:                        enable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeter.go
index ac51b5e9c08..d3786585d6e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeter.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataEnergyMeter = (*_BACnetConstructedDataEnergyMeter)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEnergyMeter)(nil)
 
 // NewBACnetConstructedDataEnergyMeter factory function for _BACnetConstructedDataEnergyMeter
-func NewBACnetConstructedDataEnergyMeter(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, energyMeter BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEnergyMeter {
+func NewBACnetConstructedDataEnergyMeter(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, energyMeter BACnetApplicationTagReal) *_BACnetConstructedDataEnergyMeter {
 	if energyMeter == nil {
 		panic("energyMeter of type BACnetApplicationTagReal for BACnetConstructedDataEnergyMeter must not be nil")
 	}
 	_result := &_BACnetConstructedDataEnergyMeter{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		EnergyMeter:                   energyMeter,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeterRef.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeterRef.go
index 677521ba54f..3a2b0f77064 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeterRef.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeterRef.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataEnergyMeterRef = (*_BACnetConstructedDataEnergyMeterR
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEnergyMeterRef)(nil)
 
 // NewBACnetConstructedDataEnergyMeterRef factory function for _BACnetConstructedDataEnergyMeterRef
-func NewBACnetConstructedDataEnergyMeterRef(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, energyMeterRef BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEnergyMeterRef {
+func NewBACnetConstructedDataEnergyMeterRef(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, energyMeterRef BACnetDeviceObjectReference) *_BACnetConstructedDataEnergyMeterRef {
 	if energyMeterRef == nil {
 		panic("energyMeterRef of type BACnetDeviceObjectReference for BACnetConstructedDataEnergyMeterRef must not be nil")
 	}
 	_result := &_BACnetConstructedDataEnergyMeterRef{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		EnergyMeterRef:                energyMeterRef,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEntryPoints.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEntryPoints.go
index c82427de5a3..16af6a3584a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEntryPoints.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEntryPoints.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataEntryPoints = (*_BACnetConstructedDataEntryPoints)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEntryPoints)(nil)
 
 // NewBACnetConstructedDataEntryPoints factory function for _BACnetConstructedDataEntryPoints
-func NewBACnetConstructedDataEntryPoints(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, entryPoints []BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEntryPoints {
+func NewBACnetConstructedDataEntryPoints(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, entryPoints []BACnetDeviceObjectReference) *_BACnetConstructedDataEntryPoints {
 	_result := &_BACnetConstructedDataEntryPoints{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		EntryPoints:                   entryPoints,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataErrorLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataErrorLimit.go
index c035d04aee0..1745fb5d1b9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataErrorLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataErrorLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataErrorLimit = (*_BACnetConstructedDataErrorLimit)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataErrorLimit)(nil)
 
 // NewBACnetConstructedDataErrorLimit factory function for _BACnetConstructedDataErrorLimit
-func NewBACnetConstructedDataErrorLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, errorLimit BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataErrorLimit {
+func NewBACnetConstructedDataErrorLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, errorLimit BACnetApplicationTagReal) *_BACnetConstructedDataErrorLimit {
 	if errorLimit == nil {
 		panic("errorLimit of type BACnetApplicationTagReal for BACnetConstructedDataErrorLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataErrorLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ErrorLimit:                    errorLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorAll.go
index 3e063f4f564..a123aed9864 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataEscalatorAll = (*_BACnetConstructedDataEscalatorAll)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEscalatorAll)(nil)
 
 // NewBACnetConstructedDataEscalatorAll factory function for _BACnetConstructedDataEscalatorAll
-func NewBACnetConstructedDataEscalatorAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEscalatorAll {
+func NewBACnetConstructedDataEscalatorAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataEscalatorAll {
 	_result := &_BACnetConstructedDataEscalatorAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorFaultSignals.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorFaultSignals.go
index 004bc0e42e6..b3b1ada5e49 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorFaultSignals.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorFaultSignals.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataEscalatorFaultSignals = (*_BACnetConstructedDataEscal
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEscalatorFaultSignals)(nil)
 
 // NewBACnetConstructedDataEscalatorFaultSignals factory function for _BACnetConstructedDataEscalatorFaultSignals
-func NewBACnetConstructedDataEscalatorFaultSignals(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultSignals []BACnetEscalatorFaultTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEscalatorFaultSignals {
+func NewBACnetConstructedDataEscalatorFaultSignals(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultSignals []BACnetEscalatorFaultTagged) *_BACnetConstructedDataEscalatorFaultSignals {
 	_result := &_BACnetConstructedDataEscalatorFaultSignals{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultSignals:                  faultSignals,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorMode.go
index c3467c2d463..31dcfce1db4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorMode.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataEscalatorMode = (*_BACnetConstructedDataEscalatorMode
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEscalatorMode)(nil)
 
 // NewBACnetConstructedDataEscalatorMode factory function for _BACnetConstructedDataEscalatorMode
-func NewBACnetConstructedDataEscalatorMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, escalatorMode BACnetEscalatorModeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEscalatorMode {
+func NewBACnetConstructedDataEscalatorMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, escalatorMode BACnetEscalatorModeTagged) *_BACnetConstructedDataEscalatorMode {
 	if escalatorMode == nil {
 		panic("escalatorMode of type BACnetEscalatorModeTagged for BACnetConstructedDataEscalatorMode must not be nil")
 	}
 	_result := &_BACnetConstructedDataEscalatorMode{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		EscalatorMode:                 escalatorMode,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibit.go
index e33488a218c..cf7027e0cde 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataEventAlgorithmInhibit = (*_BACnetConstructedDataEvent
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEventAlgorithmInhibit)(nil)
 
 // NewBACnetConstructedDataEventAlgorithmInhibit factory function for _BACnetConstructedDataEventAlgorithmInhibit
-func NewBACnetConstructedDataEventAlgorithmInhibit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, eventAlgorithmInhibit BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEventAlgorithmInhibit {
+func NewBACnetConstructedDataEventAlgorithmInhibit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, eventAlgorithmInhibit BACnetApplicationTagBoolean) *_BACnetConstructedDataEventAlgorithmInhibit {
 	if eventAlgorithmInhibit == nil {
 		panic("eventAlgorithmInhibit of type BACnetApplicationTagBoolean for BACnetConstructedDataEventAlgorithmInhibit must not be nil")
 	}
 	_result := &_BACnetConstructedDataEventAlgorithmInhibit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		EventAlgorithmInhibit:         eventAlgorithmInhibit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibitRef.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibitRef.go
index 0a2dea24fda..5660b38715c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibitRef.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibitRef.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataEventAlgorithmInhibitRef = (*_BACnetConstructedDataEv
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEventAlgorithmInhibitRef)(nil)
 
 // NewBACnetConstructedDataEventAlgorithmInhibitRef factory function for _BACnetConstructedDataEventAlgorithmInhibitRef
-func NewBACnetConstructedDataEventAlgorithmInhibitRef(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, eventAlgorithmInhibitRef BACnetObjectPropertyReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEventAlgorithmInhibitRef {
+func NewBACnetConstructedDataEventAlgorithmInhibitRef(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, eventAlgorithmInhibitRef BACnetObjectPropertyReference) *_BACnetConstructedDataEventAlgorithmInhibitRef {
 	if eventAlgorithmInhibitRef == nil {
 		panic("eventAlgorithmInhibitRef of type BACnetObjectPropertyReference for BACnetConstructedDataEventAlgorithmInhibitRef must not be nil")
 	}
 	_result := &_BACnetConstructedDataEventAlgorithmInhibitRef{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		EventAlgorithmInhibitRef:      eventAlgorithmInhibitRef,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventDetectionEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventDetectionEnable.go
index 826a9e05515..baa44677b27 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventDetectionEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventDetectionEnable.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataEventDetectionEnable = (*_BACnetConstructedDataEventD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEventDetectionEnable)(nil)
 
 // NewBACnetConstructedDataEventDetectionEnable factory function for _BACnetConstructedDataEventDetectionEnable
-func NewBACnetConstructedDataEventDetectionEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, eventDetectionEnable BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEventDetectionEnable {
+func NewBACnetConstructedDataEventDetectionEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, eventDetectionEnable BACnetApplicationTagBoolean) *_BACnetConstructedDataEventDetectionEnable {
 	if eventDetectionEnable == nil {
 		panic("eventDetectionEnable of type BACnetApplicationTagBoolean for BACnetConstructedDataEventDetectionEnable must not be nil")
 	}
 	_result := &_BACnetConstructedDataEventDetectionEnable{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		EventDetectionEnable:          eventDetectionEnable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnable.go
index cc2ed53a6e2..c99bbb78f16 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnable.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataEventEnable = (*_BACnetConstructedDataEventEnable)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEventEnable)(nil)
 
 // NewBACnetConstructedDataEventEnable factory function for _BACnetConstructedDataEventEnable
-func NewBACnetConstructedDataEventEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, eventEnable BACnetEventTransitionBitsTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEventEnable {
+func NewBACnetConstructedDataEventEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, eventEnable BACnetEventTransitionBitsTagged) *_BACnetConstructedDataEventEnable {
 	if eventEnable == nil {
 		panic("eventEnable of type BACnetEventTransitionBitsTagged for BACnetConstructedDataEventEnable must not be nil")
 	}
 	_result := &_BACnetConstructedDataEventEnable{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		EventEnable:                   eventEnable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnrollmentAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnrollmentAll.go
index 1daca79bb7e..f27d49fd209 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnrollmentAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnrollmentAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataEventEnrollmentAll = (*_BACnetConstructedDataEventEnr
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEventEnrollmentAll)(nil)
 
 // NewBACnetConstructedDataEventEnrollmentAll factory function for _BACnetConstructedDataEventEnrollmentAll
-func NewBACnetConstructedDataEventEnrollmentAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEventEnrollmentAll {
+func NewBACnetConstructedDataEventEnrollmentAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataEventEnrollmentAll {
 	_result := &_BACnetConstructedDataEventEnrollmentAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogAll.go
index fed023a828c..2d19cadd41b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataEventLogAll = (*_BACnetConstructedDataEventLogAll)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEventLogAll)(nil)
 
 // NewBACnetConstructedDataEventLogAll factory function for _BACnetConstructedDataEventLogAll
-func NewBACnetConstructedDataEventLogAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEventLogAll {
+func NewBACnetConstructedDataEventLogAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataEventLogAll {
 	_result := &_BACnetConstructedDataEventLogAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogLogBuffer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogLogBuffer.go
index dc1f566f989..66addaa7456 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogLogBuffer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogLogBuffer.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataEventLogLogBuffer = (*_BACnetConstructedDataEventLogL
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEventLogLogBuffer)(nil)
 
 // NewBACnetConstructedDataEventLogLogBuffer factory function for _BACnetConstructedDataEventLogLogBuffer
-func NewBACnetConstructedDataEventLogLogBuffer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, floorText []BACnetEventLogRecord, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEventLogLogBuffer {
+func NewBACnetConstructedDataEventLogLogBuffer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, floorText []BACnetEventLogRecord) *_BACnetConstructedDataEventLogLogBuffer {
 	_result := &_BACnetConstructedDataEventLogLogBuffer{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FloorText:                     floorText,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTexts.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTexts.go
index 8402c0ef53e..133a01b3d9d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTexts.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTexts.go
@@ -70,9 +70,9 @@ var _ BACnetConstructedDataEventMessageTexts = (*_BACnetConstructedDataEventMess
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEventMessageTexts)(nil)
 
 // NewBACnetConstructedDataEventMessageTexts factory function for _BACnetConstructedDataEventMessageTexts
-func NewBACnetConstructedDataEventMessageTexts(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, eventMessageTexts []BACnetOptionalCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEventMessageTexts {
+func NewBACnetConstructedDataEventMessageTexts(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, eventMessageTexts []BACnetOptionalCharacterString) *_BACnetConstructedDataEventMessageTexts {
 	_result := &_BACnetConstructedDataEventMessageTexts{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		EventMessageTexts:             eventMessageTexts,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTextsConfig.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTextsConfig.go
index 31224d5c193..a55e15765a7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTextsConfig.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTextsConfig.go
@@ -70,9 +70,9 @@ var _ BACnetConstructedDataEventMessageTextsConfig = (*_BACnetConstructedDataEve
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEventMessageTextsConfig)(nil)
 
 // NewBACnetConstructedDataEventMessageTextsConfig factory function for _BACnetConstructedDataEventMessageTextsConfig
-func NewBACnetConstructedDataEventMessageTextsConfig(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, eventMessageTextsConfig []BACnetOptionalCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEventMessageTextsConfig {
+func NewBACnetConstructedDataEventMessageTextsConfig(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, eventMessageTextsConfig []BACnetOptionalCharacterString) *_BACnetConstructedDataEventMessageTextsConfig {
 	_result := &_BACnetConstructedDataEventMessageTextsConfig{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		EventMessageTextsConfig:       eventMessageTextsConfig,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventParameters.go
index d67fbf238b9..29f13209fba 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventParameters.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataEventParameters = (*_BACnetConstructedDataEventParame
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEventParameters)(nil)
 
 // NewBACnetConstructedDataEventParameters factory function for _BACnetConstructedDataEventParameters
-func NewBACnetConstructedDataEventParameters(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, eventParameter BACnetEventParameter, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEventParameters {
+func NewBACnetConstructedDataEventParameters(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, eventParameter BACnetEventParameter) *_BACnetConstructedDataEventParameters {
 	if eventParameter == nil {
 		panic("eventParameter of type BACnetEventParameter for BACnetConstructedDataEventParameters must not be nil")
 	}
 	_result := &_BACnetConstructedDataEventParameters{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		EventParameter:                eventParameter,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventState.go
index 51e8e86f7c5..79f8cee1142 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventState.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataEventState = (*_BACnetConstructedDataEventState)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEventState)(nil)
 
 // NewBACnetConstructedDataEventState factory function for _BACnetConstructedDataEventState
-func NewBACnetConstructedDataEventState(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, eventState BACnetEventStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEventState {
+func NewBACnetConstructedDataEventState(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, eventState BACnetEventStateTagged) *_BACnetConstructedDataEventState {
 	if eventState == nil {
 		panic("eventState of type BACnetEventStateTagged for BACnetConstructedDataEventState must not be nil")
 	}
 	_result := &_BACnetConstructedDataEventState{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		EventState:                    eventState,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventTimeStamps.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventTimeStamps.go
index da952932755..0718d3c9015 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventTimeStamps.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventTimeStamps.go
@@ -70,9 +70,9 @@ var _ BACnetConstructedDataEventTimeStamps = (*_BACnetConstructedDataEventTimeSt
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEventTimeStamps)(nil)
 
 // NewBACnetConstructedDataEventTimeStamps factory function for _BACnetConstructedDataEventTimeStamps
-func NewBACnetConstructedDataEventTimeStamps(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, eventTimeStamps []BACnetTimeStamp, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEventTimeStamps {
+func NewBACnetConstructedDataEventTimeStamps(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, eventTimeStamps []BACnetTimeStamp) *_BACnetConstructedDataEventTimeStamps {
 	_result := &_BACnetConstructedDataEventTimeStamps{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		EventTimeStamps:               eventTimeStamps,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventType.go
index 2705c92f1fb..a1f54ac2079 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventType.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataEventType = (*_BACnetConstructedDataEventType)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataEventType)(nil)
 
 // NewBACnetConstructedDataEventType factory function for _BACnetConstructedDataEventType
-func NewBACnetConstructedDataEventType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, eventType BACnetEventTypeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataEventType {
+func NewBACnetConstructedDataEventType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, eventType BACnetEventTypeTagged) *_BACnetConstructedDataEventType {
 	if eventType == nil {
 		panic("eventType of type BACnetEventTypeTagged for BACnetConstructedDataEventType must not be nil")
 	}
 	_result := &_BACnetConstructedDataEventType{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		EventType:                     eventType,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExceptionSchedule.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExceptionSchedule.go
index 93f0f57c419..9685d92d882 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExceptionSchedule.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExceptionSchedule.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataExceptionSchedule = (*_BACnetConstructedDataException
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataExceptionSchedule)(nil)
 
 // NewBACnetConstructedDataExceptionSchedule factory function for _BACnetConstructedDataExceptionSchedule
-func NewBACnetConstructedDataExceptionSchedule(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, exceptionSchedule []BACnetSpecialEvent, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataExceptionSchedule {
+func NewBACnetConstructedDataExceptionSchedule(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, exceptionSchedule []BACnetSpecialEvent) *_BACnetConstructedDataExceptionSchedule {
 	_result := &_BACnetConstructedDataExceptionSchedule{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		ExceptionSchedule:             exceptionSchedule,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExecutionDelay.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExecutionDelay.go
index 4c038c62e10..5fc21cb6589 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExecutionDelay.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExecutionDelay.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataExecutionDelay = (*_BACnetConstructedDataExecutionDel
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataExecutionDelay)(nil)
 
 // NewBACnetConstructedDataExecutionDelay factory function for _BACnetConstructedDataExecutionDelay
-func NewBACnetConstructedDataExecutionDelay(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, executionDelay []BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataExecutionDelay {
+func NewBACnetConstructedDataExecutionDelay(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, executionDelay []BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataExecutionDelay {
 	_result := &_BACnetConstructedDataExecutionDelay{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		ExecutionDelay:                executionDelay,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExitPoints.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExitPoints.go
index 66375b8d769..3b1ddeeb54c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExitPoints.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExitPoints.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataExitPoints = (*_BACnetConstructedDataExitPoints)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataExitPoints)(nil)
 
 // NewBACnetConstructedDataExitPoints factory function for _BACnetConstructedDataExitPoints
-func NewBACnetConstructedDataExitPoints(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, exitPoints []BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataExitPoints {
+func NewBACnetConstructedDataExitPoints(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, exitPoints []BACnetDeviceObjectReference) *_BACnetConstructedDataExitPoints {
 	_result := &_BACnetConstructedDataExitPoints{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ExitPoints:                    exitPoints,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpectedShedLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpectedShedLevel.go
index 228899151a9..26c92cf8968 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpectedShedLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpectedShedLevel.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataExpectedShedLevel = (*_BACnetConstructedDataExpectedS
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataExpectedShedLevel)(nil)
 
 // NewBACnetConstructedDataExpectedShedLevel factory function for _BACnetConstructedDataExpectedShedLevel
-func NewBACnetConstructedDataExpectedShedLevel(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, expectedShedLevel BACnetShedLevel, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataExpectedShedLevel {
+func NewBACnetConstructedDataExpectedShedLevel(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, expectedShedLevel BACnetShedLevel) *_BACnetConstructedDataExpectedShedLevel {
 	if expectedShedLevel == nil {
 		panic("expectedShedLevel of type BACnetShedLevel for BACnetConstructedDataExpectedShedLevel must not be nil")
 	}
 	_result := &_BACnetConstructedDataExpectedShedLevel{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ExpectedShedLevel:             expectedShedLevel,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpirationTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpirationTime.go
index ab5cdd9043c..6edf609d120 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpirationTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpirationTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataExpirationTime = (*_BACnetConstructedDataExpirationTi
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataExpirationTime)(nil)
 
 // NewBACnetConstructedDataExpirationTime factory function for _BACnetConstructedDataExpirationTime
-func NewBACnetConstructedDataExpirationTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, expirationTime BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataExpirationTime {
+func NewBACnetConstructedDataExpirationTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, expirationTime BACnetDateTime) *_BACnetConstructedDataExpirationTime {
 	if expirationTime == nil {
 		panic("expirationTime of type BACnetDateTime for BACnetConstructedDataExpirationTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataExpirationTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ExpirationTime:                expirationTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExtendedTimeEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExtendedTimeEnable.go
index 50baf20e750..3f0929d7245 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExtendedTimeEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExtendedTimeEnable.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataExtendedTimeEnable = (*_BACnetConstructedDataExtended
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataExtendedTimeEnable)(nil)
 
 // NewBACnetConstructedDataExtendedTimeEnable factory function for _BACnetConstructedDataExtendedTimeEnable
-func NewBACnetConstructedDataExtendedTimeEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, extendedTimeEnable BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataExtendedTimeEnable {
+func NewBACnetConstructedDataExtendedTimeEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, extendedTimeEnable BACnetApplicationTagBoolean) *_BACnetConstructedDataExtendedTimeEnable {
 	if extendedTimeEnable == nil {
 		panic("extendedTimeEnable of type BACnetApplicationTagBoolean for BACnetConstructedDataExtendedTimeEnable must not be nil")
 	}
 	_result := &_BACnetConstructedDataExtendedTimeEnable{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ExtendedTimeEnable:            extendedTimeEnable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDBBMDAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDBBMDAddress.go
index 81bfd14895f..4e828da8ecb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDBBMDAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDBBMDAddress.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataFDBBMDAddress = (*_BACnetConstructedDataFDBBMDAddress
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFDBBMDAddress)(nil)
 
 // NewBACnetConstructedDataFDBBMDAddress factory function for _BACnetConstructedDataFDBBMDAddress
-func NewBACnetConstructedDataFDBBMDAddress(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, fDBBMDAddress BACnetHostNPort, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFDBBMDAddress {
+func NewBACnetConstructedDataFDBBMDAddress(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, fDBBMDAddress BACnetHostNPort) *_BACnetConstructedDataFDBBMDAddress {
 	if fDBBMDAddress == nil {
 		panic("fDBBMDAddress of type BACnetHostNPort for BACnetConstructedDataFDBBMDAddress must not be nil")
 	}
 	_result := &_BACnetConstructedDataFDBBMDAddress{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FDBBMDAddress:                 fDBBMDAddress,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDSubscriptionLifetime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDSubscriptionLifetime.go
index 35acec80082..851867b82c1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDSubscriptionLifetime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDSubscriptionLifetime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataFDSubscriptionLifetime = (*_BACnetConstructedDataFDSu
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFDSubscriptionLifetime)(nil)
 
 // NewBACnetConstructedDataFDSubscriptionLifetime factory function for _BACnetConstructedDataFDSubscriptionLifetime
-func NewBACnetConstructedDataFDSubscriptionLifetime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, fdSubscriptionLifetime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFDSubscriptionLifetime {
+func NewBACnetConstructedDataFDSubscriptionLifetime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, fdSubscriptionLifetime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataFDSubscriptionLifetime {
 	if fdSubscriptionLifetime == nil {
 		panic("fdSubscriptionLifetime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataFDSubscriptionLifetime must not be nil")
 	}
 	_result := &_BACnetConstructedDataFDSubscriptionLifetime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FdSubscriptionLifetime:        fdSubscriptionLifetime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptEvents.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptEvents.go
index 1f3d249fd6e..96d895dc849 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptEvents.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptEvents.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataFailedAttemptEvents = (*_BACnetConstructedDataFailedA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFailedAttemptEvents)(nil)
 
 // NewBACnetConstructedDataFailedAttemptEvents factory function for _BACnetConstructedDataFailedAttemptEvents
-func NewBACnetConstructedDataFailedAttemptEvents(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, failedAttemptEvents []BACnetAccessEventTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFailedAttemptEvents {
+func NewBACnetConstructedDataFailedAttemptEvents(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, failedAttemptEvents []BACnetAccessEventTagged) *_BACnetConstructedDataFailedAttemptEvents {
 	_result := &_BACnetConstructedDataFailedAttemptEvents{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FailedAttemptEvents:           failedAttemptEvents,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttempts.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttempts.go
index 7fad87f7786..d3a264fce13 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttempts.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttempts.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataFailedAttempts = (*_BACnetConstructedDataFailedAttemp
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFailedAttempts)(nil)
 
 // NewBACnetConstructedDataFailedAttempts factory function for _BACnetConstructedDataFailedAttempts
-func NewBACnetConstructedDataFailedAttempts(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, failedAttempts BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFailedAttempts {
+func NewBACnetConstructedDataFailedAttempts(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, failedAttempts BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataFailedAttempts {
 	if failedAttempts == nil {
 		panic("failedAttempts of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataFailedAttempts must not be nil")
 	}
 	_result := &_BACnetConstructedDataFailedAttempts{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FailedAttempts:                failedAttempts,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptsTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptsTime.go
index 47a495c27c1..7eed11cda7d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptsTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptsTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataFailedAttemptsTime = (*_BACnetConstructedDataFailedAt
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFailedAttemptsTime)(nil)
 
 // NewBACnetConstructedDataFailedAttemptsTime factory function for _BACnetConstructedDataFailedAttemptsTime
-func NewBACnetConstructedDataFailedAttemptsTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, failedAttemptsTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFailedAttemptsTime {
+func NewBACnetConstructedDataFailedAttemptsTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, failedAttemptsTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataFailedAttemptsTime {
 	if failedAttemptsTime == nil {
 		panic("failedAttemptsTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataFailedAttemptsTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataFailedAttemptsTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FailedAttemptsTime:            failedAttemptsTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultHighLimit.go
index 8f4372a6567..6de963ee985 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultHighLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataFaultHighLimit = (*_BACnetConstructedDataFaultHighLim
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFaultHighLimit)(nil)
 
 // NewBACnetConstructedDataFaultHighLimit factory function for _BACnetConstructedDataFaultHighLimit
-func NewBACnetConstructedDataFaultHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultHighLimit BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFaultHighLimit {
+func NewBACnetConstructedDataFaultHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultHighLimit BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataFaultHighLimit {
 	if faultHighLimit == nil {
 		panic("faultHighLimit of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataFaultHighLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataFaultHighLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultHighLimit:                faultHighLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultLowLimit.go
index 635c25d6530..525f88a23df 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultLowLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataFaultLowLimit = (*_BACnetConstructedDataFaultLowLimit
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFaultLowLimit)(nil)
 
 // NewBACnetConstructedDataFaultLowLimit factory function for _BACnetConstructedDataFaultLowLimit
-func NewBACnetConstructedDataFaultLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultLowLimit BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFaultLowLimit {
+func NewBACnetConstructedDataFaultLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultLowLimit BACnetApplicationTagReal) *_BACnetConstructedDataFaultLowLimit {
 	if faultLowLimit == nil {
 		panic("faultLowLimit of type BACnetApplicationTagReal for BACnetConstructedDataFaultLowLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataFaultLowLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultLowLimit:                 faultLowLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultParameters.go
index 71280ba02a5..5f10fcd65b7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultParameters.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataFaultParameters = (*_BACnetConstructedDataFaultParame
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFaultParameters)(nil)
 
 // NewBACnetConstructedDataFaultParameters factory function for _BACnetConstructedDataFaultParameters
-func NewBACnetConstructedDataFaultParameters(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultParameters BACnetFaultParameter, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFaultParameters {
+func NewBACnetConstructedDataFaultParameters(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultParameters BACnetFaultParameter) *_BACnetConstructedDataFaultParameters {
 	if faultParameters == nil {
 		panic("faultParameters of type BACnetFaultParameter for BACnetConstructedDataFaultParameters must not be nil")
 	}
 	_result := &_BACnetConstructedDataFaultParameters{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultParameters:               faultParameters,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultSignals.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultSignals.go
index 1e66349247a..50a00cc9f08 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultSignals.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultSignals.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataFaultSignals = (*_BACnetConstructedDataFaultSignals)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFaultSignals)(nil)
 
 // NewBACnetConstructedDataFaultSignals factory function for _BACnetConstructedDataFaultSignals
-func NewBACnetConstructedDataFaultSignals(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultSignals []BACnetLiftFaultTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFaultSignals {
+func NewBACnetConstructedDataFaultSignals(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultSignals []BACnetLiftFaultTagged) *_BACnetConstructedDataFaultSignals {
 	_result := &_BACnetConstructedDataFaultSignals{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultSignals:                  faultSignals,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultType.go
index b6b2981a350..ce2a0882852 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultType.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataFaultType = (*_BACnetConstructedDataFaultType)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFaultType)(nil)
 
 // NewBACnetConstructedDataFaultType factory function for _BACnetConstructedDataFaultType
-func NewBACnetConstructedDataFaultType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultType BACnetFaultTypeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFaultType {
+func NewBACnetConstructedDataFaultType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultType BACnetFaultTypeTagged) *_BACnetConstructedDataFaultType {
 	if faultType == nil {
 		panic("faultType of type BACnetFaultTypeTagged for BACnetConstructedDataFaultType must not be nil")
 	}
 	_result := &_BACnetConstructedDataFaultType{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultType:                     faultType,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultValues.go
index 33bdc5b3e71..51d28c7a1f8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultValues.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataFaultValues = (*_BACnetConstructedDataFaultValues)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFaultValues)(nil)
 
 // NewBACnetConstructedDataFaultValues factory function for _BACnetConstructedDataFaultValues
-func NewBACnetConstructedDataFaultValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, faultValues []BACnetLifeSafetyStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFaultValues {
+func NewBACnetConstructedDataFaultValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, faultValues []BACnetLifeSafetyStateTagged) *_BACnetConstructedDataFaultValues {
 	_result := &_BACnetConstructedDataFaultValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		FaultValues:                   faultValues,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAccessMethod.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAccessMethod.go
index 9c2c4e7f53f..f1d79d469e1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAccessMethod.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAccessMethod.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataFileAccessMethod = (*_BACnetConstructedDataFileAccess
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFileAccessMethod)(nil)
 
 // NewBACnetConstructedDataFileAccessMethod factory function for _BACnetConstructedDataFileAccessMethod
-func NewBACnetConstructedDataFileAccessMethod(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, fileAccessMethod BACnetFileAccessMethodTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFileAccessMethod {
+func NewBACnetConstructedDataFileAccessMethod(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, fileAccessMethod BACnetFileAccessMethodTagged) *_BACnetConstructedDataFileAccessMethod {
 	if fileAccessMethod == nil {
 		panic("fileAccessMethod of type BACnetFileAccessMethodTagged for BACnetConstructedDataFileAccessMethod must not be nil")
 	}
 	_result := &_BACnetConstructedDataFileAccessMethod{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FileAccessMethod:              fileAccessMethod,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAll.go
index 53e8d6c42d2..5041eaee693 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataFileAll = (*_BACnetConstructedDataFileAll)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFileAll)(nil)
 
 // NewBACnetConstructedDataFileAll factory function for _BACnetConstructedDataFileAll
-func NewBACnetConstructedDataFileAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFileAll {
+func NewBACnetConstructedDataFileAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataFileAll {
 	_result := &_BACnetConstructedDataFileAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileRecordCount.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileRecordCount.go
index d988b12ccac..25e46449b3d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileRecordCount.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileRecordCount.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataFileRecordCount = (*_BACnetConstructedDataFileRecordC
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFileRecordCount)(nil)
 
 // NewBACnetConstructedDataFileRecordCount factory function for _BACnetConstructedDataFileRecordCount
-func NewBACnetConstructedDataFileRecordCount(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, recordCount BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFileRecordCount {
+func NewBACnetConstructedDataFileRecordCount(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, recordCount BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataFileRecordCount {
 	if recordCount == nil {
 		panic("recordCount of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataFileRecordCount must not be nil")
 	}
 	_result := &_BACnetConstructedDataFileRecordCount{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RecordCount:                   recordCount,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileSize.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileSize.go
index f92e51c81ba..a7942404b04 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileSize.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileSize.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataFileSize = (*_BACnetConstructedDataFileSize)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFileSize)(nil)
 
 // NewBACnetConstructedDataFileSize factory function for _BACnetConstructedDataFileSize
-func NewBACnetConstructedDataFileSize(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, fileSize BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFileSize {
+func NewBACnetConstructedDataFileSize(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, fileSize BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataFileSize {
 	if fileSize == nil {
 		panic("fileSize of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataFileSize must not be nil")
 	}
 	_result := &_BACnetConstructedDataFileSize{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FileSize:                      fileSize,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileType.go
index cb5347ab3db..ddf2b639a43 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileType.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataFileType = (*_BACnetConstructedDataFileType)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFileType)(nil)
 
 // NewBACnetConstructedDataFileType factory function for _BACnetConstructedDataFileType
-func NewBACnetConstructedDataFileType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, fileType BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFileType {
+func NewBACnetConstructedDataFileType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, fileType BACnetApplicationTagCharacterString) *_BACnetConstructedDataFileType {
 	if fileType == nil {
 		panic("fileType of type BACnetApplicationTagCharacterString for BACnetConstructedDataFileType must not be nil")
 	}
 	_result := &_BACnetConstructedDataFileType{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FileType:                      fileType,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFirmwareRevision.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFirmwareRevision.go
index 92fb0b23a31..2c9221404d0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFirmwareRevision.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFirmwareRevision.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataFirmwareRevision = (*_BACnetConstructedDataFirmwareRe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFirmwareRevision)(nil)
 
 // NewBACnetConstructedDataFirmwareRevision factory function for _BACnetConstructedDataFirmwareRevision
-func NewBACnetConstructedDataFirmwareRevision(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, firmwareRevision BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFirmwareRevision {
+func NewBACnetConstructedDataFirmwareRevision(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, firmwareRevision BACnetApplicationTagCharacterString) *_BACnetConstructedDataFirmwareRevision {
 	if firmwareRevision == nil {
 		panic("firmwareRevision of type BACnetApplicationTagCharacterString for BACnetConstructedDataFirmwareRevision must not be nil")
 	}
 	_result := &_BACnetConstructedDataFirmwareRevision{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FirmwareRevision:              firmwareRevision,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFloorText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFloorText.go
index 93e2b925173..31f4f7b2d1a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFloorText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFloorText.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataFloorText = (*_BACnetConstructedDataFloorText)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFloorText)(nil)
 
 // NewBACnetConstructedDataFloorText factory function for _BACnetConstructedDataFloorText
-func NewBACnetConstructedDataFloorText(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, floorText []BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFloorText {
+func NewBACnetConstructedDataFloorText(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, floorText []BACnetApplicationTagCharacterString) *_BACnetConstructedDataFloorText {
 	_result := &_BACnetConstructedDataFloorText{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		FloorText:                     floorText,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFullDutyBaseline.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFullDutyBaseline.go
index d6598a59a06..6103d59989a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFullDutyBaseline.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFullDutyBaseline.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataFullDutyBaseline = (*_BACnetConstructedDataFullDutyBa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataFullDutyBaseline)(nil)
 
 // NewBACnetConstructedDataFullDutyBaseline factory function for _BACnetConstructedDataFullDutyBaseline
-func NewBACnetConstructedDataFullDutyBaseline(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, fullDutyBaseLine BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataFullDutyBaseline {
+func NewBACnetConstructedDataFullDutyBaseline(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, fullDutyBaseLine BACnetApplicationTagReal) *_BACnetConstructedDataFullDutyBaseline {
 	if fullDutyBaseLine == nil {
 		panic("fullDutyBaseLine of type BACnetApplicationTagReal for BACnetConstructedDataFullDutyBaseline must not be nil")
 	}
 	_result := &_BACnetConstructedDataFullDutyBaseline{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FullDutyBaseLine:              fullDutyBaseLine,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupAll.go
index d4fb0727ade..8e705f37a1f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataGlobalGroupAll = (*_BACnetConstructedDataGlobalGroupA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataGlobalGroupAll)(nil)
 
 // NewBACnetConstructedDataGlobalGroupAll factory function for _BACnetConstructedDataGlobalGroupAll
-func NewBACnetConstructedDataGlobalGroupAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataGlobalGroupAll {
+func NewBACnetConstructedDataGlobalGroupAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataGlobalGroupAll {
 	_result := &_BACnetConstructedDataGlobalGroupAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupGroupMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupGroupMembers.go
index 9378c7ed181..02beee2d7fd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupGroupMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupGroupMembers.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataGlobalGroupGroupMembers = (*_BACnetConstructedDataGlo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataGlobalGroupGroupMembers)(nil)
 
 // NewBACnetConstructedDataGlobalGroupGroupMembers factory function for _BACnetConstructedDataGlobalGroupGroupMembers
-func NewBACnetConstructedDataGlobalGroupGroupMembers(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, groupMembers []BACnetDeviceObjectPropertyReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataGlobalGroupGroupMembers {
+func NewBACnetConstructedDataGlobalGroupGroupMembers(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, groupMembers []BACnetDeviceObjectPropertyReference) *_BACnetConstructedDataGlobalGroupGroupMembers {
 	_result := &_BACnetConstructedDataGlobalGroupGroupMembers{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		GroupMembers:                  groupMembers,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupPresentValue.go
index 4525668677e..b1ed9f3d766 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupPresentValue.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataGlobalGroupPresentValue = (*_BACnetConstructedDataGlo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataGlobalGroupPresentValue)(nil)
 
 // NewBACnetConstructedDataGlobalGroupPresentValue factory function for _BACnetConstructedDataGlobalGroupPresentValue
-func NewBACnetConstructedDataGlobalGroupPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, presentValue []BACnetPropertyAccessResult, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataGlobalGroupPresentValue {
+func NewBACnetConstructedDataGlobalGroupPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, presentValue []BACnetPropertyAccessResult) *_BACnetConstructedDataGlobalGroupPresentValue {
 	_result := &_BACnetConstructedDataGlobalGroupPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		PresentValue:                  presentValue,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalIdentifier.go
index f30c879d800..1cc27d3b6c0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalIdentifier.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataGlobalIdentifier = (*_BACnetConstructedDataGlobalIden
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataGlobalIdentifier)(nil)
 
 // NewBACnetConstructedDataGlobalIdentifier factory function for _BACnetConstructedDataGlobalIdentifier
-func NewBACnetConstructedDataGlobalIdentifier(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, globalIdentifier BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataGlobalIdentifier {
+func NewBACnetConstructedDataGlobalIdentifier(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, globalIdentifier BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataGlobalIdentifier {
 	if globalIdentifier == nil {
 		panic("globalIdentifier of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataGlobalIdentifier must not be nil")
 	}
 	_result := &_BACnetConstructedDataGlobalIdentifier{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		GlobalIdentifier:              globalIdentifier,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupAll.go
index f89872a548b..ab0a2e9ef51 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataGroupAll = (*_BACnetConstructedDataGroupAll)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataGroupAll)(nil)
 
 // NewBACnetConstructedDataGroupAll factory function for _BACnetConstructedDataGroupAll
-func NewBACnetConstructedDataGroupAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataGroupAll {
+func NewBACnetConstructedDataGroupAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataGroupAll {
 	_result := &_BACnetConstructedDataGroupAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupID.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupID.go
index 1201029f866..454f9bfaf44 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupID.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupID.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataGroupID = (*_BACnetConstructedDataGroupID)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataGroupID)(nil)
 
 // NewBACnetConstructedDataGroupID factory function for _BACnetConstructedDataGroupID
-func NewBACnetConstructedDataGroupID(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, groupId BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataGroupID {
+func NewBACnetConstructedDataGroupID(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, groupId BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataGroupID {
 	if groupId == nil {
 		panic("groupId of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataGroupID must not be nil")
 	}
 	_result := &_BACnetConstructedDataGroupID{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		GroupId:                       groupId,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMemberNames.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMemberNames.go
index 2549b175328..c66fd927eb3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMemberNames.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMemberNames.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataGroupMemberNames = (*_BACnetConstructedDataGroupMembe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataGroupMemberNames)(nil)
 
 // NewBACnetConstructedDataGroupMemberNames factory function for _BACnetConstructedDataGroupMemberNames
-func NewBACnetConstructedDataGroupMemberNames(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, groupMemberNames []BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataGroupMemberNames {
+func NewBACnetConstructedDataGroupMemberNames(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, groupMemberNames []BACnetApplicationTagCharacterString) *_BACnetConstructedDataGroupMemberNames {
 	_result := &_BACnetConstructedDataGroupMemberNames{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		GroupMemberNames:              groupMemberNames,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMembers.go
index 28ab1f57c01..c43c8dc7e89 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMembers.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataGroupMembers = (*_BACnetConstructedDataGroupMembers)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataGroupMembers)(nil)
 
 // NewBACnetConstructedDataGroupMembers factory function for _BACnetConstructedDataGroupMembers
-func NewBACnetConstructedDataGroupMembers(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, groupMembers []BACnetApplicationTagObjectIdentifier, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataGroupMembers {
+func NewBACnetConstructedDataGroupMembers(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, groupMembers []BACnetApplicationTagObjectIdentifier) *_BACnetConstructedDataGroupMembers {
 	_result := &_BACnetConstructedDataGroupMembers{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		GroupMembers:                  groupMembers,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMode.go
index 975722702e3..20b273a157c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMode.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataGroupMode = (*_BACnetConstructedDataGroupMode)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataGroupMode)(nil)
 
 // NewBACnetConstructedDataGroupMode factory function for _BACnetConstructedDataGroupMode
-func NewBACnetConstructedDataGroupMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, groupMode BACnetLiftGroupModeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataGroupMode {
+func NewBACnetConstructedDataGroupMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, groupMode BACnetLiftGroupModeTagged) *_BACnetConstructedDataGroupMode {
 	if groupMode == nil {
 		panic("groupMode of type BACnetLiftGroupModeTagged for BACnetConstructedDataGroupMode must not be nil")
 	}
 	_result := &_BACnetConstructedDataGroupMode{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		GroupMode:                     groupMode,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupPresentValue.go
index f0a627d94fd..063587f5bcc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupPresentValue.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataGroupPresentValue = (*_BACnetConstructedDataGroupPres
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataGroupPresentValue)(nil)
 
 // NewBACnetConstructedDataGroupPresentValue factory function for _BACnetConstructedDataGroupPresentValue
-func NewBACnetConstructedDataGroupPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue []BACnetReadAccessResult, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataGroupPresentValue {
+func NewBACnetConstructedDataGroupPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue []BACnetReadAccessResult) *_BACnetConstructedDataGroupPresentValue {
 	_result := &_BACnetConstructedDataGroupPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHighLimit.go
index 1c257629b39..c1b2bd9cb9d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHighLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataHighLimit = (*_BACnetConstructedDataHighLimit)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataHighLimit)(nil)
 
 // NewBACnetConstructedDataHighLimit factory function for _BACnetConstructedDataHighLimit
-func NewBACnetConstructedDataHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, highLimit BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataHighLimit {
+func NewBACnetConstructedDataHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, highLimit BACnetApplicationTagReal) *_BACnetConstructedDataHighLimit {
 	if highLimit == nil {
 		panic("highLimit of type BACnetApplicationTagReal for BACnetConstructedDataHighLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataHighLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		HighLimit:                     highLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHigherDeck.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHigherDeck.go
index 1f802bd8615..fbca1b5c461 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHigherDeck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHigherDeck.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataHigherDeck = (*_BACnetConstructedDataHigherDeck)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataHigherDeck)(nil)
 
 // NewBACnetConstructedDataHigherDeck factory function for _BACnetConstructedDataHigherDeck
-func NewBACnetConstructedDataHigherDeck(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, higherDeck BACnetApplicationTagObjectIdentifier, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataHigherDeck {
+func NewBACnetConstructedDataHigherDeck(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, higherDeck BACnetApplicationTagObjectIdentifier) *_BACnetConstructedDataHigherDeck {
 	if higherDeck == nil {
 		panic("higherDeck of type BACnetApplicationTagObjectIdentifier for BACnetConstructedDataHigherDeck must not be nil")
 	}
 	_result := &_BACnetConstructedDataHigherDeck{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		HigherDeck:                    higherDeck,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPAddress.go
index 415a8d2b688..9320f1ef5e7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPAddress.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIPAddress = (*_BACnetConstructedDataIPAddress)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPAddress)(nil)
 
 // NewBACnetConstructedDataIPAddress factory function for _BACnetConstructedDataIPAddress
-func NewBACnetConstructedDataIPAddress(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipAddress BACnetApplicationTagOctetString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPAddress {
+func NewBACnetConstructedDataIPAddress(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipAddress BACnetApplicationTagOctetString) *_BACnetConstructedDataIPAddress {
 	if ipAddress == nil {
 		panic("ipAddress of type BACnetApplicationTagOctetString for BACnetConstructedDataIPAddress must not be nil")
 	}
 	_result := &_BACnetConstructedDataIPAddress{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		IpAddress:                     ipAddress,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPEnable.go
index 465937677e4..b0c16d9e2c4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPEnable.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIPDHCPEnable = (*_BACnetConstructedDataIPDHCPEnable)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPDHCPEnable)(nil)
 
 // NewBACnetConstructedDataIPDHCPEnable factory function for _BACnetConstructedDataIPDHCPEnable
-func NewBACnetConstructedDataIPDHCPEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipDhcpEnable BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPDHCPEnable {
+func NewBACnetConstructedDataIPDHCPEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipDhcpEnable BACnetApplicationTagBoolean) *_BACnetConstructedDataIPDHCPEnable {
 	if ipDhcpEnable == nil {
 		panic("ipDhcpEnable of type BACnetApplicationTagBoolean for BACnetConstructedDataIPDHCPEnable must not be nil")
 	}
 	_result := &_BACnetConstructedDataIPDHCPEnable{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		IpDhcpEnable:                  ipDhcpEnable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTime.go
index d127c23cf77..61e4ebd6116 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIPDHCPLeaseTime = (*_BACnetConstructedDataIPDHCPLease
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPDHCPLeaseTime)(nil)
 
 // NewBACnetConstructedDataIPDHCPLeaseTime factory function for _BACnetConstructedDataIPDHCPLeaseTime
-func NewBACnetConstructedDataIPDHCPLeaseTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipDhcpLeaseTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPDHCPLeaseTime {
+func NewBACnetConstructedDataIPDHCPLeaseTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipDhcpLeaseTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataIPDHCPLeaseTime {
 	if ipDhcpLeaseTime == nil {
 		panic("ipDhcpLeaseTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataIPDHCPLeaseTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataIPDHCPLeaseTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		IpDhcpLeaseTime:               ipDhcpLeaseTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTimeRemaining.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTimeRemaining.go
index 3c52fbcc7b2..b222285f3d9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTimeRemaining.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTimeRemaining.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIPDHCPLeaseTimeRemaining = (*_BACnetConstructedDataIP
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPDHCPLeaseTimeRemaining)(nil)
 
 // NewBACnetConstructedDataIPDHCPLeaseTimeRemaining factory function for _BACnetConstructedDataIPDHCPLeaseTimeRemaining
-func NewBACnetConstructedDataIPDHCPLeaseTimeRemaining(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipDhcpLeaseTimeRemaining BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPDHCPLeaseTimeRemaining {
+func NewBACnetConstructedDataIPDHCPLeaseTimeRemaining(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipDhcpLeaseTimeRemaining BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataIPDHCPLeaseTimeRemaining {
 	if ipDhcpLeaseTimeRemaining == nil {
 		panic("ipDhcpLeaseTimeRemaining of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataIPDHCPLeaseTimeRemaining must not be nil")
 	}
 	_result := &_BACnetConstructedDataIPDHCPLeaseTimeRemaining{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		IpDhcpLeaseTimeRemaining:      ipDhcpLeaseTimeRemaining,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPServer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPServer.go
index c9e999d68c4..2732b55ef35 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPServer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPServer.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIPDHCPServer = (*_BACnetConstructedDataIPDHCPServer)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPDHCPServer)(nil)
 
 // NewBACnetConstructedDataIPDHCPServer factory function for _BACnetConstructedDataIPDHCPServer
-func NewBACnetConstructedDataIPDHCPServer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, dhcpServer BACnetApplicationTagOctetString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPDHCPServer {
+func NewBACnetConstructedDataIPDHCPServer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, dhcpServer BACnetApplicationTagOctetString) *_BACnetConstructedDataIPDHCPServer {
 	if dhcpServer == nil {
 		panic("dhcpServer of type BACnetApplicationTagOctetString for BACnetConstructedDataIPDHCPServer must not be nil")
 	}
 	_result := &_BACnetConstructedDataIPDHCPServer{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DhcpServer:                    dhcpServer,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDNSServer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDNSServer.go
index d42effa0085..e091c63757e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDNSServer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDNSServer.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataIPDNSServer = (*_BACnetConstructedDataIPDNSServer)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPDNSServer)(nil)
 
 // NewBACnetConstructedDataIPDNSServer factory function for _BACnetConstructedDataIPDNSServer
-func NewBACnetConstructedDataIPDNSServer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, ipDnsServer []BACnetApplicationTagOctetString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPDNSServer {
+func NewBACnetConstructedDataIPDNSServer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, ipDnsServer []BACnetApplicationTagOctetString) *_BACnetConstructedDataIPDNSServer {
 	_result := &_BACnetConstructedDataIPDNSServer{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		IpDnsServer:                   ipDnsServer,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDefaultGateway.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDefaultGateway.go
index 706f3560f49..4219ffd1083 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDefaultGateway.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDefaultGateway.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIPDefaultGateway = (*_BACnetConstructedDataIPDefaultG
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPDefaultGateway)(nil)
 
 // NewBACnetConstructedDataIPDefaultGateway factory function for _BACnetConstructedDataIPDefaultGateway
-func NewBACnetConstructedDataIPDefaultGateway(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipDefaultGateway BACnetApplicationTagOctetString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPDefaultGateway {
+func NewBACnetConstructedDataIPDefaultGateway(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipDefaultGateway BACnetApplicationTagOctetString) *_BACnetConstructedDataIPDefaultGateway {
 	if ipDefaultGateway == nil {
 		panic("ipDefaultGateway of type BACnetApplicationTagOctetString for BACnetConstructedDataIPDefaultGateway must not be nil")
 	}
 	_result := &_BACnetConstructedDataIPDefaultGateway{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		IpDefaultGateway:              ipDefaultGateway,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPSubnetMask.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPSubnetMask.go
index 4ed1b806ed5..f6126fd13f4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPSubnetMask.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPSubnetMask.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIPSubnetMask = (*_BACnetConstructedDataIPSubnetMask)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPSubnetMask)(nil)
 
 // NewBACnetConstructedDataIPSubnetMask factory function for _BACnetConstructedDataIPSubnetMask
-func NewBACnetConstructedDataIPSubnetMask(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipSubnetMask BACnetApplicationTagOctetString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPSubnetMask {
+func NewBACnetConstructedDataIPSubnetMask(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipSubnetMask BACnetApplicationTagOctetString) *_BACnetConstructedDataIPSubnetMask {
 	if ipSubnetMask == nil {
 		panic("ipSubnetMask of type BACnetApplicationTagOctetString for BACnetConstructedDataIPSubnetMask must not be nil")
 	}
 	_result := &_BACnetConstructedDataIPSubnetMask{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		IpSubnetMask:                  ipSubnetMask,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6Address.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6Address.go
index 3eebcb83d28..ed27242219a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6Address.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6Address.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIPv6Address = (*_BACnetConstructedDataIPv6Address)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPv6Address)(nil)
 
 // NewBACnetConstructedDataIPv6Address factory function for _BACnetConstructedDataIPv6Address
-func NewBACnetConstructedDataIPv6Address(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6Address BACnetApplicationTagOctetString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPv6Address {
+func NewBACnetConstructedDataIPv6Address(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6Address BACnetApplicationTagOctetString) *_BACnetConstructedDataIPv6Address {
 	if ipv6Address == nil {
 		panic("ipv6Address of type BACnetApplicationTagOctetString for BACnetConstructedDataIPv6Address must not be nil")
 	}
 	_result := &_BACnetConstructedDataIPv6Address{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Ipv6Address:                   ipv6Address,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6AutoAddressingEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6AutoAddressingEnable.go
index 35fd60f9ebb..bdd21183c58 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6AutoAddressingEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6AutoAddressingEnable.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIPv6AutoAddressingEnable = (*_BACnetConstructedDataIP
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPv6AutoAddressingEnable)(nil)
 
 // NewBACnetConstructedDataIPv6AutoAddressingEnable factory function for _BACnetConstructedDataIPv6AutoAddressingEnable
-func NewBACnetConstructedDataIPv6AutoAddressingEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, autoAddressingEnable BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPv6AutoAddressingEnable {
+func NewBACnetConstructedDataIPv6AutoAddressingEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, autoAddressingEnable BACnetApplicationTagBoolean) *_BACnetConstructedDataIPv6AutoAddressingEnable {
 	if autoAddressingEnable == nil {
 		panic("autoAddressingEnable of type BACnetApplicationTagBoolean for BACnetConstructedDataIPv6AutoAddressingEnable must not be nil")
 	}
 	_result := &_BACnetConstructedDataIPv6AutoAddressingEnable{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AutoAddressingEnable:          autoAddressingEnable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTime.go
index bc61652dc35..4a86de81986 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIPv6DHCPLeaseTime = (*_BACnetConstructedDataIPv6DHCPL
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPv6DHCPLeaseTime)(nil)
 
 // NewBACnetConstructedDataIPv6DHCPLeaseTime factory function for _BACnetConstructedDataIPv6DHCPLeaseTime
-func NewBACnetConstructedDataIPv6DHCPLeaseTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6DhcpLeaseTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPv6DHCPLeaseTime {
+func NewBACnetConstructedDataIPv6DHCPLeaseTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6DhcpLeaseTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataIPv6DHCPLeaseTime {
 	if ipv6DhcpLeaseTime == nil {
 		panic("ipv6DhcpLeaseTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataIPv6DHCPLeaseTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataIPv6DHCPLeaseTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Ipv6DhcpLeaseTime:             ipv6DhcpLeaseTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTimeRemaining.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTimeRemaining.go
index f1d737bf3f0..86ad541b281 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTimeRemaining.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTimeRemaining.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIPv6DHCPLeaseTimeRemaining = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPv6DHCPLeaseTimeRemaining)(nil)
 
 // NewBACnetConstructedDataIPv6DHCPLeaseTimeRemaining factory function for _BACnetConstructedDataIPv6DHCPLeaseTimeRemaining
-func NewBACnetConstructedDataIPv6DHCPLeaseTimeRemaining(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6DhcpLeaseTimeRemaining BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPv6DHCPLeaseTimeRemaining {
+func NewBACnetConstructedDataIPv6DHCPLeaseTimeRemaining(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6DhcpLeaseTimeRemaining BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataIPv6DHCPLeaseTimeRemaining {
 	if ipv6DhcpLeaseTimeRemaining == nil {
 		panic("ipv6DhcpLeaseTimeRemaining of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataIPv6DHCPLeaseTimeRemaining must not be nil")
 	}
 	_result := &_BACnetConstructedDataIPv6DHCPLeaseTimeRemaining{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Ipv6DhcpLeaseTimeRemaining:    ipv6DhcpLeaseTimeRemaining,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPServer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPServer.go
index fd469aaa8ed..3542c2d4c1c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPServer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPServer.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIPv6DHCPServer = (*_BACnetConstructedDataIPv6DHCPServ
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPv6DHCPServer)(nil)
 
 // NewBACnetConstructedDataIPv6DHCPServer factory function for _BACnetConstructedDataIPv6DHCPServer
-func NewBACnetConstructedDataIPv6DHCPServer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, dhcpServer BACnetApplicationTagOctetString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPv6DHCPServer {
+func NewBACnetConstructedDataIPv6DHCPServer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, dhcpServer BACnetApplicationTagOctetString) *_BACnetConstructedDataIPv6DHCPServer {
 	if dhcpServer == nil {
 		panic("dhcpServer of type BACnetApplicationTagOctetString for BACnetConstructedDataIPv6DHCPServer must not be nil")
 	}
 	_result := &_BACnetConstructedDataIPv6DHCPServer{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		DhcpServer:                    dhcpServer,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DNSServer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DNSServer.go
index 5acf5df94e5..e9635266bf2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DNSServer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DNSServer.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataIPv6DNSServer = (*_BACnetConstructedDataIPv6DNSServer
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPv6DNSServer)(nil)
 
 // NewBACnetConstructedDataIPv6DNSServer factory function for _BACnetConstructedDataIPv6DNSServer
-func NewBACnetConstructedDataIPv6DNSServer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, ipv6DnsServer []BACnetApplicationTagOctetString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPv6DNSServer {
+func NewBACnetConstructedDataIPv6DNSServer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, ipv6DnsServer []BACnetApplicationTagOctetString) *_BACnetConstructedDataIPv6DNSServer {
 	_result := &_BACnetConstructedDataIPv6DNSServer{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		Ipv6DnsServer:                 ipv6DnsServer,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DefaultGateway.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DefaultGateway.go
index 0e63e33cf9a..b881b981163 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DefaultGateway.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DefaultGateway.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIPv6DefaultGateway = (*_BACnetConstructedDataIPv6Defa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPv6DefaultGateway)(nil)
 
 // NewBACnetConstructedDataIPv6DefaultGateway factory function for _BACnetConstructedDataIPv6DefaultGateway
-func NewBACnetConstructedDataIPv6DefaultGateway(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6DefaultGateway BACnetApplicationTagOctetString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPv6DefaultGateway {
+func NewBACnetConstructedDataIPv6DefaultGateway(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6DefaultGateway BACnetApplicationTagOctetString) *_BACnetConstructedDataIPv6DefaultGateway {
 	if ipv6DefaultGateway == nil {
 		panic("ipv6DefaultGateway of type BACnetApplicationTagOctetString for BACnetConstructedDataIPv6DefaultGateway must not be nil")
 	}
 	_result := &_BACnetConstructedDataIPv6DefaultGateway{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Ipv6DefaultGateway:            ipv6DefaultGateway,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6PrefixLength.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6PrefixLength.go
index eed6c007cc3..3f15d322713 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6PrefixLength.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6PrefixLength.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIPv6PrefixLength = (*_BACnetConstructedDataIPv6Prefix
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPv6PrefixLength)(nil)
 
 // NewBACnetConstructedDataIPv6PrefixLength factory function for _BACnetConstructedDataIPv6PrefixLength
-func NewBACnetConstructedDataIPv6PrefixLength(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6PrefixLength BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPv6PrefixLength {
+func NewBACnetConstructedDataIPv6PrefixLength(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6PrefixLength BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataIPv6PrefixLength {
 	if ipv6PrefixLength == nil {
 		panic("ipv6PrefixLength of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataIPv6PrefixLength must not be nil")
 	}
 	_result := &_BACnetConstructedDataIPv6PrefixLength{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Ipv6PrefixLength:              ipv6PrefixLength,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6ZoneIndex.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6ZoneIndex.go
index 9b07b9ada61..1a8e77d950c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6ZoneIndex.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6ZoneIndex.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIPv6ZoneIndex = (*_BACnetConstructedDataIPv6ZoneIndex
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIPv6ZoneIndex)(nil)
 
 // NewBACnetConstructedDataIPv6ZoneIndex factory function for _BACnetConstructedDataIPv6ZoneIndex
-func NewBACnetConstructedDataIPv6ZoneIndex(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6ZoneIndex BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIPv6ZoneIndex {
+func NewBACnetConstructedDataIPv6ZoneIndex(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, ipv6ZoneIndex BACnetApplicationTagCharacterString) *_BACnetConstructedDataIPv6ZoneIndex {
 	if ipv6ZoneIndex == nil {
 		panic("ipv6ZoneIndex of type BACnetApplicationTagCharacterString for BACnetConstructedDataIPv6ZoneIndex must not be nil")
 	}
 	_result := &_BACnetConstructedDataIPv6ZoneIndex{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Ipv6ZoneIndex:                 ipv6ZoneIndex,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProcess.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProcess.go
index c03d43c0ca9..a5c45c6e130 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProcess.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProcess.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataInProcess = (*_BACnetConstructedDataInProcess)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataInProcess)(nil)
 
 // NewBACnetConstructedDataInProcess factory function for _BACnetConstructedDataInProcess
-func NewBACnetConstructedDataInProcess(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, inProcess BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataInProcess {
+func NewBACnetConstructedDataInProcess(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, inProcess BACnetApplicationTagBoolean) *_BACnetConstructedDataInProcess {
 	if inProcess == nil {
 		panic("inProcess of type BACnetApplicationTagBoolean for BACnetConstructedDataInProcess must not be nil")
 	}
 	_result := &_BACnetConstructedDataInProcess{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		InProcess:                     inProcess,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProgress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProgress.go
index af612f5d2fa..d59b766bba3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProgress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProgress.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataInProgress = (*_BACnetConstructedDataInProgress)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataInProgress)(nil)
 
 // NewBACnetConstructedDataInProgress factory function for _BACnetConstructedDataInProgress
-func NewBACnetConstructedDataInProgress(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, inProgress BACnetLightingInProgressTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataInProgress {
+func NewBACnetConstructedDataInProgress(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, inProgress BACnetLightingInProgressTagged) *_BACnetConstructedDataInProgress {
 	if inProgress == nil {
 		panic("inProgress of type BACnetLightingInProgressTagged for BACnetConstructedDataInProgress must not be nil")
 	}
 	_result := &_BACnetConstructedDataInProgress{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		InProgress:                    inProgress,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInactiveText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInactiveText.go
index ae2f67796e1..0d54864147a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInactiveText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInactiveText.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataInactiveText = (*_BACnetConstructedDataInactiveText)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataInactiveText)(nil)
 
 // NewBACnetConstructedDataInactiveText factory function for _BACnetConstructedDataInactiveText
-func NewBACnetConstructedDataInactiveText(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, inactiveText BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataInactiveText {
+func NewBACnetConstructedDataInactiveText(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, inactiveText BACnetApplicationTagCharacterString) *_BACnetConstructedDataInactiveText {
 	if inactiveText == nil {
 		panic("inactiveText of type BACnetApplicationTagCharacterString for BACnetConstructedDataInactiveText must not be nil")
 	}
 	_result := &_BACnetConstructedDataInactiveText{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		InactiveText:                  inactiveText,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInitialTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInitialTimeout.go
index 09ca6b7a845..0151ee74283 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInitialTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInitialTimeout.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataInitialTimeout = (*_BACnetConstructedDataInitialTimeo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataInitialTimeout)(nil)
 
 // NewBACnetConstructedDataInitialTimeout factory function for _BACnetConstructedDataInitialTimeout
-func NewBACnetConstructedDataInitialTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, initialTimeout BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataInitialTimeout {
+func NewBACnetConstructedDataInitialTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, initialTimeout BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataInitialTimeout {
 	if initialTimeout == nil {
 		panic("initialTimeout of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataInitialTimeout must not be nil")
 	}
 	_result := &_BACnetConstructedDataInitialTimeout{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		InitialTimeout:                initialTimeout,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInputReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInputReference.go
index e48ff3b6174..fb75b51211c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInputReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInputReference.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataInputReference = (*_BACnetConstructedDataInputReferen
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataInputReference)(nil)
 
 // NewBACnetConstructedDataInputReference factory function for _BACnetConstructedDataInputReference
-func NewBACnetConstructedDataInputReference(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, inputReference BACnetObjectPropertyReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataInputReference {
+func NewBACnetConstructedDataInputReference(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, inputReference BACnetObjectPropertyReference) *_BACnetConstructedDataInputReference {
 	if inputReference == nil {
 		panic("inputReference of type BACnetObjectPropertyReference for BACnetConstructedDataInputReference must not be nil")
 	}
 	_result := &_BACnetConstructedDataInputReference{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		InputReference:                inputReference,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstallationID.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstallationID.go
index b0bb1522bb6..e9921784a21 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstallationID.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstallationID.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataInstallationID = (*_BACnetConstructedDataInstallation
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataInstallationID)(nil)
 
 // NewBACnetConstructedDataInstallationID factory function for _BACnetConstructedDataInstallationID
-func NewBACnetConstructedDataInstallationID(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, installationId BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataInstallationID {
+func NewBACnetConstructedDataInstallationID(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, installationId BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataInstallationID {
 	if installationId == nil {
 		panic("installationId of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataInstallationID must not be nil")
 	}
 	_result := &_BACnetConstructedDataInstallationID{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		InstallationId:                installationId,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstanceOf.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstanceOf.go
index 4855c0d0203..c91d78b1035 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstanceOf.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstanceOf.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataInstanceOf = (*_BACnetConstructedDataInstanceOf)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataInstanceOf)(nil)
 
 // NewBACnetConstructedDataInstanceOf factory function for _BACnetConstructedDataInstanceOf
-func NewBACnetConstructedDataInstanceOf(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, instanceOf BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataInstanceOf {
+func NewBACnetConstructedDataInstanceOf(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, instanceOf BACnetApplicationTagCharacterString) *_BACnetConstructedDataInstanceOf {
 	if instanceOf == nil {
 		panic("instanceOf of type BACnetApplicationTagCharacterString for BACnetConstructedDataInstanceOf must not be nil")
 	}
 	_result := &_BACnetConstructedDataInstanceOf{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		InstanceOf:                    instanceOf,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstantaneousPower.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstantaneousPower.go
index 3448c98cf6b..c149457d715 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstantaneousPower.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstantaneousPower.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataInstantaneousPower = (*_BACnetConstructedDataInstanta
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataInstantaneousPower)(nil)
 
 // NewBACnetConstructedDataInstantaneousPower factory function for _BACnetConstructedDataInstantaneousPower
-func NewBACnetConstructedDataInstantaneousPower(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, instantaneousPower BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataInstantaneousPower {
+func NewBACnetConstructedDataInstantaneousPower(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, instantaneousPower BACnetApplicationTagReal) *_BACnetConstructedDataInstantaneousPower {
 	if instantaneousPower == nil {
 		panic("instantaneousPower of type BACnetApplicationTagReal for BACnetConstructedDataInstantaneousPower must not be nil")
 	}
 	_result := &_BACnetConstructedDataInstantaneousPower{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		InstantaneousPower:            instantaneousPower,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueAll.go
index 5bb18e3edc0..a28c2acbf8f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataIntegerValueAll = (*_BACnetConstructedDataIntegerValu
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIntegerValueAll)(nil)
 
 // NewBACnetConstructedDataIntegerValueAll factory function for _BACnetConstructedDataIntegerValueAll
-func NewBACnetConstructedDataIntegerValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIntegerValueAll {
+func NewBACnetConstructedDataIntegerValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataIntegerValueAll {
 	_result := &_BACnetConstructedDataIntegerValueAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueCOVIncrement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueCOVIncrement.go
index 40601af375c..b6e32626788 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueCOVIncrement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueCOVIncrement.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIntegerValueCOVIncrement = (*_BACnetConstructedDataIn
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIntegerValueCOVIncrement)(nil)
 
 // NewBACnetConstructedDataIntegerValueCOVIncrement factory function for _BACnetConstructedDataIntegerValueCOVIncrement
-func NewBACnetConstructedDataIntegerValueCOVIncrement(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covIncrement BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIntegerValueCOVIncrement {
+func NewBACnetConstructedDataIntegerValueCOVIncrement(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covIncrement BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataIntegerValueCOVIncrement {
 	if covIncrement == nil {
 		panic("covIncrement of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataIntegerValueCOVIncrement must not be nil")
 	}
 	_result := &_BACnetConstructedDataIntegerValueCOVIncrement{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CovIncrement:                  covIncrement,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueDeadband.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueDeadband.go
index 33ad99f7377..15d4a9acf72 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueDeadband.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueDeadband.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIntegerValueDeadband = (*_BACnetConstructedDataIntege
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIntegerValueDeadband)(nil)
 
 // NewBACnetConstructedDataIntegerValueDeadband factory function for _BACnetConstructedDataIntegerValueDeadband
-func NewBACnetConstructedDataIntegerValueDeadband(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, deadband BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIntegerValueDeadband {
+func NewBACnetConstructedDataIntegerValueDeadband(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, deadband BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataIntegerValueDeadband {
 	if deadband == nil {
 		panic("deadband of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataIntegerValueDeadband must not be nil")
 	}
 	_result := &_BACnetConstructedDataIntegerValueDeadband{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Deadband:                      deadband,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultHighLimit.go
index cd1a35af85c..ec63b40210b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultHighLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIntegerValueFaultHighLimit = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIntegerValueFaultHighLimit)(nil)
 
 // NewBACnetConstructedDataIntegerValueFaultHighLimit factory function for _BACnetConstructedDataIntegerValueFaultHighLimit
-func NewBACnetConstructedDataIntegerValueFaultHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultHighLimit BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIntegerValueFaultHighLimit {
+func NewBACnetConstructedDataIntegerValueFaultHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultHighLimit BACnetApplicationTagSignedInteger) *_BACnetConstructedDataIntegerValueFaultHighLimit {
 	if faultHighLimit == nil {
 		panic("faultHighLimit of type BACnetApplicationTagSignedInteger for BACnetConstructedDataIntegerValueFaultHighLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataIntegerValueFaultHighLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultHighLimit:                faultHighLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultLowLimit.go
index 84fd1183490..8cac9bd890a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultLowLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIntegerValueFaultLowLimit = (*_BACnetConstructedDataI
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIntegerValueFaultLowLimit)(nil)
 
 // NewBACnetConstructedDataIntegerValueFaultLowLimit factory function for _BACnetConstructedDataIntegerValueFaultLowLimit
-func NewBACnetConstructedDataIntegerValueFaultLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultLowLimit BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIntegerValueFaultLowLimit {
+func NewBACnetConstructedDataIntegerValueFaultLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultLowLimit BACnetApplicationTagSignedInteger) *_BACnetConstructedDataIntegerValueFaultLowLimit {
 	if faultLowLimit == nil {
 		panic("faultLowLimit of type BACnetApplicationTagSignedInteger for BACnetConstructedDataIntegerValueFaultLowLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataIntegerValueFaultLowLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultLowLimit:                 faultLowLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueHighLimit.go
index a1b04928dbe..3143aad1650 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueHighLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIntegerValueHighLimit = (*_BACnetConstructedDataInteg
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIntegerValueHighLimit)(nil)
 
 // NewBACnetConstructedDataIntegerValueHighLimit factory function for _BACnetConstructedDataIntegerValueHighLimit
-func NewBACnetConstructedDataIntegerValueHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, highLimit BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIntegerValueHighLimit {
+func NewBACnetConstructedDataIntegerValueHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, highLimit BACnetApplicationTagSignedInteger) *_BACnetConstructedDataIntegerValueHighLimit {
 	if highLimit == nil {
 		panic("highLimit of type BACnetApplicationTagSignedInteger for BACnetConstructedDataIntegerValueHighLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataIntegerValueHighLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		HighLimit:                     highLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueLowLimit.go
index d791244ce2a..72ff71b05db 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueLowLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIntegerValueLowLimit = (*_BACnetConstructedDataIntege
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIntegerValueLowLimit)(nil)
 
 // NewBACnetConstructedDataIntegerValueLowLimit factory function for _BACnetConstructedDataIntegerValueLowLimit
-func NewBACnetConstructedDataIntegerValueLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lowLimit BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIntegerValueLowLimit {
+func NewBACnetConstructedDataIntegerValueLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lowLimit BACnetApplicationTagSignedInteger) *_BACnetConstructedDataIntegerValueLowLimit {
 	if lowLimit == nil {
 		panic("lowLimit of type BACnetApplicationTagSignedInteger for BACnetConstructedDataIntegerValueLowLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataIntegerValueLowLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LowLimit:                      lowLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMaxPresValue.go
index e98ce1bc866..c5f315ba557 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMaxPresValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIntegerValueMaxPresValue = (*_BACnetConstructedDataIn
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIntegerValueMaxPresValue)(nil)
 
 // NewBACnetConstructedDataIntegerValueMaxPresValue factory function for _BACnetConstructedDataIntegerValueMaxPresValue
-func NewBACnetConstructedDataIntegerValueMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIntegerValueMaxPresValue {
+func NewBACnetConstructedDataIntegerValueMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagSignedInteger) *_BACnetConstructedDataIntegerValueMaxPresValue {
 	if maxPresValue == nil {
 		panic("maxPresValue of type BACnetApplicationTagSignedInteger for BACnetConstructedDataIntegerValueMaxPresValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataIntegerValueMaxPresValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxPresValue:                  maxPresValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMinPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMinPresValue.go
index 7beb7ee7908..06836bc8481 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMinPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMinPresValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIntegerValueMinPresValue = (*_BACnetConstructedDataIn
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIntegerValueMinPresValue)(nil)
 
 // NewBACnetConstructedDataIntegerValueMinPresValue factory function for _BACnetConstructedDataIntegerValueMinPresValue
-func NewBACnetConstructedDataIntegerValueMinPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minPresValue BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIntegerValueMinPresValue {
+func NewBACnetConstructedDataIntegerValueMinPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minPresValue BACnetApplicationTagSignedInteger) *_BACnetConstructedDataIntegerValueMinPresValue {
 	if minPresValue == nil {
 		panic("minPresValue of type BACnetApplicationTagSignedInteger for BACnetConstructedDataIntegerValueMinPresValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataIntegerValueMinPresValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MinPresValue:                  minPresValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValuePresentValue.go
index 5e715ad3e59..c050f0e14b4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValuePresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIntegerValuePresentValue = (*_BACnetConstructedDataIn
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIntegerValuePresentValue)(nil)
 
 // NewBACnetConstructedDataIntegerValuePresentValue factory function for _BACnetConstructedDataIntegerValuePresentValue
-func NewBACnetConstructedDataIntegerValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIntegerValuePresentValue {
+func NewBACnetConstructedDataIntegerValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagSignedInteger) *_BACnetConstructedDataIntegerValuePresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagSignedInteger for BACnetConstructedDataIntegerValuePresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataIntegerValuePresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueRelinquishDefault.go
index ddb2f277907..8c395f269f4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIntegerValueRelinquishDefault = (*_BACnetConstructedD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIntegerValueRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataIntegerValueRelinquishDefault factory function for _BACnetConstructedDataIntegerValueRelinquishDefault
-func NewBACnetConstructedDataIntegerValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIntegerValueRelinquishDefault {
+func NewBACnetConstructedDataIntegerValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagSignedInteger) *_BACnetConstructedDataIntegerValueRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagSignedInteger for BACnetConstructedDataIntegerValueRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataIntegerValueRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueResolution.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueResolution.go
index a82fa9baa2a..052008f00b0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueResolution.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueResolution.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIntegerValueResolution = (*_BACnetConstructedDataInte
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIntegerValueResolution)(nil)
 
 // NewBACnetConstructedDataIntegerValueResolution factory function for _BACnetConstructedDataIntegerValueResolution
-func NewBACnetConstructedDataIntegerValueResolution(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, resolution BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIntegerValueResolution {
+func NewBACnetConstructedDataIntegerValueResolution(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, resolution BACnetApplicationTagSignedInteger) *_BACnetConstructedDataIntegerValueResolution {
 	if resolution == nil {
 		panic("resolution of type BACnetApplicationTagSignedInteger for BACnetConstructedDataIntegerValueResolution must not be nil")
 	}
 	_result := &_BACnetConstructedDataIntegerValueResolution{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Resolution:                    resolution,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstant.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstant.go
index 9b449d7bdec..6140d00a570 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstant.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstant.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIntegralConstant = (*_BACnetConstructedDataIntegralCo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIntegralConstant)(nil)
 
 // NewBACnetConstructedDataIntegralConstant factory function for _BACnetConstructedDataIntegralConstant
-func NewBACnetConstructedDataIntegralConstant(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, integralConstant BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIntegralConstant {
+func NewBACnetConstructedDataIntegralConstant(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, integralConstant BACnetApplicationTagReal) *_BACnetConstructedDataIntegralConstant {
 	if integralConstant == nil {
 		panic("integralConstant of type BACnetApplicationTagReal for BACnetConstructedDataIntegralConstant must not be nil")
 	}
 	_result := &_BACnetConstructedDataIntegralConstant{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		IntegralConstant:              integralConstant,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstantUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstantUnits.go
index bda3771da49..d115f8124e1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstantUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstantUnits.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIntegralConstantUnits = (*_BACnetConstructedDataInteg
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIntegralConstantUnits)(nil)
 
 // NewBACnetConstructedDataIntegralConstantUnits factory function for _BACnetConstructedDataIntegralConstantUnits
-func NewBACnetConstructedDataIntegralConstantUnits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, units BACnetEngineeringUnitsTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIntegralConstantUnits {
+func NewBACnetConstructedDataIntegralConstantUnits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, units BACnetEngineeringUnitsTagged) *_BACnetConstructedDataIntegralConstantUnits {
 	if units == nil {
 		panic("units of type BACnetEngineeringUnitsTagged for BACnetConstructedDataIntegralConstantUnits must not be nil")
 	}
 	_result := &_BACnetConstructedDataIntegralConstantUnits{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Units:                         units,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntervalOffset.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntervalOffset.go
index 36b9650a7d1..ef760f1145d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntervalOffset.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntervalOffset.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIntervalOffset = (*_BACnetConstructedDataIntervalOffs
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIntervalOffset)(nil)
 
 // NewBACnetConstructedDataIntervalOffset factory function for _BACnetConstructedDataIntervalOffset
-func NewBACnetConstructedDataIntervalOffset(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, intervalOffset BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIntervalOffset {
+func NewBACnetConstructedDataIntervalOffset(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, intervalOffset BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataIntervalOffset {
 	if intervalOffset == nil {
 		panic("intervalOffset of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataIntervalOffset must not be nil")
 	}
 	_result := &_BACnetConstructedDataIntervalOffset{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		IntervalOffset:                intervalOffset,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIsUTC.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIsUTC.go
index 5317328a843..8bbd44f88d5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIsUTC.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIsUTC.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataIsUTC = (*_BACnetConstructedDataIsUTC)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataIsUTC)(nil)
 
 // NewBACnetConstructedDataIsUTC factory function for _BACnetConstructedDataIsUTC
-func NewBACnetConstructedDataIsUTC(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, isUtc BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataIsUTC {
+func NewBACnetConstructedDataIsUTC(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, isUtc BACnetApplicationTagBoolean) *_BACnetConstructedDataIsUTC {
 	if isUtc == nil {
 		panic("isUtc of type BACnetApplicationTagBoolean for BACnetConstructedDataIsUTC must not be nil")
 	}
 	_result := &_BACnetConstructedDataIsUTC{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		IsUtc:                         isUtc,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataKeySets.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataKeySets.go
index a65d34a2e6b..5356af3c102 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataKeySets.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataKeySets.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataKeySets = (*_BACnetConstructedDataKeySets)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataKeySets)(nil)
 
 // NewBACnetConstructedDataKeySets factory function for _BACnetConstructedDataKeySets
-func NewBACnetConstructedDataKeySets(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, keySets []BACnetSecurityKeySet, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataKeySets {
+func NewBACnetConstructedDataKeySets(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, keySets []BACnetSecurityKeySet) *_BACnetConstructedDataKeySets {
 	_result := &_BACnetConstructedDataKeySets{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		KeySets:                       keySets,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCallControl.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCallControl.go
index 68794ecc00f..95a022c1dea 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCallControl.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCallControl.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLandingCallControl = (*_BACnetConstructedDataLandingC
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLandingCallControl)(nil)
 
 // NewBACnetConstructedDataLandingCallControl factory function for _BACnetConstructedDataLandingCallControl
-func NewBACnetConstructedDataLandingCallControl(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, landingCallControl BACnetLandingCallStatus, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLandingCallControl {
+func NewBACnetConstructedDataLandingCallControl(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, landingCallControl BACnetLandingCallStatus) *_BACnetConstructedDataLandingCallControl {
 	if landingCallControl == nil {
 		panic("landingCallControl of type BACnetLandingCallStatus for BACnetConstructedDataLandingCallControl must not be nil")
 	}
 	_result := &_BACnetConstructedDataLandingCallControl{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LandingCallControl:            landingCallControl,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCalls.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCalls.go
index 6b2d8518b81..90909a0e4e1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCalls.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCalls.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataLandingCalls = (*_BACnetConstructedDataLandingCalls)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLandingCalls)(nil)
 
 // NewBACnetConstructedDataLandingCalls factory function for _BACnetConstructedDataLandingCalls
-func NewBACnetConstructedDataLandingCalls(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, landingCallStatus []BACnetLandingCallStatus, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLandingCalls {
+func NewBACnetConstructedDataLandingCalls(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, landingCallStatus []BACnetLandingCallStatus) *_BACnetConstructedDataLandingCalls {
 	_result := &_BACnetConstructedDataLandingCalls{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LandingCallStatus:             landingCallStatus,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingDoorStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingDoorStatus.go
index 6f92d773d3a..01cf668f496 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingDoorStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingDoorStatus.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataLandingDoorStatus = (*_BACnetConstructedDataLandingDo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLandingDoorStatus)(nil)
 
 // NewBACnetConstructedDataLandingDoorStatus factory function for _BACnetConstructedDataLandingDoorStatus
-func NewBACnetConstructedDataLandingDoorStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, landingDoorStatus []BACnetLandingDoorStatus, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLandingDoorStatus {
+func NewBACnetConstructedDataLandingDoorStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, landingDoorStatus []BACnetLandingDoorStatus) *_BACnetConstructedDataLandingDoorStatus {
 	_result := &_BACnetConstructedDataLandingDoorStatus{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		LandingDoorStatus:             landingDoorStatus,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueAll.go
index 5c690474dfe..770e29816dd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataLargeAnalogValueAll = (*_BACnetConstructedDataLargeAn
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLargeAnalogValueAll)(nil)
 
 // NewBACnetConstructedDataLargeAnalogValueAll factory function for _BACnetConstructedDataLargeAnalogValueAll
-func NewBACnetConstructedDataLargeAnalogValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLargeAnalogValueAll {
+func NewBACnetConstructedDataLargeAnalogValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataLargeAnalogValueAll {
 	_result := &_BACnetConstructedDataLargeAnalogValueAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueCOVIncrement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueCOVIncrement.go
index 8ccb1ed1374..c816aa20a62 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueCOVIncrement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueCOVIncrement.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLargeAnalogValueCOVIncrement = (*_BACnetConstructedDa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLargeAnalogValueCOVIncrement)(nil)
 
 // NewBACnetConstructedDataLargeAnalogValueCOVIncrement factory function for _BACnetConstructedDataLargeAnalogValueCOVIncrement
-func NewBACnetConstructedDataLargeAnalogValueCOVIncrement(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covIncrement BACnetApplicationTagDouble, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLargeAnalogValueCOVIncrement {
+func NewBACnetConstructedDataLargeAnalogValueCOVIncrement(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covIncrement BACnetApplicationTagDouble) *_BACnetConstructedDataLargeAnalogValueCOVIncrement {
 	if covIncrement == nil {
 		panic("covIncrement of type BACnetApplicationTagDouble for BACnetConstructedDataLargeAnalogValueCOVIncrement must not be nil")
 	}
 	_result := &_BACnetConstructedDataLargeAnalogValueCOVIncrement{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CovIncrement:                  covIncrement,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueDeadband.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueDeadband.go
index 5b7e30ff2d5..65674227e73 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueDeadband.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueDeadband.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLargeAnalogValueDeadband = (*_BACnetConstructedDataLa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLargeAnalogValueDeadband)(nil)
 
 // NewBACnetConstructedDataLargeAnalogValueDeadband factory function for _BACnetConstructedDataLargeAnalogValueDeadband
-func NewBACnetConstructedDataLargeAnalogValueDeadband(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, deadband BACnetApplicationTagDouble, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLargeAnalogValueDeadband {
+func NewBACnetConstructedDataLargeAnalogValueDeadband(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, deadband BACnetApplicationTagDouble) *_BACnetConstructedDataLargeAnalogValueDeadband {
 	if deadband == nil {
 		panic("deadband of type BACnetApplicationTagDouble for BACnetConstructedDataLargeAnalogValueDeadband must not be nil")
 	}
 	_result := &_BACnetConstructedDataLargeAnalogValueDeadband{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Deadband:                      deadband,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultHighLimit.go
index 448c788f1f3..bbfad253192 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultHighLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLargeAnalogValueFaultHighLimit = (*_BACnetConstructed
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLargeAnalogValueFaultHighLimit)(nil)
 
 // NewBACnetConstructedDataLargeAnalogValueFaultHighLimit factory function for _BACnetConstructedDataLargeAnalogValueFaultHighLimit
-func NewBACnetConstructedDataLargeAnalogValueFaultHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultHighLimit BACnetApplicationTagDouble, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLargeAnalogValueFaultHighLimit {
+func NewBACnetConstructedDataLargeAnalogValueFaultHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultHighLimit BACnetApplicationTagDouble) *_BACnetConstructedDataLargeAnalogValueFaultHighLimit {
 	if faultHighLimit == nil {
 		panic("faultHighLimit of type BACnetApplicationTagDouble for BACnetConstructedDataLargeAnalogValueFaultHighLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataLargeAnalogValueFaultHighLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultHighLimit:                faultHighLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultLowLimit.go
index d02c4929cf6..52303b159ec 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultLowLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLargeAnalogValueFaultLowLimit = (*_BACnetConstructedD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLargeAnalogValueFaultLowLimit)(nil)
 
 // NewBACnetConstructedDataLargeAnalogValueFaultLowLimit factory function for _BACnetConstructedDataLargeAnalogValueFaultLowLimit
-func NewBACnetConstructedDataLargeAnalogValueFaultLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultLowLimit BACnetApplicationTagDouble, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLargeAnalogValueFaultLowLimit {
+func NewBACnetConstructedDataLargeAnalogValueFaultLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultLowLimit BACnetApplicationTagDouble) *_BACnetConstructedDataLargeAnalogValueFaultLowLimit {
 	if faultLowLimit == nil {
 		panic("faultLowLimit of type BACnetApplicationTagDouble for BACnetConstructedDataLargeAnalogValueFaultLowLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataLargeAnalogValueFaultLowLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultLowLimit:                 faultLowLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueHighLimit.go
index f418ad4fcaf..070a042e096 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueHighLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLargeAnalogValueHighLimit = (*_BACnetConstructedDataL
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLargeAnalogValueHighLimit)(nil)
 
 // NewBACnetConstructedDataLargeAnalogValueHighLimit factory function for _BACnetConstructedDataLargeAnalogValueHighLimit
-func NewBACnetConstructedDataLargeAnalogValueHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, highLimit BACnetApplicationTagDouble, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLargeAnalogValueHighLimit {
+func NewBACnetConstructedDataLargeAnalogValueHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, highLimit BACnetApplicationTagDouble) *_BACnetConstructedDataLargeAnalogValueHighLimit {
 	if highLimit == nil {
 		panic("highLimit of type BACnetApplicationTagDouble for BACnetConstructedDataLargeAnalogValueHighLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataLargeAnalogValueHighLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		HighLimit:                     highLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueLowLimit.go
index 31320b7a4c9..be45fe5c767 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueLowLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLargeAnalogValueLowLimit = (*_BACnetConstructedDataLa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLargeAnalogValueLowLimit)(nil)
 
 // NewBACnetConstructedDataLargeAnalogValueLowLimit factory function for _BACnetConstructedDataLargeAnalogValueLowLimit
-func NewBACnetConstructedDataLargeAnalogValueLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lowLimit BACnetApplicationTagDouble, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLargeAnalogValueLowLimit {
+func NewBACnetConstructedDataLargeAnalogValueLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lowLimit BACnetApplicationTagDouble) *_BACnetConstructedDataLargeAnalogValueLowLimit {
 	if lowLimit == nil {
 		panic("lowLimit of type BACnetApplicationTagDouble for BACnetConstructedDataLargeAnalogValueLowLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataLargeAnalogValueLowLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LowLimit:                      lowLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMaxPresValue.go
index 3ecae1bafe7..a19132004c8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMaxPresValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLargeAnalogValueMaxPresValue = (*_BACnetConstructedDa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLargeAnalogValueMaxPresValue)(nil)
 
 // NewBACnetConstructedDataLargeAnalogValueMaxPresValue factory function for _BACnetConstructedDataLargeAnalogValueMaxPresValue
-func NewBACnetConstructedDataLargeAnalogValueMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagDouble, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLargeAnalogValueMaxPresValue {
+func NewBACnetConstructedDataLargeAnalogValueMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagDouble) *_BACnetConstructedDataLargeAnalogValueMaxPresValue {
 	if maxPresValue == nil {
 		panic("maxPresValue of type BACnetApplicationTagDouble for BACnetConstructedDataLargeAnalogValueMaxPresValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataLargeAnalogValueMaxPresValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxPresValue:                  maxPresValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMinPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMinPresValue.go
index 1b8d6d9113d..9f146adf85f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMinPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMinPresValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLargeAnalogValueMinPresValue = (*_BACnetConstructedDa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLargeAnalogValueMinPresValue)(nil)
 
 // NewBACnetConstructedDataLargeAnalogValueMinPresValue factory function for _BACnetConstructedDataLargeAnalogValueMinPresValue
-func NewBACnetConstructedDataLargeAnalogValueMinPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minPresValue BACnetApplicationTagDouble, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLargeAnalogValueMinPresValue {
+func NewBACnetConstructedDataLargeAnalogValueMinPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minPresValue BACnetApplicationTagDouble) *_BACnetConstructedDataLargeAnalogValueMinPresValue {
 	if minPresValue == nil {
 		panic("minPresValue of type BACnetApplicationTagDouble for BACnetConstructedDataLargeAnalogValueMinPresValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataLargeAnalogValueMinPresValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MinPresValue:                  minPresValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValuePresentValue.go
index cf42dd1d206..93e29b9679d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValuePresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLargeAnalogValuePresentValue = (*_BACnetConstructedDa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLargeAnalogValuePresentValue)(nil)
 
 // NewBACnetConstructedDataLargeAnalogValuePresentValue factory function for _BACnetConstructedDataLargeAnalogValuePresentValue
-func NewBACnetConstructedDataLargeAnalogValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagDouble, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLargeAnalogValuePresentValue {
+func NewBACnetConstructedDataLargeAnalogValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagDouble) *_BACnetConstructedDataLargeAnalogValuePresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagDouble for BACnetConstructedDataLargeAnalogValuePresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataLargeAnalogValuePresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueRelinquishDefault.go
index 1e85ea077a7..91426e8add3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLargeAnalogValueRelinquishDefault = (*_BACnetConstruc
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLargeAnalogValueRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataLargeAnalogValueRelinquishDefault factory function for _BACnetConstructedDataLargeAnalogValueRelinquishDefault
-func NewBACnetConstructedDataLargeAnalogValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagDouble, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLargeAnalogValueRelinquishDefault {
+func NewBACnetConstructedDataLargeAnalogValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagDouble) *_BACnetConstructedDataLargeAnalogValueRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagDouble for BACnetConstructedDataLargeAnalogValueRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataLargeAnalogValueRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueResolution.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueResolution.go
index 51d718f46ee..90727fd15e1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueResolution.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueResolution.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLargeAnalogValueResolution = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLargeAnalogValueResolution)(nil)
 
 // NewBACnetConstructedDataLargeAnalogValueResolution factory function for _BACnetConstructedDataLargeAnalogValueResolution
-func NewBACnetConstructedDataLargeAnalogValueResolution(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, resolution BACnetApplicationTagDouble, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLargeAnalogValueResolution {
+func NewBACnetConstructedDataLargeAnalogValueResolution(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, resolution BACnetApplicationTagDouble) *_BACnetConstructedDataLargeAnalogValueResolution {
 	if resolution == nil {
 		panic("resolution of type BACnetApplicationTagDouble for BACnetConstructedDataLargeAnalogValueResolution must not be nil")
 	}
 	_result := &_BACnetConstructedDataLargeAnalogValueResolution{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Resolution:                    resolution,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessEvent.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessEvent.go
index b4b7a6735f8..3dde6e0221d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessEvent.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessEvent.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLastAccessEvent = (*_BACnetConstructedDataLastAccessE
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLastAccessEvent)(nil)
 
 // NewBACnetConstructedDataLastAccessEvent factory function for _BACnetConstructedDataLastAccessEvent
-func NewBACnetConstructedDataLastAccessEvent(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastAccessEvent BACnetAccessEventTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLastAccessEvent {
+func NewBACnetConstructedDataLastAccessEvent(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastAccessEvent BACnetAccessEventTagged) *_BACnetConstructedDataLastAccessEvent {
 	if lastAccessEvent == nil {
 		panic("lastAccessEvent of type BACnetAccessEventTagged for BACnetConstructedDataLastAccessEvent must not be nil")
 	}
 	_result := &_BACnetConstructedDataLastAccessEvent{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LastAccessEvent:               lastAccessEvent,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessPoint.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessPoint.go
index e7bc91c3a7c..7b26b010630 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessPoint.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessPoint.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLastAccessPoint = (*_BACnetConstructedDataLastAccessP
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLastAccessPoint)(nil)
 
 // NewBACnetConstructedDataLastAccessPoint factory function for _BACnetConstructedDataLastAccessPoint
-func NewBACnetConstructedDataLastAccessPoint(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastAccessPoint BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLastAccessPoint {
+func NewBACnetConstructedDataLastAccessPoint(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastAccessPoint BACnetDeviceObjectReference) *_BACnetConstructedDataLastAccessPoint {
 	if lastAccessPoint == nil {
 		panic("lastAccessPoint of type BACnetDeviceObjectReference for BACnetConstructedDataLastAccessPoint must not be nil")
 	}
 	_result := &_BACnetConstructedDataLastAccessPoint{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LastAccessPoint:               lastAccessPoint,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCommandTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCommandTime.go
index aebd126cdb7..eea70d92890 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCommandTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCommandTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLastCommandTime = (*_BACnetConstructedDataLastCommand
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLastCommandTime)(nil)
 
 // NewBACnetConstructedDataLastCommandTime factory function for _BACnetConstructedDataLastCommandTime
-func NewBACnetConstructedDataLastCommandTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastCommandTime BACnetTimeStamp, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLastCommandTime {
+func NewBACnetConstructedDataLastCommandTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastCommandTime BACnetTimeStamp) *_BACnetConstructedDataLastCommandTime {
 	if lastCommandTime == nil {
 		panic("lastCommandTime of type BACnetTimeStamp for BACnetConstructedDataLastCommandTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataLastCommandTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LastCommandTime:               lastCommandTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAdded.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAdded.go
index ccdd768bef9..cf7a4dce0b5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAdded.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAdded.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLastCredentialAdded = (*_BACnetConstructedDataLastCre
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLastCredentialAdded)(nil)
 
 // NewBACnetConstructedDataLastCredentialAdded factory function for _BACnetConstructedDataLastCredentialAdded
-func NewBACnetConstructedDataLastCredentialAdded(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastCredentialAdded BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLastCredentialAdded {
+func NewBACnetConstructedDataLastCredentialAdded(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastCredentialAdded BACnetDeviceObjectReference) *_BACnetConstructedDataLastCredentialAdded {
 	if lastCredentialAdded == nil {
 		panic("lastCredentialAdded of type BACnetDeviceObjectReference for BACnetConstructedDataLastCredentialAdded must not be nil")
 	}
 	_result := &_BACnetConstructedDataLastCredentialAdded{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LastCredentialAdded:           lastCredentialAdded,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAddedTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAddedTime.go
index a109341a7b2..576a99b50a4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAddedTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAddedTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLastCredentialAddedTime = (*_BACnetConstructedDataLas
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLastCredentialAddedTime)(nil)
 
 // NewBACnetConstructedDataLastCredentialAddedTime factory function for _BACnetConstructedDataLastCredentialAddedTime
-func NewBACnetConstructedDataLastCredentialAddedTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastCredentialAddedTime BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLastCredentialAddedTime {
+func NewBACnetConstructedDataLastCredentialAddedTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastCredentialAddedTime BACnetDateTime) *_BACnetConstructedDataLastCredentialAddedTime {
 	if lastCredentialAddedTime == nil {
 		panic("lastCredentialAddedTime of type BACnetDateTime for BACnetConstructedDataLastCredentialAddedTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataLastCredentialAddedTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LastCredentialAddedTime:       lastCredentialAddedTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemoved.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemoved.go
index 21336cfd52d..3a70fd12c61 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemoved.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemoved.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLastCredentialRemoved = (*_BACnetConstructedDataLastC
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLastCredentialRemoved)(nil)
 
 // NewBACnetConstructedDataLastCredentialRemoved factory function for _BACnetConstructedDataLastCredentialRemoved
-func NewBACnetConstructedDataLastCredentialRemoved(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastCredentialRemoved BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLastCredentialRemoved {
+func NewBACnetConstructedDataLastCredentialRemoved(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastCredentialRemoved BACnetDeviceObjectReference) *_BACnetConstructedDataLastCredentialRemoved {
 	if lastCredentialRemoved == nil {
 		panic("lastCredentialRemoved of type BACnetDeviceObjectReference for BACnetConstructedDataLastCredentialRemoved must not be nil")
 	}
 	_result := &_BACnetConstructedDataLastCredentialRemoved{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LastCredentialRemoved:         lastCredentialRemoved,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemovedTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemovedTime.go
index 4e841b87575..9b0a8b8d6df 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemovedTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemovedTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLastCredentialRemovedTime = (*_BACnetConstructedDataL
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLastCredentialRemovedTime)(nil)
 
 // NewBACnetConstructedDataLastCredentialRemovedTime factory function for _BACnetConstructedDataLastCredentialRemovedTime
-func NewBACnetConstructedDataLastCredentialRemovedTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastCredentialRemovedTime BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLastCredentialRemovedTime {
+func NewBACnetConstructedDataLastCredentialRemovedTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastCredentialRemovedTime BACnetDateTime) *_BACnetConstructedDataLastCredentialRemovedTime {
 	if lastCredentialRemovedTime == nil {
 		panic("lastCredentialRemovedTime of type BACnetDateTime for BACnetConstructedDataLastCredentialRemovedTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataLastCredentialRemovedTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LastCredentialRemovedTime:     lastCredentialRemovedTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastKeyServer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastKeyServer.go
index 0a69110e019..74a8f9c77c9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastKeyServer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastKeyServer.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLastKeyServer = (*_BACnetConstructedDataLastKeyServer
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLastKeyServer)(nil)
 
 // NewBACnetConstructedDataLastKeyServer factory function for _BACnetConstructedDataLastKeyServer
-func NewBACnetConstructedDataLastKeyServer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastKeyServer BACnetAddressBinding, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLastKeyServer {
+func NewBACnetConstructedDataLastKeyServer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastKeyServer BACnetAddressBinding) *_BACnetConstructedDataLastKeyServer {
 	if lastKeyServer == nil {
 		panic("lastKeyServer of type BACnetAddressBinding for BACnetConstructedDataLastKeyServer must not be nil")
 	}
 	_result := &_BACnetConstructedDataLastKeyServer{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LastKeyServer:                 lastKeyServer,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastNotifyRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastNotifyRecord.go
index c63d91a09d6..3e9f0778722 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastNotifyRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastNotifyRecord.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLastNotifyRecord = (*_BACnetConstructedDataLastNotify
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLastNotifyRecord)(nil)
 
 // NewBACnetConstructedDataLastNotifyRecord factory function for _BACnetConstructedDataLastNotifyRecord
-func NewBACnetConstructedDataLastNotifyRecord(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastNotifyRecord BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLastNotifyRecord {
+func NewBACnetConstructedDataLastNotifyRecord(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastNotifyRecord BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataLastNotifyRecord {
 	if lastNotifyRecord == nil {
 		panic("lastNotifyRecord of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataLastNotifyRecord must not be nil")
 	}
 	_result := &_BACnetConstructedDataLastNotifyRecord{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LastNotifyRecord:              lastNotifyRecord,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastPriority.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastPriority.go
index f581382deff..ed165cf820d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastPriority.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastPriority.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLastPriority = (*_BACnetConstructedDataLastPriority)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLastPriority)(nil)
 
 // NewBACnetConstructedDataLastPriority factory function for _BACnetConstructedDataLastPriority
-func NewBACnetConstructedDataLastPriority(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastPriority BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLastPriority {
+func NewBACnetConstructedDataLastPriority(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastPriority BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataLastPriority {
 	if lastPriority == nil {
 		panic("lastPriority of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataLastPriority must not be nil")
 	}
 	_result := &_BACnetConstructedDataLastPriority{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LastPriority:                  lastPriority,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestartReason.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestartReason.go
index bc79b5a51e6..8ac4450dee4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestartReason.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestartReason.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLastRestartReason = (*_BACnetConstructedDataLastResta
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLastRestartReason)(nil)
 
 // NewBACnetConstructedDataLastRestartReason factory function for _BACnetConstructedDataLastRestartReason
-func NewBACnetConstructedDataLastRestartReason(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastRestartReason BACnetRestartReasonTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLastRestartReason {
+func NewBACnetConstructedDataLastRestartReason(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastRestartReason BACnetRestartReasonTagged) *_BACnetConstructedDataLastRestartReason {
 	if lastRestartReason == nil {
 		panic("lastRestartReason of type BACnetRestartReasonTagged for BACnetConstructedDataLastRestartReason must not be nil")
 	}
 	_result := &_BACnetConstructedDataLastRestartReason{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LastRestartReason:             lastRestartReason,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestoreTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestoreTime.go
index d0373b00707..a71c00a8c43 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestoreTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestoreTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLastRestoreTime = (*_BACnetConstructedDataLastRestore
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLastRestoreTime)(nil)
 
 // NewBACnetConstructedDataLastRestoreTime factory function for _BACnetConstructedDataLastRestoreTime
-func NewBACnetConstructedDataLastRestoreTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastRestoreTime BACnetTimeStamp, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLastRestoreTime {
+func NewBACnetConstructedDataLastRestoreTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastRestoreTime BACnetTimeStamp) *_BACnetConstructedDataLastRestoreTime {
 	if lastRestoreTime == nil {
 		panic("lastRestoreTime of type BACnetTimeStamp for BACnetConstructedDataLastRestoreTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataLastRestoreTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LastRestoreTime:               lastRestoreTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastStateChange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastStateChange.go
index d531c3a4673..36df4b8b40c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastStateChange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastStateChange.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLastStateChange = (*_BACnetConstructedDataLastStateCh
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLastStateChange)(nil)
 
 // NewBACnetConstructedDataLastStateChange factory function for _BACnetConstructedDataLastStateChange
-func NewBACnetConstructedDataLastStateChange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastStateChange BACnetTimerTransitionTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLastStateChange {
+func NewBACnetConstructedDataLastStateChange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastStateChange BACnetTimerTransitionTagged) *_BACnetConstructedDataLastStateChange {
 	if lastStateChange == nil {
 		panic("lastStateChange of type BACnetTimerTransitionTagged for BACnetConstructedDataLastStateChange must not be nil")
 	}
 	_result := &_BACnetConstructedDataLastStateChange{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LastStateChange:               lastStateChange,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastUseTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastUseTime.go
index 5233f06603d..1a2359d2d56 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastUseTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastUseTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLastUseTime = (*_BACnetConstructedDataLastUseTime)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLastUseTime)(nil)
 
 // NewBACnetConstructedDataLastUseTime factory function for _BACnetConstructedDataLastUseTime
-func NewBACnetConstructedDataLastUseTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastUseTime BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLastUseTime {
+func NewBACnetConstructedDataLastUseTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lastUseTime BACnetDateTime) *_BACnetConstructedDataLastUseTime {
 	if lastUseTime == nil {
 		panic("lastUseTime of type BACnetDateTime for BACnetConstructedDataLastUseTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataLastUseTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LastUseTime:                   lastUseTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyAlarmValues.go
index b4250f39aa0..deb283e2790 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyAlarmValues.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataLifeSafetyAlarmValues = (*_BACnetConstructedDataLifeS
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLifeSafetyAlarmValues)(nil)
 
 // NewBACnetConstructedDataLifeSafetyAlarmValues factory function for _BACnetConstructedDataLifeSafetyAlarmValues
-func NewBACnetConstructedDataLifeSafetyAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetLifeSafetyStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLifeSafetyAlarmValues {
+func NewBACnetConstructedDataLifeSafetyAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetLifeSafetyStateTagged) *_BACnetConstructedDataLifeSafetyAlarmValues {
 	_result := &_BACnetConstructedDataLifeSafetyAlarmValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AlarmValues:                   alarmValues,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAlarmValues.go
index fe25bdc36d1..216070a8951 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAlarmValues.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataLifeSafetyPointAlarmValues = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLifeSafetyPointAlarmValues)(nil)
 
 // NewBACnetConstructedDataLifeSafetyPointAlarmValues factory function for _BACnetConstructedDataLifeSafetyPointAlarmValues
-func NewBACnetConstructedDataLifeSafetyPointAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetLifeSafetyStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLifeSafetyPointAlarmValues {
+func NewBACnetConstructedDataLifeSafetyPointAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetLifeSafetyStateTagged) *_BACnetConstructedDataLifeSafetyPointAlarmValues {
 	_result := &_BACnetConstructedDataLifeSafetyPointAlarmValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AlarmValues:                   alarmValues,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAll.go
index e79d5a238ae..a5600b711ff 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataLifeSafetyPointAll = (*_BACnetConstructedDataLifeSafe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLifeSafetyPointAll)(nil)
 
 // NewBACnetConstructedDataLifeSafetyPointAll factory function for _BACnetConstructedDataLifeSafetyPointAll
-func NewBACnetConstructedDataLifeSafetyPointAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLifeSafetyPointAll {
+func NewBACnetConstructedDataLifeSafetyPointAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataLifeSafetyPointAll {
 	_result := &_BACnetConstructedDataLifeSafetyPointAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointFaultValues.go
index 68354148e81..181167e7f8d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointFaultValues.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataLifeSafetyPointFaultValues = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLifeSafetyPointFaultValues)(nil)
 
 // NewBACnetConstructedDataLifeSafetyPointFaultValues factory function for _BACnetConstructedDataLifeSafetyPointFaultValues
-func NewBACnetConstructedDataLifeSafetyPointFaultValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultValues []BACnetLifeSafetyStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLifeSafetyPointFaultValues {
+func NewBACnetConstructedDataLifeSafetyPointFaultValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultValues []BACnetLifeSafetyStateTagged) *_BACnetConstructedDataLifeSafetyPointFaultValues {
 	_result := &_BACnetConstructedDataLifeSafetyPointFaultValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultValues:                   faultValues,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointPresentValue.go
index 08fb8d25f60..07bd022ace7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLifeSafetyPointPresentValue = (*_BACnetConstructedDat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLifeSafetyPointPresentValue)(nil)
 
 // NewBACnetConstructedDataLifeSafetyPointPresentValue factory function for _BACnetConstructedDataLifeSafetyPointPresentValue
-func NewBACnetConstructedDataLifeSafetyPointPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetLifeSafetyStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLifeSafetyPointPresentValue {
+func NewBACnetConstructedDataLifeSafetyPointPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetLifeSafetyStateTagged) *_BACnetConstructedDataLifeSafetyPointPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetLifeSafetyStateTagged for BACnetConstructedDataLifeSafetyPointPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataLifeSafetyPointPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAlarmValues.go
index 97e858ce12d..9215074ed35 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAlarmValues.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataLifeSafetyZoneAlarmValues = (*_BACnetConstructedDataL
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLifeSafetyZoneAlarmValues)(nil)
 
 // NewBACnetConstructedDataLifeSafetyZoneAlarmValues factory function for _BACnetConstructedDataLifeSafetyZoneAlarmValues
-func NewBACnetConstructedDataLifeSafetyZoneAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetLifeSafetyStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLifeSafetyZoneAlarmValues {
+func NewBACnetConstructedDataLifeSafetyZoneAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetLifeSafetyStateTagged) *_BACnetConstructedDataLifeSafetyZoneAlarmValues {
 	_result := &_BACnetConstructedDataLifeSafetyZoneAlarmValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AlarmValues:                   alarmValues,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAll.go
index e24d349fb78..3c6c68834c6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataLifeSafetyZoneAll = (*_BACnetConstructedDataLifeSafet
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLifeSafetyZoneAll)(nil)
 
 // NewBACnetConstructedDataLifeSafetyZoneAll factory function for _BACnetConstructedDataLifeSafetyZoneAll
-func NewBACnetConstructedDataLifeSafetyZoneAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLifeSafetyZoneAll {
+func NewBACnetConstructedDataLifeSafetyZoneAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataLifeSafetyZoneAll {
 	_result := &_BACnetConstructedDataLifeSafetyZoneAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneFaultValues.go
index f25a825e594..9a9ff0b544a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneFaultValues.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataLifeSafetyZoneFaultValues = (*_BACnetConstructedDataL
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLifeSafetyZoneFaultValues)(nil)
 
 // NewBACnetConstructedDataLifeSafetyZoneFaultValues factory function for _BACnetConstructedDataLifeSafetyZoneFaultValues
-func NewBACnetConstructedDataLifeSafetyZoneFaultValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultValues []BACnetLifeSafetyStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLifeSafetyZoneFaultValues {
+func NewBACnetConstructedDataLifeSafetyZoneFaultValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultValues []BACnetLifeSafetyStateTagged) *_BACnetConstructedDataLifeSafetyZoneFaultValues {
 	_result := &_BACnetConstructedDataLifeSafetyZoneFaultValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultValues:                   faultValues,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneMaintenanceRequired.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneMaintenanceRequired.go
index 4ce1b744aca..01ce507106b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneMaintenanceRequired.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneMaintenanceRequired.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLifeSafetyZoneMaintenanceRequired = (*_BACnetConstruc
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLifeSafetyZoneMaintenanceRequired)(nil)
 
 // NewBACnetConstructedDataLifeSafetyZoneMaintenanceRequired factory function for _BACnetConstructedDataLifeSafetyZoneMaintenanceRequired
-func NewBACnetConstructedDataLifeSafetyZoneMaintenanceRequired(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maintenanceRequired BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLifeSafetyZoneMaintenanceRequired {
+func NewBACnetConstructedDataLifeSafetyZoneMaintenanceRequired(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maintenanceRequired BACnetApplicationTagBoolean) *_BACnetConstructedDataLifeSafetyZoneMaintenanceRequired {
 	if maintenanceRequired == nil {
 		panic("maintenanceRequired of type BACnetApplicationTagBoolean for BACnetConstructedDataLifeSafetyZoneMaintenanceRequired must not be nil")
 	}
 	_result := &_BACnetConstructedDataLifeSafetyZoneMaintenanceRequired{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaintenanceRequired:           maintenanceRequired,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZonePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZonePresentValue.go
index 96dd71578f7..691e48dc2dd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZonePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZonePresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLifeSafetyZonePresentValue = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLifeSafetyZonePresentValue)(nil)
 
 // NewBACnetConstructedDataLifeSafetyZonePresentValue factory function for _BACnetConstructedDataLifeSafetyZonePresentValue
-func NewBACnetConstructedDataLifeSafetyZonePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetLifeSafetyStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLifeSafetyZonePresentValue {
+func NewBACnetConstructedDataLifeSafetyZonePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetLifeSafetyStateTagged) *_BACnetConstructedDataLifeSafetyZonePresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetLifeSafetyStateTagged for BACnetConstructedDataLifeSafetyZonePresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataLifeSafetyZonePresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftAll.go
index f4eb5c6a3c6..511abfc9cb1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataLiftAll = (*_BACnetConstructedDataLiftAll)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLiftAll)(nil)
 
 // NewBACnetConstructedDataLiftAll factory function for _BACnetConstructedDataLiftAll
-func NewBACnetConstructedDataLiftAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLiftAll {
+func NewBACnetConstructedDataLiftAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataLiftAll {
 	_result := &_BACnetConstructedDataLiftAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftFaultSignals.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftFaultSignals.go
index 6223b42f220..3124df94aa4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftFaultSignals.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftFaultSignals.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataLiftFaultSignals = (*_BACnetConstructedDataLiftFaultS
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLiftFaultSignals)(nil)
 
 // NewBACnetConstructedDataLiftFaultSignals factory function for _BACnetConstructedDataLiftFaultSignals
-func NewBACnetConstructedDataLiftFaultSignals(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultSignals []BACnetLiftFaultTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLiftFaultSignals {
+func NewBACnetConstructedDataLiftFaultSignals(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultSignals []BACnetLiftFaultTagged) *_BACnetConstructedDataLiftFaultSignals {
 	_result := &_BACnetConstructedDataLiftFaultSignals{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultSignals:                  faultSignals,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommand.go
index 0af4946035e..060a7fd90da 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommand.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLightingCommand = (*_BACnetConstructedDataLightingCom
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLightingCommand)(nil)
 
 // NewBACnetConstructedDataLightingCommand factory function for _BACnetConstructedDataLightingCommand
-func NewBACnetConstructedDataLightingCommand(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lightingCommand BACnetLightingCommand, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLightingCommand {
+func NewBACnetConstructedDataLightingCommand(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lightingCommand BACnetLightingCommand) *_BACnetConstructedDataLightingCommand {
 	if lightingCommand == nil {
 		panic("lightingCommand of type BACnetLightingCommand for BACnetConstructedDataLightingCommand must not be nil")
 	}
 	_result := &_BACnetConstructedDataLightingCommand{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LightingCommand:               lightingCommand,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommandDefaultPriority.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommandDefaultPriority.go
index 72e39bd0955..ce9599411c7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommandDefaultPriority.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommandDefaultPriority.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLightingCommandDefaultPriority = (*_BACnetConstructed
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLightingCommandDefaultPriority)(nil)
 
 // NewBACnetConstructedDataLightingCommandDefaultPriority factory function for _BACnetConstructedDataLightingCommandDefaultPriority
-func NewBACnetConstructedDataLightingCommandDefaultPriority(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lightingCommandDefaultPriority BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLightingCommandDefaultPriority {
+func NewBACnetConstructedDataLightingCommandDefaultPriority(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lightingCommandDefaultPriority BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataLightingCommandDefaultPriority {
 	if lightingCommandDefaultPriority == nil {
 		panic("lightingCommandDefaultPriority of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataLightingCommandDefaultPriority must not be nil")
 	}
 	_result := &_BACnetConstructedDataLightingCommandDefaultPriority{
-		BACnetConstructedDataContract:  NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract:  NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LightingCommandDefaultPriority: lightingCommandDefaultPriority,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputAll.go
index 964c8c28648..cbd3ef45c51 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataLightingOutputAll = (*_BACnetConstructedDataLightingO
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLightingOutputAll)(nil)
 
 // NewBACnetConstructedDataLightingOutputAll factory function for _BACnetConstructedDataLightingOutputAll
-func NewBACnetConstructedDataLightingOutputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLightingOutputAll {
+func NewBACnetConstructedDataLightingOutputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataLightingOutputAll {
 	_result := &_BACnetConstructedDataLightingOutputAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputFeedbackValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputFeedbackValue.go
index 3419b20fd84..a9d3e89a280 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputFeedbackValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputFeedbackValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLightingOutputFeedbackValue = (*_BACnetConstructedDat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLightingOutputFeedbackValue)(nil)
 
 // NewBACnetConstructedDataLightingOutputFeedbackValue factory function for _BACnetConstructedDataLightingOutputFeedbackValue
-func NewBACnetConstructedDataLightingOutputFeedbackValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, feedbackValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLightingOutputFeedbackValue {
+func NewBACnetConstructedDataLightingOutputFeedbackValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, feedbackValue BACnetApplicationTagReal) *_BACnetConstructedDataLightingOutputFeedbackValue {
 	if feedbackValue == nil {
 		panic("feedbackValue of type BACnetApplicationTagReal for BACnetConstructedDataLightingOutputFeedbackValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataLightingOutputFeedbackValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FeedbackValue:                 feedbackValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputPresentValue.go
index 14da6017f75..a38be93ec82 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLightingOutputPresentValue = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLightingOutputPresentValue)(nil)
 
 // NewBACnetConstructedDataLightingOutputPresentValue factory function for _BACnetConstructedDataLightingOutputPresentValue
-func NewBACnetConstructedDataLightingOutputPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLightingOutputPresentValue {
+func NewBACnetConstructedDataLightingOutputPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagReal) *_BACnetConstructedDataLightingOutputPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagReal for BACnetConstructedDataLightingOutputPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataLightingOutputPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputRelinquishDefault.go
index 8475bb00c49..7b0813fc20f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLightingOutputRelinquishDefault = (*_BACnetConstructe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLightingOutputRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataLightingOutputRelinquishDefault factory function for _BACnetConstructedDataLightingOutputRelinquishDefault
-func NewBACnetConstructedDataLightingOutputRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLightingOutputRelinquishDefault {
+func NewBACnetConstructedDataLightingOutputRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagReal) *_BACnetConstructedDataLightingOutputRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagReal for BACnetConstructedDataLightingOutputRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataLightingOutputRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputTrackingValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputTrackingValue.go
index 479ab63d44e..d0532cfdce6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputTrackingValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputTrackingValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLightingOutputTrackingValue = (*_BACnetConstructedDat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLightingOutputTrackingValue)(nil)
 
 // NewBACnetConstructedDataLightingOutputTrackingValue factory function for _BACnetConstructedDataLightingOutputTrackingValue
-func NewBACnetConstructedDataLightingOutputTrackingValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, trackingValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLightingOutputTrackingValue {
+func NewBACnetConstructedDataLightingOutputTrackingValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, trackingValue BACnetApplicationTagReal) *_BACnetConstructedDataLightingOutputTrackingValue {
 	if trackingValue == nil {
 		panic("trackingValue of type BACnetApplicationTagReal for BACnetConstructedDataLightingOutputTrackingValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataLightingOutputTrackingValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		TrackingValue:                 trackingValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitEnable.go
index 9d7d032b14d..8415c4bce5a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitEnable.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLimitEnable = (*_BACnetConstructedDataLimitEnable)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLimitEnable)(nil)
 
 // NewBACnetConstructedDataLimitEnable factory function for _BACnetConstructedDataLimitEnable
-func NewBACnetConstructedDataLimitEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, limitEnable BACnetLimitEnableTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLimitEnable {
+func NewBACnetConstructedDataLimitEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, limitEnable BACnetLimitEnableTagged) *_BACnetConstructedDataLimitEnable {
 	if limitEnable == nil {
 		panic("limitEnable of type BACnetLimitEnableTagged for BACnetConstructedDataLimitEnable must not be nil")
 	}
 	_result := &_BACnetConstructedDataLimitEnable{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LimitEnable:                   limitEnable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitMonitoringInterval.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitMonitoringInterval.go
index 2f545757445..80e7bc285cc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitMonitoringInterval.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitMonitoringInterval.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLimitMonitoringInterval = (*_BACnetConstructedDataLim
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLimitMonitoringInterval)(nil)
 
 // NewBACnetConstructedDataLimitMonitoringInterval factory function for _BACnetConstructedDataLimitMonitoringInterval
-func NewBACnetConstructedDataLimitMonitoringInterval(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, limitMonitoringInterval BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLimitMonitoringInterval {
+func NewBACnetConstructedDataLimitMonitoringInterval(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, limitMonitoringInterval BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataLimitMonitoringInterval {
 	if limitMonitoringInterval == nil {
 		panic("limitMonitoringInterval of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataLimitMonitoringInterval must not be nil")
 	}
 	_result := &_BACnetConstructedDataLimitMonitoringInterval{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LimitMonitoringInterval:       limitMonitoringInterval,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeed.go
index 2e9a97a413a..b500aa78e72 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeed.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLinkSpeed = (*_BACnetConstructedDataLinkSpeed)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLinkSpeed)(nil)
 
 // NewBACnetConstructedDataLinkSpeed factory function for _BACnetConstructedDataLinkSpeed
-func NewBACnetConstructedDataLinkSpeed(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, linkSpeed BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLinkSpeed {
+func NewBACnetConstructedDataLinkSpeed(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, linkSpeed BACnetApplicationTagReal) *_BACnetConstructedDataLinkSpeed {
 	if linkSpeed == nil {
 		panic("linkSpeed of type BACnetApplicationTagReal for BACnetConstructedDataLinkSpeed must not be nil")
 	}
 	_result := &_BACnetConstructedDataLinkSpeed{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LinkSpeed:                     linkSpeed,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeedAutonegotiate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeedAutonegotiate.go
index 91ee7d1cdfc..c2c9020d979 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeedAutonegotiate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeedAutonegotiate.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLinkSpeedAutonegotiate = (*_BACnetConstructedDataLink
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLinkSpeedAutonegotiate)(nil)
 
 // NewBACnetConstructedDataLinkSpeedAutonegotiate factory function for _BACnetConstructedDataLinkSpeedAutonegotiate
-func NewBACnetConstructedDataLinkSpeedAutonegotiate(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, linkSpeedAutonegotiate BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLinkSpeedAutonegotiate {
+func NewBACnetConstructedDataLinkSpeedAutonegotiate(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, linkSpeedAutonegotiate BACnetApplicationTagBoolean) *_BACnetConstructedDataLinkSpeedAutonegotiate {
 	if linkSpeedAutonegotiate == nil {
 		panic("linkSpeedAutonegotiate of type BACnetApplicationTagBoolean for BACnetConstructedDataLinkSpeedAutonegotiate must not be nil")
 	}
 	_result := &_BACnetConstructedDataLinkSpeedAutonegotiate{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LinkSpeedAutonegotiate:        linkSpeedAutonegotiate,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeeds.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeeds.go
index 5f0d7e23d92..954cd892fdf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeeds.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeeds.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataLinkSpeeds = (*_BACnetConstructedDataLinkSpeeds)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLinkSpeeds)(nil)
 
 // NewBACnetConstructedDataLinkSpeeds factory function for _BACnetConstructedDataLinkSpeeds
-func NewBACnetConstructedDataLinkSpeeds(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, linkSpeeds []BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLinkSpeeds {
+func NewBACnetConstructedDataLinkSpeeds(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, linkSpeeds []BACnetApplicationTagReal) *_BACnetConstructedDataLinkSpeeds {
 	_result := &_BACnetConstructedDataLinkSpeeds{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		LinkSpeeds:                    linkSpeeds,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfGroupMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfGroupMembers.go
index 8cc1dfdd32f..d80d9679ff7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfGroupMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfGroupMembers.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataListOfGroupMembers = (*_BACnetConstructedDataListOfGr
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataListOfGroupMembers)(nil)
 
 // NewBACnetConstructedDataListOfGroupMembers factory function for _BACnetConstructedDataListOfGroupMembers
-func NewBACnetConstructedDataListOfGroupMembers(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, listOfGroupMembers []BACnetReadAccessSpecification, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataListOfGroupMembers {
+func NewBACnetConstructedDataListOfGroupMembers(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, listOfGroupMembers []BACnetReadAccessSpecification) *_BACnetConstructedDataListOfGroupMembers {
 	_result := &_BACnetConstructedDataListOfGroupMembers{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ListOfGroupMembers:            listOfGroupMembers,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfObjectPropertyReferences.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfObjectPropertyReferences.go
index 8b01683b9ff..bdb87d09d9c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfObjectPropertyReferences.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfObjectPropertyReferences.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataListOfObjectPropertyReferences = (*_BACnetConstructed
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataListOfObjectPropertyReferences)(nil)
 
 // NewBACnetConstructedDataListOfObjectPropertyReferences factory function for _BACnetConstructedDataListOfObjectPropertyReferences
-func NewBACnetConstructedDataListOfObjectPropertyReferences(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, references []BACnetDeviceObjectPropertyReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataListOfObjectPropertyReferences {
+func NewBACnetConstructedDataListOfObjectPropertyReferences(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, references []BACnetDeviceObjectPropertyReference) *_BACnetConstructedDataListOfObjectPropertyReferences {
 	_result := &_BACnetConstructedDataListOfObjectPropertyReferences{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		References:                    references,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlAll.go
index 849e8d769f4..1105e47f5d5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataLoadControlAll = (*_BACnetConstructedDataLoadControlA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLoadControlAll)(nil)
 
 // NewBACnetConstructedDataLoadControlAll factory function for _BACnetConstructedDataLoadControlAll
-func NewBACnetConstructedDataLoadControlAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLoadControlAll {
+func NewBACnetConstructedDataLoadControlAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataLoadControlAll {
 	_result := &_BACnetConstructedDataLoadControlAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlPresentValue.go
index 82d6aa23df1..d06341d1ec3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLoadControlPresentValue = (*_BACnetConstructedDataLoa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLoadControlPresentValue)(nil)
 
 // NewBACnetConstructedDataLoadControlPresentValue factory function for _BACnetConstructedDataLoadControlPresentValue
-func NewBACnetConstructedDataLoadControlPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetShedStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLoadControlPresentValue {
+func NewBACnetConstructedDataLoadControlPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetShedStateTagged) *_BACnetConstructedDataLoadControlPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetShedStateTagged for BACnetConstructedDataLoadControlPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataLoadControlPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalDate.go
index 0e34430f986..eec93631a89 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalDate.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLocalDate = (*_BACnetConstructedDataLocalDate)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLocalDate)(nil)
 
 // NewBACnetConstructedDataLocalDate factory function for _BACnetConstructedDataLocalDate
-func NewBACnetConstructedDataLocalDate(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, localDate BACnetApplicationTagDate, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLocalDate {
+func NewBACnetConstructedDataLocalDate(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, localDate BACnetApplicationTagDate) *_BACnetConstructedDataLocalDate {
 	if localDate == nil {
 		panic("localDate of type BACnetApplicationTagDate for BACnetConstructedDataLocalDate must not be nil")
 	}
 	_result := &_BACnetConstructedDataLocalDate{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LocalDate:                     localDate,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalForwardingOnly.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalForwardingOnly.go
index a4b7e3e763b..612ba55a910 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalForwardingOnly.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalForwardingOnly.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLocalForwardingOnly = (*_BACnetConstructedDataLocalFo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLocalForwardingOnly)(nil)
 
 // NewBACnetConstructedDataLocalForwardingOnly factory function for _BACnetConstructedDataLocalForwardingOnly
-func NewBACnetConstructedDataLocalForwardingOnly(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, localForwardingOnly BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLocalForwardingOnly {
+func NewBACnetConstructedDataLocalForwardingOnly(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, localForwardingOnly BACnetApplicationTagBoolean) *_BACnetConstructedDataLocalForwardingOnly {
 	if localForwardingOnly == nil {
 		panic("localForwardingOnly of type BACnetApplicationTagBoolean for BACnetConstructedDataLocalForwardingOnly must not be nil")
 	}
 	_result := &_BACnetConstructedDataLocalForwardingOnly{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LocalForwardingOnly:           localForwardingOnly,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalTime.go
index c2d9ddf2b65..a260a3839d4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLocalTime = (*_BACnetConstructedDataLocalTime)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLocalTime)(nil)
 
 // NewBACnetConstructedDataLocalTime factory function for _BACnetConstructedDataLocalTime
-func NewBACnetConstructedDataLocalTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, localTime BACnetApplicationTagTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLocalTime {
+func NewBACnetConstructedDataLocalTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, localTime BACnetApplicationTagTime) *_BACnetConstructedDataLocalTime {
 	if localTime == nil {
 		panic("localTime of type BACnetApplicationTagTime for BACnetConstructedDataLocalTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataLocalTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LocalTime:                     localTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocation.go
index cc2de65b1f7..0cc5f51a5fc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocation.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLocation = (*_BACnetConstructedDataLocation)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLocation)(nil)
 
 // NewBACnetConstructedDataLocation factory function for _BACnetConstructedDataLocation
-func NewBACnetConstructedDataLocation(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, location BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLocation {
+func NewBACnetConstructedDataLocation(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, location BACnetApplicationTagCharacterString) *_BACnetConstructedDataLocation {
 	if location == nil {
 		panic("location of type BACnetApplicationTagCharacterString for BACnetConstructedDataLocation must not be nil")
 	}
 	_result := &_BACnetConstructedDataLocation{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Location:                      location,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockStatus.go
index 5b56a0e0cc4..5e8d286f56e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockStatus.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLockStatus = (*_BACnetConstructedDataLockStatus)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLockStatus)(nil)
 
 // NewBACnetConstructedDataLockStatus factory function for _BACnetConstructedDataLockStatus
-func NewBACnetConstructedDataLockStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lockStatus BACnetLockStatusTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLockStatus {
+func NewBACnetConstructedDataLockStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lockStatus BACnetLockStatusTagged) *_BACnetConstructedDataLockStatus {
 	if lockStatus == nil {
 		panic("lockStatus of type BACnetLockStatusTagged for BACnetConstructedDataLockStatus must not be nil")
 	}
 	_result := &_BACnetConstructedDataLockStatus{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LockStatus:                    lockStatus,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockout.go
index f0ae74187fb..4187aa2686a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockout.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLockout = (*_BACnetConstructedDataLockout)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLockout)(nil)
 
 // NewBACnetConstructedDataLockout factory function for _BACnetConstructedDataLockout
-func NewBACnetConstructedDataLockout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lockout BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLockout {
+func NewBACnetConstructedDataLockout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lockout BACnetApplicationTagBoolean) *_BACnetConstructedDataLockout {
 	if lockout == nil {
 		panic("lockout of type BACnetApplicationTagBoolean for BACnetConstructedDataLockout must not be nil")
 	}
 	_result := &_BACnetConstructedDataLockout{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Lockout:                       lockout,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockoutRelinquishTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockoutRelinquishTime.go
index 87186772da0..014dd80885a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockoutRelinquishTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockoutRelinquishTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLockoutRelinquishTime = (*_BACnetConstructedDataLocko
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLockoutRelinquishTime)(nil)
 
 // NewBACnetConstructedDataLockoutRelinquishTime factory function for _BACnetConstructedDataLockoutRelinquishTime
-func NewBACnetConstructedDataLockoutRelinquishTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lockoutRelinquishTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLockoutRelinquishTime {
+func NewBACnetConstructedDataLockoutRelinquishTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lockoutRelinquishTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataLockoutRelinquishTime {
 	if lockoutRelinquishTime == nil {
 		panic("lockoutRelinquishTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataLockoutRelinquishTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataLockoutRelinquishTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LockoutRelinquishTime:         lockoutRelinquishTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogBuffer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogBuffer.go
index 87852eb4700..60ea852abf4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogBuffer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogBuffer.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataLogBuffer = (*_BACnetConstructedDataLogBuffer)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLogBuffer)(nil)
 
 // NewBACnetConstructedDataLogBuffer factory function for _BACnetConstructedDataLogBuffer
-func NewBACnetConstructedDataLogBuffer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, floorText []BACnetLogRecord, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLogBuffer {
+func NewBACnetConstructedDataLogBuffer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, floorText []BACnetLogRecord) *_BACnetConstructedDataLogBuffer {
 	_result := &_BACnetConstructedDataLogBuffer{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		FloorText:                     floorText,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogDeviceObjectProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogDeviceObjectProperty.go
index 0fe9b8e1a14..1ea113cb039 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogDeviceObjectProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogDeviceObjectProperty.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLogDeviceObjectProperty = (*_BACnetConstructedDataLog
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLogDeviceObjectProperty)(nil)
 
 // NewBACnetConstructedDataLogDeviceObjectProperty factory function for _BACnetConstructedDataLogDeviceObjectProperty
-func NewBACnetConstructedDataLogDeviceObjectProperty(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, logDeviceObjectProperty BACnetDeviceObjectPropertyReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLogDeviceObjectProperty {
+func NewBACnetConstructedDataLogDeviceObjectProperty(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, logDeviceObjectProperty BACnetDeviceObjectPropertyReference) *_BACnetConstructedDataLogDeviceObjectProperty {
 	if logDeviceObjectProperty == nil {
 		panic("logDeviceObjectProperty of type BACnetDeviceObjectPropertyReference for BACnetConstructedDataLogDeviceObjectProperty must not be nil")
 	}
 	_result := &_BACnetConstructedDataLogDeviceObjectProperty{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LogDeviceObjectProperty:       logDeviceObjectProperty,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogInterval.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogInterval.go
index 64da72e96de..a8d675be897 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogInterval.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogInterval.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLogInterval = (*_BACnetConstructedDataLogInterval)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLogInterval)(nil)
 
 // NewBACnetConstructedDataLogInterval factory function for _BACnetConstructedDataLogInterval
-func NewBACnetConstructedDataLogInterval(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, logInterval BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLogInterval {
+func NewBACnetConstructedDataLogInterval(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, logInterval BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataLogInterval {
 	if logInterval == nil {
 		panic("logInterval of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataLogInterval must not be nil")
 	}
 	_result := &_BACnetConstructedDataLogInterval{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LogInterval:                   logInterval,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingObject.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingObject.go
index 414f70b2d84..370fe1466f3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingObject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingObject.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLoggingObject = (*_BACnetConstructedDataLoggingObject
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLoggingObject)(nil)
 
 // NewBACnetConstructedDataLoggingObject factory function for _BACnetConstructedDataLoggingObject
-func NewBACnetConstructedDataLoggingObject(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, loggingObject BACnetApplicationTagObjectIdentifier, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLoggingObject {
+func NewBACnetConstructedDataLoggingObject(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, loggingObject BACnetApplicationTagObjectIdentifier) *_BACnetConstructedDataLoggingObject {
 	if loggingObject == nil {
 		panic("loggingObject of type BACnetApplicationTagObjectIdentifier for BACnetConstructedDataLoggingObject must not be nil")
 	}
 	_result := &_BACnetConstructedDataLoggingObject{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LoggingObject:                 loggingObject,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingRecord.go
index 1f84a29c343..8ba4ea4d032 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingRecord.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLoggingRecord = (*_BACnetConstructedDataLoggingRecord
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLoggingRecord)(nil)
 
 // NewBACnetConstructedDataLoggingRecord factory function for _BACnetConstructedDataLoggingRecord
-func NewBACnetConstructedDataLoggingRecord(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, loggingRecord BACnetAccumulatorRecord, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLoggingRecord {
+func NewBACnetConstructedDataLoggingRecord(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, loggingRecord BACnetAccumulatorRecord) *_BACnetConstructedDataLoggingRecord {
 	if loggingRecord == nil {
 		panic("loggingRecord of type BACnetAccumulatorRecord for BACnetConstructedDataLoggingRecord must not be nil")
 	}
 	_result := &_BACnetConstructedDataLoggingRecord{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LoggingRecord:                 loggingRecord,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingType.go
index 57e0950796b..da39fd9a267 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingType.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLoggingType = (*_BACnetConstructedDataLoggingType)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLoggingType)(nil)
 
 // NewBACnetConstructedDataLoggingType factory function for _BACnetConstructedDataLoggingType
-func NewBACnetConstructedDataLoggingType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, loggingType BACnetLoggingTypeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLoggingType {
+func NewBACnetConstructedDataLoggingType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, loggingType BACnetLoggingTypeTagged) *_BACnetConstructedDataLoggingType {
 	if loggingType == nil {
 		panic("loggingType of type BACnetLoggingTypeTagged for BACnetConstructedDataLoggingType must not be nil")
 	}
 	_result := &_BACnetConstructedDataLoggingType{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LoggingType:                   loggingType,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAction.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAction.go
index 6e44c50ecbe..326c9f07c4c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAction.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAction.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLoopAction = (*_BACnetConstructedDataLoopAction)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLoopAction)(nil)
 
 // NewBACnetConstructedDataLoopAction factory function for _BACnetConstructedDataLoopAction
-func NewBACnetConstructedDataLoopAction(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, action BACnetActionTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLoopAction {
+func NewBACnetConstructedDataLoopAction(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, action BACnetActionTagged) *_BACnetConstructedDataLoopAction {
 	if action == nil {
 		panic("action of type BACnetActionTagged for BACnetConstructedDataLoopAction must not be nil")
 	}
 	_result := &_BACnetConstructedDataLoopAction{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Action:                        action,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAll.go
index 1512484b40e..d1d652c76cd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataLoopAll = (*_BACnetConstructedDataLoopAll)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLoopAll)(nil)
 
 // NewBACnetConstructedDataLoopAll factory function for _BACnetConstructedDataLoopAll
-func NewBACnetConstructedDataLoopAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLoopAll {
+func NewBACnetConstructedDataLoopAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataLoopAll {
 	_result := &_BACnetConstructedDataLoopAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopPresentValue.go
index 7fe417eda5e..c4daf1a9b3a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLoopPresentValue = (*_BACnetConstructedDataLoopPresen
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLoopPresentValue)(nil)
 
 // NewBACnetConstructedDataLoopPresentValue factory function for _BACnetConstructedDataLoopPresentValue
-func NewBACnetConstructedDataLoopPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLoopPresentValue {
+func NewBACnetConstructedDataLoopPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagReal) *_BACnetConstructedDataLoopPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagReal for BACnetConstructedDataLoopPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataLoopPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowDiffLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowDiffLimit.go
index c223f689676..01076767492 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowDiffLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowDiffLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLowDiffLimit = (*_BACnetConstructedDataLowDiffLimit)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLowDiffLimit)(nil)
 
 // NewBACnetConstructedDataLowDiffLimit factory function for _BACnetConstructedDataLowDiffLimit
-func NewBACnetConstructedDataLowDiffLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lowDiffLimit BACnetOptionalREAL, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLowDiffLimit {
+func NewBACnetConstructedDataLowDiffLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lowDiffLimit BACnetOptionalREAL) *_BACnetConstructedDataLowDiffLimit {
 	if lowDiffLimit == nil {
 		panic("lowDiffLimit of type BACnetOptionalREAL for BACnetConstructedDataLowDiffLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataLowDiffLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LowDiffLimit:                  lowDiffLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowLimit.go
index 79ef7e84e17..325f8f7975f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLowLimit = (*_BACnetConstructedDataLowLimit)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLowLimit)(nil)
 
 // NewBACnetConstructedDataLowLimit factory function for _BACnetConstructedDataLowLimit
-func NewBACnetConstructedDataLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lowLimit BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLowLimit {
+func NewBACnetConstructedDataLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lowLimit BACnetApplicationTagReal) *_BACnetConstructedDataLowLimit {
 	if lowLimit == nil {
 		panic("lowLimit of type BACnetApplicationTagReal for BACnetConstructedDataLowLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataLowLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LowLimit:                      lowLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowerDeck.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowerDeck.go
index 0b641844029..39360674c07 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowerDeck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowerDeck.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataLowerDeck = (*_BACnetConstructedDataLowerDeck)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataLowerDeck)(nil)
 
 // NewBACnetConstructedDataLowerDeck factory function for _BACnetConstructedDataLowerDeck
-func NewBACnetConstructedDataLowerDeck(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lowerDeck BACnetApplicationTagObjectIdentifier, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataLowerDeck {
+func NewBACnetConstructedDataLowerDeck(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lowerDeck BACnetApplicationTagObjectIdentifier) *_BACnetConstructedDataLowerDeck {
 	if lowerDeck == nil {
 		panic("lowerDeck of type BACnetApplicationTagObjectIdentifier for BACnetConstructedDataLowerDeck must not be nil")
 	}
 	_result := &_BACnetConstructedDataLowerDeck{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LowerDeck:                     lowerDeck,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMACAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMACAddress.go
index b3b6f77cc83..5ce8090c5eb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMACAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMACAddress.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMACAddress = (*_BACnetConstructedDataMACAddress)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMACAddress)(nil)
 
 // NewBACnetConstructedDataMACAddress factory function for _BACnetConstructedDataMACAddress
-func NewBACnetConstructedDataMACAddress(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, macAddress BACnetApplicationTagOctetString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMACAddress {
+func NewBACnetConstructedDataMACAddress(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, macAddress BACnetApplicationTagOctetString) *_BACnetConstructedDataMACAddress {
 	if macAddress == nil {
 		panic("macAddress of type BACnetApplicationTagOctetString for BACnetConstructedDataMACAddress must not be nil")
 	}
 	_result := &_BACnetConstructedDataMACAddress{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MacAddress:                    macAddress,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMachineRoomID.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMachineRoomID.go
index 1ae687e970b..998f2b709ec 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMachineRoomID.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMachineRoomID.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMachineRoomID = (*_BACnetConstructedDataMachineRoomID
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMachineRoomID)(nil)
 
 // NewBACnetConstructedDataMachineRoomID factory function for _BACnetConstructedDataMachineRoomID
-func NewBACnetConstructedDataMachineRoomID(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, machineRoomId BACnetApplicationTagObjectIdentifier, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMachineRoomID {
+func NewBACnetConstructedDataMachineRoomID(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, machineRoomId BACnetApplicationTagObjectIdentifier) *_BACnetConstructedDataMachineRoomID {
 	if machineRoomId == nil {
 		panic("machineRoomId of type BACnetApplicationTagObjectIdentifier for BACnetConstructedDataMachineRoomID must not be nil")
 	}
 	_result := &_BACnetConstructedDataMachineRoomID{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MachineRoomId:                 machineRoomId,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaintenanceRequired.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaintenanceRequired.go
index 4ad00e8eb2b..6776d1e6c51 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaintenanceRequired.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaintenanceRequired.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMaintenanceRequired = (*_BACnetConstructedDataMainten
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMaintenanceRequired)(nil)
 
 // NewBACnetConstructedDataMaintenanceRequired factory function for _BACnetConstructedDataMaintenanceRequired
-func NewBACnetConstructedDataMaintenanceRequired(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maintenanceRequired BACnetMaintenanceTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMaintenanceRequired {
+func NewBACnetConstructedDataMaintenanceRequired(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maintenanceRequired BACnetMaintenanceTagged) *_BACnetConstructedDataMaintenanceRequired {
 	if maintenanceRequired == nil {
 		panic("maintenanceRequired of type BACnetMaintenanceTagged for BACnetConstructedDataMaintenanceRequired must not be nil")
 	}
 	_result := &_BACnetConstructedDataMaintenanceRequired{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaintenanceRequired:           maintenanceRequired,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMakingCarCall.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMakingCarCall.go
index 67d346cd5a4..41063e3c716 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMakingCarCall.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMakingCarCall.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataMakingCarCall = (*_BACnetConstructedDataMakingCarCall
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMakingCarCall)(nil)
 
 // NewBACnetConstructedDataMakingCarCall factory function for _BACnetConstructedDataMakingCarCall
-func NewBACnetConstructedDataMakingCarCall(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, makingCarCall []BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMakingCarCall {
+func NewBACnetConstructedDataMakingCarCall(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, makingCarCall []BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataMakingCarCall {
 	_result := &_BACnetConstructedDataMakingCarCall{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		MakingCarCall:                 makingCarCall,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManipulatedVariableReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManipulatedVariableReference.go
index 7089f867839..54b9b88513d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManipulatedVariableReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManipulatedVariableReference.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataManipulatedVariableReference = (*_BACnetConstructedDa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataManipulatedVariableReference)(nil)
 
 // NewBACnetConstructedDataManipulatedVariableReference factory function for _BACnetConstructedDataManipulatedVariableReference
-func NewBACnetConstructedDataManipulatedVariableReference(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, manipulatedVariableReference BACnetObjectPropertyReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataManipulatedVariableReference {
+func NewBACnetConstructedDataManipulatedVariableReference(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, manipulatedVariableReference BACnetObjectPropertyReference) *_BACnetConstructedDataManipulatedVariableReference {
 	if manipulatedVariableReference == nil {
 		panic("manipulatedVariableReference of type BACnetObjectPropertyReference for BACnetConstructedDataManipulatedVariableReference must not be nil")
 	}
 	_result := &_BACnetConstructedDataManipulatedVariableReference{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ManipulatedVariableReference:  manipulatedVariableReference,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManualSlaveAddressBinding.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManualSlaveAddressBinding.go
index d44fb870ef8..e90247d044f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManualSlaveAddressBinding.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManualSlaveAddressBinding.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataManualSlaveAddressBinding = (*_BACnetConstructedDataM
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataManualSlaveAddressBinding)(nil)
 
 // NewBACnetConstructedDataManualSlaveAddressBinding factory function for _BACnetConstructedDataManualSlaveAddressBinding
-func NewBACnetConstructedDataManualSlaveAddressBinding(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, manualSlaveAddressBinding []BACnetAddressBinding, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataManualSlaveAddressBinding {
+func NewBACnetConstructedDataManualSlaveAddressBinding(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, manualSlaveAddressBinding []BACnetAddressBinding) *_BACnetConstructedDataManualSlaveAddressBinding {
 	_result := &_BACnetConstructedDataManualSlaveAddressBinding{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ManualSlaveAddressBinding:     manualSlaveAddressBinding,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaskedAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaskedAlarmValues.go
index f7c37fba022..ad35fe451dc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaskedAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaskedAlarmValues.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataMaskedAlarmValues = (*_BACnetConstructedDataMaskedAla
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMaskedAlarmValues)(nil)
 
 // NewBACnetConstructedDataMaskedAlarmValues factory function for _BACnetConstructedDataMaskedAlarmValues
-func NewBACnetConstructedDataMaskedAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maskedAlarmValues []BACnetDoorAlarmStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMaskedAlarmValues {
+func NewBACnetConstructedDataMaskedAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maskedAlarmValues []BACnetDoorAlarmStateTagged) *_BACnetConstructedDataMaskedAlarmValues {
 	_result := &_BACnetConstructedDataMaskedAlarmValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaskedAlarmValues:             maskedAlarmValues,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxAPDULengthAccepted.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxAPDULengthAccepted.go
index e41afe2eb30..2ed11193a4a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxAPDULengthAccepted.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxAPDULengthAccepted.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMaxAPDULengthAccepted = (*_BACnetConstructedDataMaxAP
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMaxAPDULengthAccepted)(nil)
 
 // NewBACnetConstructedDataMaxAPDULengthAccepted factory function for _BACnetConstructedDataMaxAPDULengthAccepted
-func NewBACnetConstructedDataMaxAPDULengthAccepted(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxApduLengthAccepted BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMaxAPDULengthAccepted {
+func NewBACnetConstructedDataMaxAPDULengthAccepted(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxApduLengthAccepted BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataMaxAPDULengthAccepted {
 	if maxApduLengthAccepted == nil {
 		panic("maxApduLengthAccepted of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataMaxAPDULengthAccepted must not be nil")
 	}
 	_result := &_BACnetConstructedDataMaxAPDULengthAccepted{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxApduLengthAccepted:         maxApduLengthAccepted,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxActualValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxActualValue.go
index a2d414551ee..1220420feaa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxActualValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxActualValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMaxActualValue = (*_BACnetConstructedDataMaxActualVal
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMaxActualValue)(nil)
 
 // NewBACnetConstructedDataMaxActualValue factory function for _BACnetConstructedDataMaxActualValue
-func NewBACnetConstructedDataMaxActualValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxActualValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMaxActualValue {
+func NewBACnetConstructedDataMaxActualValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxActualValue BACnetApplicationTagReal) *_BACnetConstructedDataMaxActualValue {
 	if maxActualValue == nil {
 		panic("maxActualValue of type BACnetApplicationTagReal for BACnetConstructedDataMaxActualValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataMaxActualValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxActualValue:                maxActualValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxFailedAttempts.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxFailedAttempts.go
index 43a17771b45..80765f17891 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxFailedAttempts.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxFailedAttempts.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMaxFailedAttempts = (*_BACnetConstructedDataMaxFailed
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMaxFailedAttempts)(nil)
 
 // NewBACnetConstructedDataMaxFailedAttempts factory function for _BACnetConstructedDataMaxFailedAttempts
-func NewBACnetConstructedDataMaxFailedAttempts(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxFailedAttempts BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMaxFailedAttempts {
+func NewBACnetConstructedDataMaxFailedAttempts(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxFailedAttempts BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataMaxFailedAttempts {
 	if maxFailedAttempts == nil {
 		panic("maxFailedAttempts of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataMaxFailedAttempts must not be nil")
 	}
 	_result := &_BACnetConstructedDataMaxFailedAttempts{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxFailedAttempts:             maxFailedAttempts,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxInfoFrames.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxInfoFrames.go
index c71f3bb7538..1610449a1f9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxInfoFrames.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxInfoFrames.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMaxInfoFrames = (*_BACnetConstructedDataMaxInfoFrames
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMaxInfoFrames)(nil)
 
 // NewBACnetConstructedDataMaxInfoFrames factory function for _BACnetConstructedDataMaxInfoFrames
-func NewBACnetConstructedDataMaxInfoFrames(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxInfoFrames BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMaxInfoFrames {
+func NewBACnetConstructedDataMaxInfoFrames(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxInfoFrames BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataMaxInfoFrames {
 	if maxInfoFrames == nil {
 		panic("maxInfoFrames of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataMaxInfoFrames must not be nil")
 	}
 	_result := &_BACnetConstructedDataMaxInfoFrames{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxInfoFrames:                 maxInfoFrames,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxMaster.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxMaster.go
index 44b5be43a27..29e6fb090d0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxMaster.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxMaster.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMaxMaster = (*_BACnetConstructedDataMaxMaster)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMaxMaster)(nil)
 
 // NewBACnetConstructedDataMaxMaster factory function for _BACnetConstructedDataMaxMaster
-func NewBACnetConstructedDataMaxMaster(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxMaster BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMaxMaster {
+func NewBACnetConstructedDataMaxMaster(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxMaster BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataMaxMaster {
 	if maxMaster == nil {
 		panic("maxMaster of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataMaxMaster must not be nil")
 	}
 	_result := &_BACnetConstructedDataMaxMaster{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxMaster:                     maxMaster,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxPresValue.go
index 8803540333e..ec99fadafd6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxPresValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMaxPresValue = (*_BACnetConstructedDataMaxPresValue)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMaxPresValue)(nil)
 
 // NewBACnetConstructedDataMaxPresValue factory function for _BACnetConstructedDataMaxPresValue
-func NewBACnetConstructedDataMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMaxPresValue {
+func NewBACnetConstructedDataMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagReal) *_BACnetConstructedDataMaxPresValue {
 	if maxPresValue == nil {
 		panic("maxPresValue of type BACnetApplicationTagReal for BACnetConstructedDataMaxPresValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataMaxPresValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxPresValue:                  maxPresValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxSegmentsAccepted.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxSegmentsAccepted.go
index d63b06e4a4c..76913d08ea9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxSegmentsAccepted.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxSegmentsAccepted.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMaxSegmentsAccepted = (*_BACnetConstructedDataMaxSegm
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMaxSegmentsAccepted)(nil)
 
 // NewBACnetConstructedDataMaxSegmentsAccepted factory function for _BACnetConstructedDataMaxSegmentsAccepted
-func NewBACnetConstructedDataMaxSegmentsAccepted(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxSegmentsAccepted BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMaxSegmentsAccepted {
+func NewBACnetConstructedDataMaxSegmentsAccepted(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxSegmentsAccepted BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataMaxSegmentsAccepted {
 	if maxSegmentsAccepted == nil {
 		panic("maxSegmentsAccepted of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataMaxSegmentsAccepted must not be nil")
 	}
 	_result := &_BACnetConstructedDataMaxSegmentsAccepted{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxSegmentsAccepted:           maxSegmentsAccepted,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumOutput.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumOutput.go
index 42bce9ec2b0..642e90bb06a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumOutput.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumOutput.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMaximumOutput = (*_BACnetConstructedDataMaximumOutput
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMaximumOutput)(nil)
 
 // NewBACnetConstructedDataMaximumOutput factory function for _BACnetConstructedDataMaximumOutput
-func NewBACnetConstructedDataMaximumOutput(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maximumOutput BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMaximumOutput {
+func NewBACnetConstructedDataMaximumOutput(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maximumOutput BACnetApplicationTagReal) *_BACnetConstructedDataMaximumOutput {
 	if maximumOutput == nil {
 		panic("maximumOutput of type BACnetApplicationTagReal for BACnetConstructedDataMaximumOutput must not be nil")
 	}
 	_result := &_BACnetConstructedDataMaximumOutput{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaximumOutput:                 maximumOutput,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValue.go
index 561e997c6c1..75c73f72edd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMaximumValue = (*_BACnetConstructedDataMaximumValue)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMaximumValue)(nil)
 
 // NewBACnetConstructedDataMaximumValue factory function for _BACnetConstructedDataMaximumValue
-func NewBACnetConstructedDataMaximumValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maximumValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMaximumValue {
+func NewBACnetConstructedDataMaximumValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maximumValue BACnetApplicationTagReal) *_BACnetConstructedDataMaximumValue {
 	if maximumValue == nil {
 		panic("maximumValue of type BACnetApplicationTagReal for BACnetConstructedDataMaximumValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataMaximumValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaximumValue:                  maximumValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValueTimestamp.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValueTimestamp.go
index b37329bc443..6def08e634a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValueTimestamp.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValueTimestamp.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMaximumValueTimestamp = (*_BACnetConstructedDataMaxim
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMaximumValueTimestamp)(nil)
 
 // NewBACnetConstructedDataMaximumValueTimestamp factory function for _BACnetConstructedDataMaximumValueTimestamp
-func NewBACnetConstructedDataMaximumValueTimestamp(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maximumValueTimestamp BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMaximumValueTimestamp {
+func NewBACnetConstructedDataMaximumValueTimestamp(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maximumValueTimestamp BACnetDateTime) *_BACnetConstructedDataMaximumValueTimestamp {
 	if maximumValueTimestamp == nil {
 		panic("maximumValueTimestamp of type BACnetDateTime for BACnetConstructedDataMaximumValueTimestamp must not be nil")
 	}
 	_result := &_BACnetConstructedDataMaximumValueTimestamp{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaximumValueTimestamp:         maximumValueTimestamp,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberOf.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberOf.go
index 9f5945e5cfb..1c733b97cc4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberOf.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberOf.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataMemberOf = (*_BACnetConstructedDataMemberOf)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMemberOf)(nil)
 
 // NewBACnetConstructedDataMemberOf factory function for _BACnetConstructedDataMemberOf
-func NewBACnetConstructedDataMemberOf(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, zones []BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMemberOf {
+func NewBACnetConstructedDataMemberOf(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, zones []BACnetDeviceObjectReference) *_BACnetConstructedDataMemberOf {
 	_result := &_BACnetConstructedDataMemberOf{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Zones:                         zones,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberStatusFlags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberStatusFlags.go
index 5763b770dd9..b52c3a3e954 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberStatusFlags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberStatusFlags.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMemberStatusFlags = (*_BACnetConstructedDataMemberSta
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMemberStatusFlags)(nil)
 
 // NewBACnetConstructedDataMemberStatusFlags factory function for _BACnetConstructedDataMemberStatusFlags
-func NewBACnetConstructedDataMemberStatusFlags(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, statusFlags BACnetStatusFlagsTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMemberStatusFlags {
+func NewBACnetConstructedDataMemberStatusFlags(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, statusFlags BACnetStatusFlagsTagged) *_BACnetConstructedDataMemberStatusFlags {
 	if statusFlags == nil {
 		panic("statusFlags of type BACnetStatusFlagsTagged for BACnetConstructedDataMemberStatusFlags must not be nil")
 	}
 	_result := &_BACnetConstructedDataMemberStatusFlags{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		StatusFlags:                   statusFlags,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMembers.go
index fe94e313005..652fdbfa244 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMembers.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataMembers = (*_BACnetConstructedDataMembers)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMembers)(nil)
 
 // NewBACnetConstructedDataMembers factory function for _BACnetConstructedDataMembers
-func NewBACnetConstructedDataMembers(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, members []BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMembers {
+func NewBACnetConstructedDataMembers(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, members []BACnetDeviceObjectReference) *_BACnetConstructedDataMembers {
 	_result := &_BACnetConstructedDataMembers{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Members:                       members,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinActualValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinActualValue.go
index ac7865e176b..0a12a9d3f95 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinActualValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinActualValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMinActualValue = (*_BACnetConstructedDataMinActualVal
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMinActualValue)(nil)
 
 // NewBACnetConstructedDataMinActualValue factory function for _BACnetConstructedDataMinActualValue
-func NewBACnetConstructedDataMinActualValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minActualValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMinActualValue {
+func NewBACnetConstructedDataMinActualValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minActualValue BACnetApplicationTagReal) *_BACnetConstructedDataMinActualValue {
 	if minActualValue == nil {
 		panic("minActualValue of type BACnetApplicationTagReal for BACnetConstructedDataMinActualValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataMinActualValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MinActualValue:                minActualValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinPresValue.go
index b0ff1b4eeeb..cc6f7028775 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinPresValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMinPresValue = (*_BACnetConstructedDataMinPresValue)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMinPresValue)(nil)
 
 // NewBACnetConstructedDataMinPresValue factory function for _BACnetConstructedDataMinPresValue
-func NewBACnetConstructedDataMinPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minPresValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMinPresValue {
+func NewBACnetConstructedDataMinPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minPresValue BACnetApplicationTagReal) *_BACnetConstructedDataMinPresValue {
 	if minPresValue == nil {
 		panic("minPresValue of type BACnetApplicationTagReal for BACnetConstructedDataMinPresValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataMinPresValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MinPresValue:                  minPresValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOffTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOffTime.go
index 507d7580af7..0a386ec9577 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOffTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOffTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMinimumOffTime = (*_BACnetConstructedDataMinimumOffTi
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMinimumOffTime)(nil)
 
 // NewBACnetConstructedDataMinimumOffTime factory function for _BACnetConstructedDataMinimumOffTime
-func NewBACnetConstructedDataMinimumOffTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minimumOffTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMinimumOffTime {
+func NewBACnetConstructedDataMinimumOffTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minimumOffTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataMinimumOffTime {
 	if minimumOffTime == nil {
 		panic("minimumOffTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataMinimumOffTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataMinimumOffTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MinimumOffTime:                minimumOffTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOnTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOnTime.go
index 64b8372b769..97551dc3350 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOnTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOnTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMinimumOnTime = (*_BACnetConstructedDataMinimumOnTime
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMinimumOnTime)(nil)
 
 // NewBACnetConstructedDataMinimumOnTime factory function for _BACnetConstructedDataMinimumOnTime
-func NewBACnetConstructedDataMinimumOnTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minimumOnTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMinimumOnTime {
+func NewBACnetConstructedDataMinimumOnTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minimumOnTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataMinimumOnTime {
 	if minimumOnTime == nil {
 		panic("minimumOnTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataMinimumOnTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataMinimumOnTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MinimumOnTime:                 minimumOnTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOutput.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOutput.go
index 3a85fdae7ae..58c02232eff 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOutput.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOutput.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMinimumOutput = (*_BACnetConstructedDataMinimumOutput
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMinimumOutput)(nil)
 
 // NewBACnetConstructedDataMinimumOutput factory function for _BACnetConstructedDataMinimumOutput
-func NewBACnetConstructedDataMinimumOutput(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minimumOutput BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMinimumOutput {
+func NewBACnetConstructedDataMinimumOutput(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minimumOutput BACnetApplicationTagReal) *_BACnetConstructedDataMinimumOutput {
 	if minimumOutput == nil {
 		panic("minimumOutput of type BACnetApplicationTagReal for BACnetConstructedDataMinimumOutput must not be nil")
 	}
 	_result := &_BACnetConstructedDataMinimumOutput{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MinimumOutput:                 minimumOutput,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValue.go
index acb0f4151bc..78b350bb9e2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMinimumValue = (*_BACnetConstructedDataMinimumValue)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMinimumValue)(nil)
 
 // NewBACnetConstructedDataMinimumValue factory function for _BACnetConstructedDataMinimumValue
-func NewBACnetConstructedDataMinimumValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minimumValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMinimumValue {
+func NewBACnetConstructedDataMinimumValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minimumValue BACnetApplicationTagReal) *_BACnetConstructedDataMinimumValue {
 	if minimumValue == nil {
 		panic("minimumValue of type BACnetApplicationTagReal for BACnetConstructedDataMinimumValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataMinimumValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MinimumValue:                  minimumValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValueTimestamp.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValueTimestamp.go
index 82a87d7827d..ccecacbe3f9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValueTimestamp.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValueTimestamp.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMinimumValueTimestamp = (*_BACnetConstructedDataMinim
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMinimumValueTimestamp)(nil)
 
 // NewBACnetConstructedDataMinimumValueTimestamp factory function for _BACnetConstructedDataMinimumValueTimestamp
-func NewBACnetConstructedDataMinimumValueTimestamp(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minimumValueTimestamp BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMinimumValueTimestamp {
+func NewBACnetConstructedDataMinimumValueTimestamp(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minimumValueTimestamp BACnetDateTime) *_BACnetConstructedDataMinimumValueTimestamp {
 	if minimumValueTimestamp == nil {
 		panic("minimumValueTimestamp of type BACnetDateTime for BACnetConstructedDataMinimumValueTimestamp must not be nil")
 	}
 	_result := &_BACnetConstructedDataMinimumValueTimestamp{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MinimumValueTimestamp:         minimumValueTimestamp,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMode.go
index 47b693dc5cb..a128dc0c6f6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMode.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMode = (*_BACnetConstructedDataMode)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMode)(nil)
 
 // NewBACnetConstructedDataMode factory function for _BACnetConstructedDataMode
-func NewBACnetConstructedDataMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, mode BACnetLifeSafetyModeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMode {
+func NewBACnetConstructedDataMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, mode BACnetLifeSafetyModeTagged) *_BACnetConstructedDataMode {
 	if mode == nil {
 		panic("mode of type BACnetLifeSafetyModeTagged for BACnetConstructedDataMode must not be nil")
 	}
 	_result := &_BACnetConstructedDataMode{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Mode:                          mode,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModelName.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModelName.go
index 8a3aa10adca..a75bed3aa2f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModelName.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModelName.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataModelName = (*_BACnetConstructedDataModelName)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataModelName)(nil)
 
 // NewBACnetConstructedDataModelName factory function for _BACnetConstructedDataModelName
-func NewBACnetConstructedDataModelName(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, modelName BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataModelName {
+func NewBACnetConstructedDataModelName(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, modelName BACnetApplicationTagCharacterString) *_BACnetConstructedDataModelName {
 	if modelName == nil {
 		panic("modelName of type BACnetApplicationTagCharacterString for BACnetConstructedDataModelName must not be nil")
 	}
 	_result := &_BACnetConstructedDataModelName{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ModelName:                     modelName,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModificationDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModificationDate.go
index f8e7959f788..370cc1fc94c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModificationDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModificationDate.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataModificationDate = (*_BACnetConstructedDataModificati
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataModificationDate)(nil)
 
 // NewBACnetConstructedDataModificationDate factory function for _BACnetConstructedDataModificationDate
-func NewBACnetConstructedDataModificationDate(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, modificationDate BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataModificationDate {
+func NewBACnetConstructedDataModificationDate(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, modificationDate BACnetDateTime) *_BACnetConstructedDataModificationDate {
 	if modificationDate == nil {
 		panic("modificationDate of type BACnetDateTime for BACnetConstructedDataModificationDate must not be nil")
 	}
 	_result := &_BACnetConstructedDataModificationDate{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ModificationDate:              modificationDate,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAlarmValues.go
index de272aa574c..19f02f5d921 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAlarmValues.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataMultiStateInputAlarmValues = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMultiStateInputAlarmValues)(nil)
 
 // NewBACnetConstructedDataMultiStateInputAlarmValues factory function for _BACnetConstructedDataMultiStateInputAlarmValues
-func NewBACnetConstructedDataMultiStateInputAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMultiStateInputAlarmValues {
+func NewBACnetConstructedDataMultiStateInputAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataMultiStateInputAlarmValues {
 	_result := &_BACnetConstructedDataMultiStateInputAlarmValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AlarmValues:                   alarmValues,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAll.go
index 0f9256fc78d..a25309ea528 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataMultiStateInputAll = (*_BACnetConstructedDataMultiSta
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMultiStateInputAll)(nil)
 
 // NewBACnetConstructedDataMultiStateInputAll factory function for _BACnetConstructedDataMultiStateInputAll
-func NewBACnetConstructedDataMultiStateInputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMultiStateInputAll {
+func NewBACnetConstructedDataMultiStateInputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataMultiStateInputAll {
 	_result := &_BACnetConstructedDataMultiStateInputAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputFaultValues.go
index fa46a6b3486..010d2136739 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputFaultValues.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataMultiStateInputFaultValues = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMultiStateInputFaultValues)(nil)
 
 // NewBACnetConstructedDataMultiStateInputFaultValues factory function for _BACnetConstructedDataMultiStateInputFaultValues
-func NewBACnetConstructedDataMultiStateInputFaultValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultValues []BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMultiStateInputFaultValues {
+func NewBACnetConstructedDataMultiStateInputFaultValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultValues []BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataMultiStateInputFaultValues {
 	_result := &_BACnetConstructedDataMultiStateInputFaultValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultValues:                   faultValues,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputInterfaceValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputInterfaceValue.go
index 42b41b70273..74feee59f52 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputInterfaceValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputInterfaceValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMultiStateInputInterfaceValue = (*_BACnetConstructedD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMultiStateInputInterfaceValue)(nil)
 
 // NewBACnetConstructedDataMultiStateInputInterfaceValue factory function for _BACnetConstructedDataMultiStateInputInterfaceValue
-func NewBACnetConstructedDataMultiStateInputInterfaceValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, interfaceValue BACnetOptionalBinaryPV, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMultiStateInputInterfaceValue {
+func NewBACnetConstructedDataMultiStateInputInterfaceValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, interfaceValue BACnetOptionalBinaryPV) *_BACnetConstructedDataMultiStateInputInterfaceValue {
 	if interfaceValue == nil {
 		panic("interfaceValue of type BACnetOptionalBinaryPV for BACnetConstructedDataMultiStateInputInterfaceValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataMultiStateInputInterfaceValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		InterfaceValue:                interfaceValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputAll.go
index e750de58b77..3f85c4225f0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataMultiStateOutputAll = (*_BACnetConstructedDataMultiSt
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMultiStateOutputAll)(nil)
 
 // NewBACnetConstructedDataMultiStateOutputAll factory function for _BACnetConstructedDataMultiStateOutputAll
-func NewBACnetConstructedDataMultiStateOutputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMultiStateOutputAll {
+func NewBACnetConstructedDataMultiStateOutputAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataMultiStateOutputAll {
 	_result := &_BACnetConstructedDataMultiStateOutputAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputFeedbackValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputFeedbackValue.go
index 29320561a4c..134d4dae676 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputFeedbackValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputFeedbackValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMultiStateOutputFeedbackValue = (*_BACnetConstructedD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMultiStateOutputFeedbackValue)(nil)
 
 // NewBACnetConstructedDataMultiStateOutputFeedbackValue factory function for _BACnetConstructedDataMultiStateOutputFeedbackValue
-func NewBACnetConstructedDataMultiStateOutputFeedbackValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, feedbackValue BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMultiStateOutputFeedbackValue {
+func NewBACnetConstructedDataMultiStateOutputFeedbackValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, feedbackValue BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataMultiStateOutputFeedbackValue {
 	if feedbackValue == nil {
 		panic("feedbackValue of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataMultiStateOutputFeedbackValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataMultiStateOutputFeedbackValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FeedbackValue:                 feedbackValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputInterfaceValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputInterfaceValue.go
index daa9ac4be05..c8d3344e37c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputInterfaceValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputInterfaceValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMultiStateOutputInterfaceValue = (*_BACnetConstructed
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMultiStateOutputInterfaceValue)(nil)
 
 // NewBACnetConstructedDataMultiStateOutputInterfaceValue factory function for _BACnetConstructedDataMultiStateOutputInterfaceValue
-func NewBACnetConstructedDataMultiStateOutputInterfaceValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, interfaceValue BACnetOptionalBinaryPV, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMultiStateOutputInterfaceValue {
+func NewBACnetConstructedDataMultiStateOutputInterfaceValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, interfaceValue BACnetOptionalBinaryPV) *_BACnetConstructedDataMultiStateOutputInterfaceValue {
 	if interfaceValue == nil {
 		panic("interfaceValue of type BACnetOptionalBinaryPV for BACnetConstructedDataMultiStateOutputInterfaceValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataMultiStateOutputInterfaceValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		InterfaceValue:                interfaceValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputRelinquishDefault.go
index 070a4c969bf..2e7f0f76c55 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMultiStateOutputRelinquishDefault = (*_BACnetConstruc
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMultiStateOutputRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataMultiStateOutputRelinquishDefault factory function for _BACnetConstructedDataMultiStateOutputRelinquishDefault
-func NewBACnetConstructedDataMultiStateOutputRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMultiStateOutputRelinquishDefault {
+func NewBACnetConstructedDataMultiStateOutputRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataMultiStateOutputRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataMultiStateOutputRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataMultiStateOutputRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAlarmValues.go
index 92b103bd5a3..a90bc55150c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAlarmValues.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataMultiStateValueAlarmValues = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMultiStateValueAlarmValues)(nil)
 
 // NewBACnetConstructedDataMultiStateValueAlarmValues factory function for _BACnetConstructedDataMultiStateValueAlarmValues
-func NewBACnetConstructedDataMultiStateValueAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMultiStateValueAlarmValues {
+func NewBACnetConstructedDataMultiStateValueAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataMultiStateValueAlarmValues {
 	_result := &_BACnetConstructedDataMultiStateValueAlarmValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AlarmValues:                   alarmValues,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAll.go
index e0cf80f9c4b..f6d5fc53bb4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataMultiStateValueAll = (*_BACnetConstructedDataMultiSta
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMultiStateValueAll)(nil)
 
 // NewBACnetConstructedDataMultiStateValueAll factory function for _BACnetConstructedDataMultiStateValueAll
-func NewBACnetConstructedDataMultiStateValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMultiStateValueAll {
+func NewBACnetConstructedDataMultiStateValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataMultiStateValueAll {
 	_result := &_BACnetConstructedDataMultiStateValueAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueFaultValues.go
index 6f6ef991642..f4377873771 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueFaultValues.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataMultiStateValueFaultValues = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMultiStateValueFaultValues)(nil)
 
 // NewBACnetConstructedDataMultiStateValueFaultValues factory function for _BACnetConstructedDataMultiStateValueFaultValues
-func NewBACnetConstructedDataMultiStateValueFaultValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultValues []BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMultiStateValueFaultValues {
+func NewBACnetConstructedDataMultiStateValueFaultValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultValues []BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataMultiStateValueFaultValues {
 	_result := &_BACnetConstructedDataMultiStateValueFaultValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultValues:                   faultValues,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueRelinquishDefault.go
index 2a389e21b1c..342a788b5ef 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMultiStateValueRelinquishDefault = (*_BACnetConstruct
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMultiStateValueRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataMultiStateValueRelinquishDefault factory function for _BACnetConstructedDataMultiStateValueRelinquishDefault
-func NewBACnetConstructedDataMultiStateValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMultiStateValueRelinquishDefault {
+func NewBACnetConstructedDataMultiStateValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataMultiStateValueRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataMultiStateValueRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataMultiStateValueRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMusterPoint.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMusterPoint.go
index 9613def4398..b23cb881470 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMusterPoint.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMusterPoint.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataMusterPoint = (*_BACnetConstructedDataMusterPoint)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataMusterPoint)(nil)
 
 // NewBACnetConstructedDataMusterPoint factory function for _BACnetConstructedDataMusterPoint
-func NewBACnetConstructedDataMusterPoint(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, musterPoint BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataMusterPoint {
+func NewBACnetConstructedDataMusterPoint(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, musterPoint BACnetApplicationTagBoolean) *_BACnetConstructedDataMusterPoint {
 	if musterPoint == nil {
 		panic("musterPoint of type BACnetApplicationTagBoolean for BACnetConstructedDataMusterPoint must not be nil")
 	}
 	_result := &_BACnetConstructedDataMusterPoint{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MusterPoint:                   musterPoint,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNegativeAccessRules.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNegativeAccessRules.go
index c3b6027f85b..21fd4080c9c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNegativeAccessRules.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNegativeAccessRules.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataNegativeAccessRules = (*_BACnetConstructedDataNegativ
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNegativeAccessRules)(nil)
 
 // NewBACnetConstructedDataNegativeAccessRules factory function for _BACnetConstructedDataNegativeAccessRules
-func NewBACnetConstructedDataNegativeAccessRules(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, negativeAccessRules []BACnetAccessRule, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNegativeAccessRules {
+func NewBACnetConstructedDataNegativeAccessRules(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, negativeAccessRules []BACnetAccessRule) *_BACnetConstructedDataNegativeAccessRules {
 	_result := &_BACnetConstructedDataNegativeAccessRules{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		NegativeAccessRules:           negativeAccessRules,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkAccessSecurityPolicies.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkAccessSecurityPolicies.go
index eed761cc871..0ef05c2df80 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkAccessSecurityPolicies.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkAccessSecurityPolicies.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataNetworkAccessSecurityPolicies = (*_BACnetConstructedD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNetworkAccessSecurityPolicies)(nil)
 
 // NewBACnetConstructedDataNetworkAccessSecurityPolicies factory function for _BACnetConstructedDataNetworkAccessSecurityPolicies
-func NewBACnetConstructedDataNetworkAccessSecurityPolicies(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, networkAccessSecurityPolicies []BACnetNetworkSecurityPolicy, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNetworkAccessSecurityPolicies {
+func NewBACnetConstructedDataNetworkAccessSecurityPolicies(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, networkAccessSecurityPolicies []BACnetNetworkSecurityPolicy) *_BACnetConstructedDataNetworkAccessSecurityPolicies {
 	_result := &_BACnetConstructedDataNetworkAccessSecurityPolicies{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		NetworkAccessSecurityPolicies: networkAccessSecurityPolicies,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkInterfaceName.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkInterfaceName.go
index fa9c7c4552a..bcf2ebc8f8f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkInterfaceName.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkInterfaceName.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataNetworkInterfaceName = (*_BACnetConstructedDataNetwor
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNetworkInterfaceName)(nil)
 
 // NewBACnetConstructedDataNetworkInterfaceName factory function for _BACnetConstructedDataNetworkInterfaceName
-func NewBACnetConstructedDataNetworkInterfaceName(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, networkInterfaceName BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNetworkInterfaceName {
+func NewBACnetConstructedDataNetworkInterfaceName(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, networkInterfaceName BACnetApplicationTagCharacterString) *_BACnetConstructedDataNetworkInterfaceName {
 	if networkInterfaceName == nil {
 		panic("networkInterfaceName of type BACnetApplicationTagCharacterString for BACnetConstructedDataNetworkInterfaceName must not be nil")
 	}
 	_result := &_BACnetConstructedDataNetworkInterfaceName{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NetworkInterfaceName:          networkInterfaceName,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumber.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumber.go
index 97fe2436812..5dfb1611d01 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumber.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumber.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataNetworkNumber = (*_BACnetConstructedDataNetworkNumber
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNetworkNumber)(nil)
 
 // NewBACnetConstructedDataNetworkNumber factory function for _BACnetConstructedDataNetworkNumber
-func NewBACnetConstructedDataNetworkNumber(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, networkNumber BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNetworkNumber {
+func NewBACnetConstructedDataNetworkNumber(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, networkNumber BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataNetworkNumber {
 	if networkNumber == nil {
 		panic("networkNumber of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataNetworkNumber must not be nil")
 	}
 	_result := &_BACnetConstructedDataNetworkNumber{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NetworkNumber:                 networkNumber,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumberQuality.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumberQuality.go
index be94d70298b..95f08aceecf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumberQuality.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumberQuality.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataNetworkNumberQuality = (*_BACnetConstructedDataNetwor
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNetworkNumberQuality)(nil)
 
 // NewBACnetConstructedDataNetworkNumberQuality factory function for _BACnetConstructedDataNetworkNumberQuality
-func NewBACnetConstructedDataNetworkNumberQuality(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, networkNumberQuality BACnetNetworkNumberQualityTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNetworkNumberQuality {
+func NewBACnetConstructedDataNetworkNumberQuality(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, networkNumberQuality BACnetNetworkNumberQualityTagged) *_BACnetConstructedDataNetworkNumberQuality {
 	if networkNumberQuality == nil {
 		panic("networkNumberQuality of type BACnetNetworkNumberQualityTagged for BACnetConstructedDataNetworkNumberQuality must not be nil")
 	}
 	_result := &_BACnetConstructedDataNetworkNumberQuality{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NetworkNumberQuality:          networkNumberQuality,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortAll.go
index d308b740202..c36ff8f39c1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataNetworkPortAll = (*_BACnetConstructedDataNetworkPortA
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNetworkPortAll)(nil)
 
 // NewBACnetConstructedDataNetworkPortAll factory function for _BACnetConstructedDataNetworkPortAll
-func NewBACnetConstructedDataNetworkPortAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNetworkPortAll {
+func NewBACnetConstructedDataNetworkPortAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataNetworkPortAll {
 	_result := &_BACnetConstructedDataNetworkPortAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxInfoFrames.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxInfoFrames.go
index 7ea82e048e7..ddc13e95472 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxInfoFrames.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxInfoFrames.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataNetworkPortMaxInfoFrames = (*_BACnetConstructedDataNe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNetworkPortMaxInfoFrames)(nil)
 
 // NewBACnetConstructedDataNetworkPortMaxInfoFrames factory function for _BACnetConstructedDataNetworkPortMaxInfoFrames
-func NewBACnetConstructedDataNetworkPortMaxInfoFrames(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxInfoFrames BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNetworkPortMaxInfoFrames {
+func NewBACnetConstructedDataNetworkPortMaxInfoFrames(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxInfoFrames BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataNetworkPortMaxInfoFrames {
 	if maxInfoFrames == nil {
 		panic("maxInfoFrames of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataNetworkPortMaxInfoFrames must not be nil")
 	}
 	_result := &_BACnetConstructedDataNetworkPortMaxInfoFrames{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxInfoFrames:                 maxInfoFrames,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxMaster.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxMaster.go
index 81c4dfea1f7..32fb8df774a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxMaster.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxMaster.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataNetworkPortMaxMaster = (*_BACnetConstructedDataNetwor
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNetworkPortMaxMaster)(nil)
 
 // NewBACnetConstructedDataNetworkPortMaxMaster factory function for _BACnetConstructedDataNetworkPortMaxMaster
-func NewBACnetConstructedDataNetworkPortMaxMaster(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxMaster BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNetworkPortMaxMaster {
+func NewBACnetConstructedDataNetworkPortMaxMaster(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxMaster BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataNetworkPortMaxMaster {
 	if maxMaster == nil {
 		panic("maxMaster of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataNetworkPortMaxMaster must not be nil")
 	}
 	_result := &_BACnetConstructedDataNetworkPortMaxMaster{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxMaster:                     maxMaster,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkSecurityAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkSecurityAll.go
index 2af87276cfc..1a9f8d957a7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkSecurityAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkSecurityAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataNetworkSecurityAll = (*_BACnetConstructedDataNetworkS
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNetworkSecurityAll)(nil)
 
 // NewBACnetConstructedDataNetworkSecurityAll factory function for _BACnetConstructedDataNetworkSecurityAll
-func NewBACnetConstructedDataNetworkSecurityAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNetworkSecurityAll {
+func NewBACnetConstructedDataNetworkSecurityAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataNetworkSecurityAll {
 	_result := &_BACnetConstructedDataNetworkSecurityAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkType.go
index 11ae36f486a..c983f0bf579 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkType.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataNetworkType = (*_BACnetConstructedDataNetworkType)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNetworkType)(nil)
 
 // NewBACnetConstructedDataNetworkType factory function for _BACnetConstructedDataNetworkType
-func NewBACnetConstructedDataNetworkType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, networkType BACnetNetworkTypeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNetworkType {
+func NewBACnetConstructedDataNetworkType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, networkType BACnetNetworkTypeTagged) *_BACnetConstructedDataNetworkType {
 	if networkType == nil {
 		panic("networkType of type BACnetNetworkTypeTagged for BACnetConstructedDataNetworkType must not be nil")
 	}
 	_result := &_BACnetConstructedDataNetworkType{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NetworkType:                   networkType,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNextStoppingFloor.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNextStoppingFloor.go
index e191b50da36..9e740dd3859 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNextStoppingFloor.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNextStoppingFloor.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataNextStoppingFloor = (*_BACnetConstructedDataNextStopp
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNextStoppingFloor)(nil)
 
 // NewBACnetConstructedDataNextStoppingFloor factory function for _BACnetConstructedDataNextStoppingFloor
-func NewBACnetConstructedDataNextStoppingFloor(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, nextStoppingFloor BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNextStoppingFloor {
+func NewBACnetConstructedDataNextStoppingFloor(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, nextStoppingFloor BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataNextStoppingFloor {
 	if nextStoppingFloor == nil {
 		panic("nextStoppingFloor of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataNextStoppingFloor must not be nil")
 	}
 	_result := &_BACnetConstructedDataNextStoppingFloor{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NextStoppingFloor:             nextStoppingFloor,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeSubtype.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeSubtype.go
index d1e7ef307df..2232e37875e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeSubtype.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeSubtype.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataNodeSubtype = (*_BACnetConstructedDataNodeSubtype)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNodeSubtype)(nil)
 
 // NewBACnetConstructedDataNodeSubtype factory function for _BACnetConstructedDataNodeSubtype
-func NewBACnetConstructedDataNodeSubtype(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, nodeSubType BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNodeSubtype {
+func NewBACnetConstructedDataNodeSubtype(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, nodeSubType BACnetApplicationTagCharacterString) *_BACnetConstructedDataNodeSubtype {
 	if nodeSubType == nil {
 		panic("nodeSubType of type BACnetApplicationTagCharacterString for BACnetConstructedDataNodeSubtype must not be nil")
 	}
 	_result := &_BACnetConstructedDataNodeSubtype{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NodeSubType:                   nodeSubType,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeType.go
index ed508df94bd..fe8e45ba0b0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeType.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataNodeType = (*_BACnetConstructedDataNodeType)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNodeType)(nil)
 
 // NewBACnetConstructedDataNodeType factory function for _BACnetConstructedDataNodeType
-func NewBACnetConstructedDataNodeType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, nodeType BACnetNodeTypeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNodeType {
+func NewBACnetConstructedDataNodeType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, nodeType BACnetNodeTypeTagged) *_BACnetConstructedDataNodeType {
 	if nodeType == nil {
 		panic("nodeType of type BACnetNodeTypeTagged for BACnetConstructedDataNodeType must not be nil")
 	}
 	_result := &_BACnetConstructedDataNodeType{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NodeType:                      nodeType,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClass.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClass.go
index 537d30bce1a..dddf912aae0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClass.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClass.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataNotificationClass = (*_BACnetConstructedDataNotificat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNotificationClass)(nil)
 
 // NewBACnetConstructedDataNotificationClass factory function for _BACnetConstructedDataNotificationClass
-func NewBACnetConstructedDataNotificationClass(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, notificationClass BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNotificationClass {
+func NewBACnetConstructedDataNotificationClass(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, notificationClass BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataNotificationClass {
 	if notificationClass == nil {
 		panic("notificationClass of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataNotificationClass must not be nil")
 	}
 	_result := &_BACnetConstructedDataNotificationClass{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NotificationClass:             notificationClass,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClassAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClassAll.go
index 66faee24132..9d7598687a1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClassAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClassAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataNotificationClassAll = (*_BACnetConstructedDataNotifi
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNotificationClassAll)(nil)
 
 // NewBACnetConstructedDataNotificationClassAll factory function for _BACnetConstructedDataNotificationClassAll
-func NewBACnetConstructedDataNotificationClassAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNotificationClassAll {
+func NewBACnetConstructedDataNotificationClassAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataNotificationClassAll {
 	_result := &_BACnetConstructedDataNotificationClassAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationForwarderAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationForwarderAll.go
index 2c1f4f97a9b..cae494eba2e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationForwarderAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationForwarderAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataNotificationForwarderAll = (*_BACnetConstructedDataNo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNotificationForwarderAll)(nil)
 
 // NewBACnetConstructedDataNotificationForwarderAll factory function for _BACnetConstructedDataNotificationForwarderAll
-func NewBACnetConstructedDataNotificationForwarderAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNotificationForwarderAll {
+func NewBACnetConstructedDataNotificationForwarderAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataNotificationForwarderAll {
 	_result := &_BACnetConstructedDataNotificationForwarderAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationThreshold.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationThreshold.go
index 587fe826d0a..c954b6cfd8a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationThreshold.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationThreshold.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataNotificationThreshold = (*_BACnetConstructedDataNotif
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNotificationThreshold)(nil)
 
 // NewBACnetConstructedDataNotificationThreshold factory function for _BACnetConstructedDataNotificationThreshold
-func NewBACnetConstructedDataNotificationThreshold(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, notificationThreshold BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNotificationThreshold {
+func NewBACnetConstructedDataNotificationThreshold(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, notificationThreshold BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataNotificationThreshold {
 	if notificationThreshold == nil {
 		panic("notificationThreshold of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataNotificationThreshold must not be nil")
 	}
 	_result := &_BACnetConstructedDataNotificationThreshold{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NotificationThreshold:         notificationThreshold,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotifyType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotifyType.go
index a908547787c..6e965de0ecb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotifyType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotifyType.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataNotifyType = (*_BACnetConstructedDataNotifyType)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNotifyType)(nil)
 
 // NewBACnetConstructedDataNotifyType factory function for _BACnetConstructedDataNotifyType
-func NewBACnetConstructedDataNotifyType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, notifyType BACnetNotifyTypeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNotifyType {
+func NewBACnetConstructedDataNotifyType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, notifyType BACnetNotifyTypeTagged) *_BACnetConstructedDataNotifyType {
 	if notifyType == nil {
 		panic("notifyType of type BACnetNotifyTypeTagged for BACnetConstructedDataNotifyType must not be nil")
 	}
 	_result := &_BACnetConstructedDataNotifyType{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NotifyType:                    notifyType,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAPDURetries.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAPDURetries.go
index 5c99196da34..70be8fe201b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAPDURetries.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAPDURetries.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataNumberOfAPDURetries = (*_BACnetConstructedDataNumberO
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNumberOfAPDURetries)(nil)
 
 // NewBACnetConstructedDataNumberOfAPDURetries factory function for _BACnetConstructedDataNumberOfAPDURetries
-func NewBACnetConstructedDataNumberOfAPDURetries(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfApduRetries BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNumberOfAPDURetries {
+func NewBACnetConstructedDataNumberOfAPDURetries(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfApduRetries BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataNumberOfAPDURetries {
 	if numberOfApduRetries == nil {
 		panic("numberOfApduRetries of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataNumberOfAPDURetries must not be nil")
 	}
 	_result := &_BACnetConstructedDataNumberOfAPDURetries{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfApduRetries:           numberOfApduRetries,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAuthenticationPolicies.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAuthenticationPolicies.go
index 9eb2bed825a..c249c85ca9c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAuthenticationPolicies.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAuthenticationPolicies.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataNumberOfAuthenticationPolicies = (*_BACnetConstructed
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNumberOfAuthenticationPolicies)(nil)
 
 // NewBACnetConstructedDataNumberOfAuthenticationPolicies factory function for _BACnetConstructedDataNumberOfAuthenticationPolicies
-func NewBACnetConstructedDataNumberOfAuthenticationPolicies(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfAuthenticationPolicies BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNumberOfAuthenticationPolicies {
+func NewBACnetConstructedDataNumberOfAuthenticationPolicies(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfAuthenticationPolicies BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataNumberOfAuthenticationPolicies {
 	if numberOfAuthenticationPolicies == nil {
 		panic("numberOfAuthenticationPolicies of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataNumberOfAuthenticationPolicies must not be nil")
 	}
 	_result := &_BACnetConstructedDataNumberOfAuthenticationPolicies{
-		BACnetConstructedDataContract:  NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract:  NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfAuthenticationPolicies: numberOfAuthenticationPolicies,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfStates.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfStates.go
index fff991f48f3..a4ded79d2fb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfStates.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfStates.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataNumberOfStates = (*_BACnetConstructedDataNumberOfStat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataNumberOfStates)(nil)
 
 // NewBACnetConstructedDataNumberOfStates factory function for _BACnetConstructedDataNumberOfStates
-func NewBACnetConstructedDataNumberOfStates(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfState BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataNumberOfStates {
+func NewBACnetConstructedDataNumberOfStates(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfState BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataNumberOfStates {
 	if numberOfState == nil {
 		panic("numberOfState of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataNumberOfStates must not be nil")
 	}
 	_result := &_BACnetConstructedDataNumberOfStates{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfState:                 numberOfState,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectIdentifier.go
index 7b9a77facb5..6124ab74e15 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectIdentifier.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataObjectIdentifier = (*_BACnetConstructedDataObjectIden
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataObjectIdentifier)(nil)
 
 // NewBACnetConstructedDataObjectIdentifier factory function for _BACnetConstructedDataObjectIdentifier
-func NewBACnetConstructedDataObjectIdentifier(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, objectIdentifier BACnetApplicationTagObjectIdentifier, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataObjectIdentifier {
+func NewBACnetConstructedDataObjectIdentifier(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, objectIdentifier BACnetApplicationTagObjectIdentifier) *_BACnetConstructedDataObjectIdentifier {
 	if objectIdentifier == nil {
 		panic("objectIdentifier of type BACnetApplicationTagObjectIdentifier for BACnetConstructedDataObjectIdentifier must not be nil")
 	}
 	_result := &_BACnetConstructedDataObjectIdentifier{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ObjectIdentifier:              objectIdentifier,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectList.go
index 55899e8734b..856be5df409 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectList.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataObjectList = (*_BACnetConstructedDataObjectList)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataObjectList)(nil)
 
 // NewBACnetConstructedDataObjectList factory function for _BACnetConstructedDataObjectList
-func NewBACnetConstructedDataObjectList(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, objectList []BACnetApplicationTagObjectIdentifier, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataObjectList {
+func NewBACnetConstructedDataObjectList(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, objectList []BACnetApplicationTagObjectIdentifier) *_BACnetConstructedDataObjectList {
 	_result := &_BACnetConstructedDataObjectList{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		ObjectList:                    objectList,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectName.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectName.go
index 191727af581..c9a897658c6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectName.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectName.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataObjectName = (*_BACnetConstructedDataObjectName)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataObjectName)(nil)
 
 // NewBACnetConstructedDataObjectName factory function for _BACnetConstructedDataObjectName
-func NewBACnetConstructedDataObjectName(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, objectName BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataObjectName {
+func NewBACnetConstructedDataObjectName(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, objectName BACnetApplicationTagCharacterString) *_BACnetConstructedDataObjectName {
 	if objectName == nil {
 		panic("objectName of type BACnetApplicationTagCharacterString for BACnetConstructedDataObjectName must not be nil")
 	}
 	_result := &_BACnetConstructedDataObjectName{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ObjectName:                    objectName,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectPropertyReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectPropertyReference.go
index aadf21b8c8b..2afbba76cbd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectPropertyReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectPropertyReference.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataObjectPropertyReference = (*_BACnetConstructedDataObj
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataObjectPropertyReference)(nil)
 
 // NewBACnetConstructedDataObjectPropertyReference factory function for _BACnetConstructedDataObjectPropertyReference
-func NewBACnetConstructedDataObjectPropertyReference(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, propertyReference BACnetDeviceObjectPropertyReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataObjectPropertyReference {
+func NewBACnetConstructedDataObjectPropertyReference(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, propertyReference BACnetDeviceObjectPropertyReference) *_BACnetConstructedDataObjectPropertyReference {
 	if propertyReference == nil {
 		panic("propertyReference of type BACnetDeviceObjectPropertyReference for BACnetConstructedDataObjectPropertyReference must not be nil")
 	}
 	_result := &_BACnetConstructedDataObjectPropertyReference{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PropertyReference:             propertyReference,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectType.go
index c3b1f178187..1617c2f2002 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectType.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataObjectType = (*_BACnetConstructedDataObjectType)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataObjectType)(nil)
 
 // NewBACnetConstructedDataObjectType factory function for _BACnetConstructedDataObjectType
-func NewBACnetConstructedDataObjectType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, objectType BACnetObjectTypeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataObjectType {
+func NewBACnetConstructedDataObjectType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, objectType BACnetObjectTypeTagged) *_BACnetConstructedDataObjectType {
 	if objectType == nil {
 		panic("objectType of type BACnetObjectTypeTagged for BACnetConstructedDataObjectType must not be nil")
 	}
 	_result := &_BACnetConstructedDataObjectType{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ObjectType:                    objectType,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCount.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCount.go
index a6167e32613..4550c397583 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCount.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCount.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataOccupancyCount = (*_BACnetConstructedDataOccupancyCou
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOccupancyCount)(nil)
 
 // NewBACnetConstructedDataOccupancyCount factory function for _BACnetConstructedDataOccupancyCount
-func NewBACnetConstructedDataOccupancyCount(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyCount BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOccupancyCount {
+func NewBACnetConstructedDataOccupancyCount(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyCount BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataOccupancyCount {
 	if occupancyCount == nil {
 		panic("occupancyCount of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataOccupancyCount must not be nil")
 	}
 	_result := &_BACnetConstructedDataOccupancyCount{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		OccupancyCount:                occupancyCount,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountAdjust.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountAdjust.go
index d47946bc22c..c38357839eb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountAdjust.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountAdjust.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataOccupancyCountAdjust = (*_BACnetConstructedDataOccupa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOccupancyCountAdjust)(nil)
 
 // NewBACnetConstructedDataOccupancyCountAdjust factory function for _BACnetConstructedDataOccupancyCountAdjust
-func NewBACnetConstructedDataOccupancyCountAdjust(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyCountAdjust BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOccupancyCountAdjust {
+func NewBACnetConstructedDataOccupancyCountAdjust(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyCountAdjust BACnetApplicationTagBoolean) *_BACnetConstructedDataOccupancyCountAdjust {
 	if occupancyCountAdjust == nil {
 		panic("occupancyCountAdjust of type BACnetApplicationTagBoolean for BACnetConstructedDataOccupancyCountAdjust must not be nil")
 	}
 	_result := &_BACnetConstructedDataOccupancyCountAdjust{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		OccupancyCountAdjust:          occupancyCountAdjust,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountEnable.go
index 4deba071a20..e57444f4c6c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountEnable.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataOccupancyCountEnable = (*_BACnetConstructedDataOccupa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOccupancyCountEnable)(nil)
 
 // NewBACnetConstructedDataOccupancyCountEnable factory function for _BACnetConstructedDataOccupancyCountEnable
-func NewBACnetConstructedDataOccupancyCountEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyCountEnable BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOccupancyCountEnable {
+func NewBACnetConstructedDataOccupancyCountEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyCountEnable BACnetApplicationTagBoolean) *_BACnetConstructedDataOccupancyCountEnable {
 	if occupancyCountEnable == nil {
 		panic("occupancyCountEnable of type BACnetApplicationTagBoolean for BACnetConstructedDataOccupancyCountEnable must not be nil")
 	}
 	_result := &_BACnetConstructedDataOccupancyCountEnable{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		OccupancyCountEnable:          occupancyCountEnable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimit.go
index 1d456283ebd..8eba0777a80 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataOccupancyLowerLimit = (*_BACnetConstructedDataOccupan
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOccupancyLowerLimit)(nil)
 
 // NewBACnetConstructedDataOccupancyLowerLimit factory function for _BACnetConstructedDataOccupancyLowerLimit
-func NewBACnetConstructedDataOccupancyLowerLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyLowerLimit BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOccupancyLowerLimit {
+func NewBACnetConstructedDataOccupancyLowerLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyLowerLimit BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataOccupancyLowerLimit {
 	if occupancyLowerLimit == nil {
 		panic("occupancyLowerLimit of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataOccupancyLowerLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataOccupancyLowerLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		OccupancyLowerLimit:           occupancyLowerLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimitEnforced.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimitEnforced.go
index e14fbd84eb3..477154705ce 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimitEnforced.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimitEnforced.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataOccupancyLowerLimitEnforced = (*_BACnetConstructedDat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOccupancyLowerLimitEnforced)(nil)
 
 // NewBACnetConstructedDataOccupancyLowerLimitEnforced factory function for _BACnetConstructedDataOccupancyLowerLimitEnforced
-func NewBACnetConstructedDataOccupancyLowerLimitEnforced(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyLowerLimitEnforced BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOccupancyLowerLimitEnforced {
+func NewBACnetConstructedDataOccupancyLowerLimitEnforced(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyLowerLimitEnforced BACnetApplicationTagBoolean) *_BACnetConstructedDataOccupancyLowerLimitEnforced {
 	if occupancyLowerLimitEnforced == nil {
 		panic("occupancyLowerLimitEnforced of type BACnetApplicationTagBoolean for BACnetConstructedDataOccupancyLowerLimitEnforced must not be nil")
 	}
 	_result := &_BACnetConstructedDataOccupancyLowerLimitEnforced{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		OccupancyLowerLimitEnforced:   occupancyLowerLimitEnforced,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyState.go
index 92013c48846..f59aa60d162 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyState.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataOccupancyState = (*_BACnetConstructedDataOccupancySta
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOccupancyState)(nil)
 
 // NewBACnetConstructedDataOccupancyState factory function for _BACnetConstructedDataOccupancyState
-func NewBACnetConstructedDataOccupancyState(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyState BACnetAccessZoneOccupancyStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOccupancyState {
+func NewBACnetConstructedDataOccupancyState(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyState BACnetAccessZoneOccupancyStateTagged) *_BACnetConstructedDataOccupancyState {
 	if occupancyState == nil {
 		panic("occupancyState of type BACnetAccessZoneOccupancyStateTagged for BACnetConstructedDataOccupancyState must not be nil")
 	}
 	_result := &_BACnetConstructedDataOccupancyState{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		OccupancyState:                occupancyState,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimit.go
index 4930c56cf34..f0aaa2d5538 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataOccupancyUpperLimit = (*_BACnetConstructedDataOccupan
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOccupancyUpperLimit)(nil)
 
 // NewBACnetConstructedDataOccupancyUpperLimit factory function for _BACnetConstructedDataOccupancyUpperLimit
-func NewBACnetConstructedDataOccupancyUpperLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyUpperLimit BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOccupancyUpperLimit {
+func NewBACnetConstructedDataOccupancyUpperLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyUpperLimit BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataOccupancyUpperLimit {
 	if occupancyUpperLimit == nil {
 		panic("occupancyUpperLimit of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataOccupancyUpperLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataOccupancyUpperLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		OccupancyUpperLimit:           occupancyUpperLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimitEnforced.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimitEnforced.go
index 6c1ed830c2b..449ff47d6f2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimitEnforced.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimitEnforced.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataOccupancyUpperLimitEnforced = (*_BACnetConstructedDat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOccupancyUpperLimitEnforced)(nil)
 
 // NewBACnetConstructedDataOccupancyUpperLimitEnforced factory function for _BACnetConstructedDataOccupancyUpperLimitEnforced
-func NewBACnetConstructedDataOccupancyUpperLimitEnforced(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyUpperLimitEnforced BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOccupancyUpperLimitEnforced {
+func NewBACnetConstructedDataOccupancyUpperLimitEnforced(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, occupancyUpperLimitEnforced BACnetApplicationTagBoolean) *_BACnetConstructedDataOccupancyUpperLimitEnforced {
 	if occupancyUpperLimitEnforced == nil {
 		panic("occupancyUpperLimitEnforced of type BACnetApplicationTagBoolean for BACnetConstructedDataOccupancyUpperLimitEnforced must not be nil")
 	}
 	_result := &_BACnetConstructedDataOccupancyUpperLimitEnforced{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		OccupancyUpperLimitEnforced:   occupancyUpperLimitEnforced,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValuePresentValue.go
index 5898d1a14e0..fdb078a30f4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValuePresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataOctetStringValuePresentValue = (*_BACnetConstructedDa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOctetStringValuePresentValue)(nil)
 
 // NewBACnetConstructedDataOctetStringValuePresentValue factory function for _BACnetConstructedDataOctetStringValuePresentValue
-func NewBACnetConstructedDataOctetStringValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagOctetString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOctetStringValuePresentValue {
+func NewBACnetConstructedDataOctetStringValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagOctetString) *_BACnetConstructedDataOctetStringValuePresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagOctetString for BACnetConstructedDataOctetStringValuePresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataOctetStringValuePresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValueRelinquishDefault.go
index 0bb659d5b02..e04781ba4e9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValueRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataOctetStringValueRelinquishDefault = (*_BACnetConstruc
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOctetStringValueRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataOctetStringValueRelinquishDefault factory function for _BACnetConstructedDataOctetStringValueRelinquishDefault
-func NewBACnetConstructedDataOctetStringValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOctetStringValueRelinquishDefault {
+func NewBACnetConstructedDataOctetStringValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagSignedInteger) *_BACnetConstructedDataOctetStringValueRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagSignedInteger for BACnetConstructedDataOctetStringValueRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataOctetStringValueRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetstringValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetstringValueAll.go
index e2101be0c4e..21e79e5d2c8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetstringValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetstringValueAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataOctetstringValueAll = (*_BACnetConstructedDataOctetst
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOctetstringValueAll)(nil)
 
 // NewBACnetConstructedDataOctetstringValueAll factory function for _BACnetConstructedDataOctetstringValueAll
-func NewBACnetConstructedDataOctetstringValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOctetstringValueAll {
+func NewBACnetConstructedDataOctetstringValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataOctetstringValueAll {
 	_result := &_BACnetConstructedDataOctetstringValueAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationDirection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationDirection.go
index 16f23f578be..a1351d850c9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationDirection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationDirection.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataOperationDirection = (*_BACnetConstructedDataOperatio
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOperationDirection)(nil)
 
 // NewBACnetConstructedDataOperationDirection factory function for _BACnetConstructedDataOperationDirection
-func NewBACnetConstructedDataOperationDirection(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, operationDirection BACnetEscalatorOperationDirectionTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOperationDirection {
+func NewBACnetConstructedDataOperationDirection(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, operationDirection BACnetEscalatorOperationDirectionTagged) *_BACnetConstructedDataOperationDirection {
 	if operationDirection == nil {
 		panic("operationDirection of type BACnetEscalatorOperationDirectionTagged for BACnetConstructedDataOperationDirection must not be nil")
 	}
 	_result := &_BACnetConstructedDataOperationDirection{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		OperationDirection:            operationDirection,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationExpected.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationExpected.go
index 1c5de7a0139..2dc1ce7ec16 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationExpected.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationExpected.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataOperationExpected = (*_BACnetConstructedDataOperation
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOperationExpected)(nil)
 
 // NewBACnetConstructedDataOperationExpected factory function for _BACnetConstructedDataOperationExpected
-func NewBACnetConstructedDataOperationExpected(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lifeSafetyOperations BACnetLifeSafetyOperationTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOperationExpected {
+func NewBACnetConstructedDataOperationExpected(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lifeSafetyOperations BACnetLifeSafetyOperationTagged) *_BACnetConstructedDataOperationExpected {
 	if lifeSafetyOperations == nil {
 		panic("lifeSafetyOperations of type BACnetLifeSafetyOperationTagged for BACnetConstructedDataOperationExpected must not be nil")
 	}
 	_result := &_BACnetConstructedDataOperationExpected{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LifeSafetyOperations:          lifeSafetyOperations,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOptional.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOptional.go
index 37cf6dd30ae..13e95f6b02c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOptional.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOptional.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataOptional = (*_BACnetConstructedDataOptional)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOptional)(nil)
 
 // NewBACnetConstructedDataOptional factory function for _BACnetConstructedDataOptional
-func NewBACnetConstructedDataOptional(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOptional {
+func NewBACnetConstructedDataOptional(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataOptional {
 	_result := &_BACnetConstructedDataOptional{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutOfService.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutOfService.go
index f602ac0ba8b..28ce4550e63 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutOfService.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutOfService.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataOutOfService = (*_BACnetConstructedDataOutOfService)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOutOfService)(nil)
 
 // NewBACnetConstructedDataOutOfService factory function for _BACnetConstructedDataOutOfService
-func NewBACnetConstructedDataOutOfService(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, outOfService BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOutOfService {
+func NewBACnetConstructedDataOutOfService(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, outOfService BACnetApplicationTagBoolean) *_BACnetConstructedDataOutOfService {
 	if outOfService == nil {
 		panic("outOfService of type BACnetApplicationTagBoolean for BACnetConstructedDataOutOfService must not be nil")
 	}
 	_result := &_BACnetConstructedDataOutOfService{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		OutOfService:                  outOfService,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutputUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutputUnits.go
index 35a7baae653..08cf36f2e3a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutputUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutputUnits.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataOutputUnits = (*_BACnetConstructedDataOutputUnits)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataOutputUnits)(nil)
 
 // NewBACnetConstructedDataOutputUnits factory function for _BACnetConstructedDataOutputUnits
-func NewBACnetConstructedDataOutputUnits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, units BACnetEngineeringUnitsTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataOutputUnits {
+func NewBACnetConstructedDataOutputUnits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, units BACnetEngineeringUnitsTagged) *_BACnetConstructedDataOutputUnits {
 	if units == nil {
 		panic("units of type BACnetEngineeringUnitsTagged for BACnetConstructedDataOutputUnits must not be nil")
 	}
 	_result := &_BACnetConstructedDataOutputUnits{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Units:                         units,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPacketReorderTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPacketReorderTime.go
index bbe6c48f6f1..d14969fd0d6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPacketReorderTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPacketReorderTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPacketReorderTime = (*_BACnetConstructedDataPacketReo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPacketReorderTime)(nil)
 
 // NewBACnetConstructedDataPacketReorderTime factory function for _BACnetConstructedDataPacketReorderTime
-func NewBACnetConstructedDataPacketReorderTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, packetReorderTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPacketReorderTime {
+func NewBACnetConstructedDataPacketReorderTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, packetReorderTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPacketReorderTime {
 	if packetReorderTime == nil {
 		panic("packetReorderTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataPacketReorderTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataPacketReorderTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PacketReorderTime:             packetReorderTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackMode.go
index 8988d1351e7..53596c776c4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackMode.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPassbackMode = (*_BACnetConstructedDataPassbackMode)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPassbackMode)(nil)
 
 // NewBACnetConstructedDataPassbackMode factory function for _BACnetConstructedDataPassbackMode
-func NewBACnetConstructedDataPassbackMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, passbackMode BACnetAccessPassbackModeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPassbackMode {
+func NewBACnetConstructedDataPassbackMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, passbackMode BACnetAccessPassbackModeTagged) *_BACnetConstructedDataPassbackMode {
 	if passbackMode == nil {
 		panic("passbackMode of type BACnetAccessPassbackModeTagged for BACnetConstructedDataPassbackMode must not be nil")
 	}
 	_result := &_BACnetConstructedDataPassbackMode{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PassbackMode:                  passbackMode,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackTimeout.go
index c0ab2ef8dc6..aea6f820818 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackTimeout.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPassbackTimeout = (*_BACnetConstructedDataPassbackTim
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPassbackTimeout)(nil)
 
 // NewBACnetConstructedDataPassbackTimeout factory function for _BACnetConstructedDataPassbackTimeout
-func NewBACnetConstructedDataPassbackTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, passbackTimeout BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPassbackTimeout {
+func NewBACnetConstructedDataPassbackTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, passbackTimeout BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPassbackTimeout {
 	if passbackTimeout == nil {
 		panic("passbackTimeout of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataPassbackTimeout must not be nil")
 	}
 	_result := &_BACnetConstructedDataPassbackTimeout{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PassbackTimeout:               passbackTimeout,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassengerAlarm.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassengerAlarm.go
index d281023f405..44d2be0de6b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassengerAlarm.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassengerAlarm.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPassengerAlarm = (*_BACnetConstructedDataPassengerAla
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPassengerAlarm)(nil)
 
 // NewBACnetConstructedDataPassengerAlarm factory function for _BACnetConstructedDataPassengerAlarm
-func NewBACnetConstructedDataPassengerAlarm(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, passengerAlarm BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPassengerAlarm {
+func NewBACnetConstructedDataPassengerAlarm(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, passengerAlarm BACnetApplicationTagBoolean) *_BACnetConstructedDataPassengerAlarm {
 	if passengerAlarm == nil {
 		panic("passengerAlarm of type BACnetApplicationTagBoolean for BACnetConstructedDataPassengerAlarm must not be nil")
 	}
 	_result := &_BACnetConstructedDataPassengerAlarm{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PassengerAlarm:                passengerAlarm,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPolarity.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPolarity.go
index 7edd55c5493..fe5b461c09d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPolarity.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPolarity.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPolarity = (*_BACnetConstructedDataPolarity)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPolarity)(nil)
 
 // NewBACnetConstructedDataPolarity factory function for _BACnetConstructedDataPolarity
-func NewBACnetConstructedDataPolarity(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, polarity BACnetPolarityTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPolarity {
+func NewBACnetConstructedDataPolarity(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, polarity BACnetPolarityTagged) *_BACnetConstructedDataPolarity {
 	if polarity == nil {
 		panic("polarity of type BACnetPolarityTagged for BACnetConstructedDataPolarity must not be nil")
 	}
 	_result := &_BACnetConstructedDataPolarity{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Polarity:                      polarity,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPortFilter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPortFilter.go
index a5770d3fbfa..f5278159d84 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPortFilter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPortFilter.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataPortFilter = (*_BACnetConstructedDataPortFilter)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPortFilter)(nil)
 
 // NewBACnetConstructedDataPortFilter factory function for _BACnetConstructedDataPortFilter
-func NewBACnetConstructedDataPortFilter(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, portFilter []BACnetPortPermission, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPortFilter {
+func NewBACnetConstructedDataPortFilter(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, portFilter []BACnetPortPermission) *_BACnetConstructedDataPortFilter {
 	_result := &_BACnetConstructedDataPortFilter{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		PortFilter:                    portFilter,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveAccessRules.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveAccessRules.go
index f58409783ad..f77616da46c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveAccessRules.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveAccessRules.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataPositiveAccessRules = (*_BACnetConstructedDataPositiv
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPositiveAccessRules)(nil)
 
 // NewBACnetConstructedDataPositiveAccessRules factory function for _BACnetConstructedDataPositiveAccessRules
-func NewBACnetConstructedDataPositiveAccessRules(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, positiveAccessRules []BACnetAccessRule, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPositiveAccessRules {
+func NewBACnetConstructedDataPositiveAccessRules(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, positiveAccessRules []BACnetAccessRule) *_BACnetConstructedDataPositiveAccessRules {
 	_result := &_BACnetConstructedDataPositiveAccessRules{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		PositiveAccessRules:           positiveAccessRules,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueAll.go
index 4fdfac17aa5..0c896b6ecd0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataPositiveIntegerValueAll = (*_BACnetConstructedDataPos
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPositiveIntegerValueAll)(nil)
 
 // NewBACnetConstructedDataPositiveIntegerValueAll factory function for _BACnetConstructedDataPositiveIntegerValueAll
-func NewBACnetConstructedDataPositiveIntegerValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueAll {
+func NewBACnetConstructedDataPositiveIntegerValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataPositiveIntegerValueAll {
 	_result := &_BACnetConstructedDataPositiveIntegerValueAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueCOVIncrement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueCOVIncrement.go
index 9c5263d08d5..5a4ad3459af 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueCOVIncrement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueCOVIncrement.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPositiveIntegerValueCOVIncrement = (*_BACnetConstruct
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPositiveIntegerValueCOVIncrement)(nil)
 
 // NewBACnetConstructedDataPositiveIntegerValueCOVIncrement factory function for _BACnetConstructedDataPositiveIntegerValueCOVIncrement
-func NewBACnetConstructedDataPositiveIntegerValueCOVIncrement(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covIncrement BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueCOVIncrement {
+func NewBACnetConstructedDataPositiveIntegerValueCOVIncrement(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, covIncrement BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueCOVIncrement {
 	if covIncrement == nil {
 		panic("covIncrement of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataPositiveIntegerValueCOVIncrement must not be nil")
 	}
 	_result := &_BACnetConstructedDataPositiveIntegerValueCOVIncrement{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CovIncrement:                  covIncrement,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueDeadband.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueDeadband.go
index e172af47ff0..0b5baee8b1a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueDeadband.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueDeadband.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPositiveIntegerValueDeadband = (*_BACnetConstructedDa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPositiveIntegerValueDeadband)(nil)
 
 // NewBACnetConstructedDataPositiveIntegerValueDeadband factory function for _BACnetConstructedDataPositiveIntegerValueDeadband
-func NewBACnetConstructedDataPositiveIntegerValueDeadband(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, deadband BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueDeadband {
+func NewBACnetConstructedDataPositiveIntegerValueDeadband(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, deadband BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueDeadband {
 	if deadband == nil {
 		panic("deadband of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataPositiveIntegerValueDeadband must not be nil")
 	}
 	_result := &_BACnetConstructedDataPositiveIntegerValueDeadband{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Deadband:                      deadband,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultHighLimit.go
index d030fd9b23f..b5168c032ff 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultHighLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPositiveIntegerValueFaultHighLimit = (*_BACnetConstru
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPositiveIntegerValueFaultHighLimit)(nil)
 
 // NewBACnetConstructedDataPositiveIntegerValueFaultHighLimit factory function for _BACnetConstructedDataPositiveIntegerValueFaultHighLimit
-func NewBACnetConstructedDataPositiveIntegerValueFaultHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultHighLimit BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueFaultHighLimit {
+func NewBACnetConstructedDataPositiveIntegerValueFaultHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultHighLimit BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueFaultHighLimit {
 	if faultHighLimit == nil {
 		panic("faultHighLimit of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataPositiveIntegerValueFaultHighLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataPositiveIntegerValueFaultHighLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultHighLimit:                faultHighLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultLowLimit.go
index a6e1c090e29..8782d34087f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultLowLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPositiveIntegerValueFaultLowLimit = (*_BACnetConstruc
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPositiveIntegerValueFaultLowLimit)(nil)
 
 // NewBACnetConstructedDataPositiveIntegerValueFaultLowLimit factory function for _BACnetConstructedDataPositiveIntegerValueFaultLowLimit
-func NewBACnetConstructedDataPositiveIntegerValueFaultLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultLowLimit BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueFaultLowLimit {
+func NewBACnetConstructedDataPositiveIntegerValueFaultLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, faultLowLimit BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueFaultLowLimit {
 	if faultLowLimit == nil {
 		panic("faultLowLimit of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataPositiveIntegerValueFaultLowLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataPositiveIntegerValueFaultLowLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FaultLowLimit:                 faultLowLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueHighLimit.go
index 6671fe8fbc2..fe7c001bd2f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueHighLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPositiveIntegerValueHighLimit = (*_BACnetConstructedD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPositiveIntegerValueHighLimit)(nil)
 
 // NewBACnetConstructedDataPositiveIntegerValueHighLimit factory function for _BACnetConstructedDataPositiveIntegerValueHighLimit
-func NewBACnetConstructedDataPositiveIntegerValueHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, highLimit BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueHighLimit {
+func NewBACnetConstructedDataPositiveIntegerValueHighLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, highLimit BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueHighLimit {
 	if highLimit == nil {
 		panic("highLimit of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataPositiveIntegerValueHighLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataPositiveIntegerValueHighLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		HighLimit:                     highLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueLowLimit.go
index f60ee18e4c0..1eb614085af 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueLowLimit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPositiveIntegerValueLowLimit = (*_BACnetConstructedDa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPositiveIntegerValueLowLimit)(nil)
 
 // NewBACnetConstructedDataPositiveIntegerValueLowLimit factory function for _BACnetConstructedDataPositiveIntegerValueLowLimit
-func NewBACnetConstructedDataPositiveIntegerValueLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lowLimit BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueLowLimit {
+func NewBACnetConstructedDataPositiveIntegerValueLowLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, lowLimit BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueLowLimit {
 	if lowLimit == nil {
 		panic("lowLimit of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataPositiveIntegerValueLowLimit must not be nil")
 	}
 	_result := &_BACnetConstructedDataPositiveIntegerValueLowLimit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LowLimit:                      lowLimit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMaxPresValue.go
index 67a1b089430..8dba9c56871 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMaxPresValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPositiveIntegerValueMaxPresValue = (*_BACnetConstruct
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPositiveIntegerValueMaxPresValue)(nil)
 
 // NewBACnetConstructedDataPositiveIntegerValueMaxPresValue factory function for _BACnetConstructedDataPositiveIntegerValueMaxPresValue
-func NewBACnetConstructedDataPositiveIntegerValueMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueMaxPresValue {
+func NewBACnetConstructedDataPositiveIntegerValueMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueMaxPresValue {
 	if maxPresValue == nil {
 		panic("maxPresValue of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataPositiveIntegerValueMaxPresValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataPositiveIntegerValueMaxPresValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxPresValue:                  maxPresValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMinPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMinPresValue.go
index 2c1452df3a8..78530ebc321 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMinPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMinPresValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPositiveIntegerValueMinPresValue = (*_BACnetConstruct
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPositiveIntegerValueMinPresValue)(nil)
 
 // NewBACnetConstructedDataPositiveIntegerValueMinPresValue factory function for _BACnetConstructedDataPositiveIntegerValueMinPresValue
-func NewBACnetConstructedDataPositiveIntegerValueMinPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minPresValue BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueMinPresValue {
+func NewBACnetConstructedDataPositiveIntegerValueMinPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minPresValue BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueMinPresValue {
 	if minPresValue == nil {
 		panic("minPresValue of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataPositiveIntegerValueMinPresValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataPositiveIntegerValueMinPresValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MinPresValue:                  minPresValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueRelinquishDefault.go
index 79dd4ede3cb..46b185baca9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPositiveIntegerValueRelinquishDefault = (*_BACnetCons
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPositiveIntegerValueRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataPositiveIntegerValueRelinquishDefault factory function for _BACnetConstructedDataPositiveIntegerValueRelinquishDefault
-func NewBACnetConstructedDataPositiveIntegerValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueRelinquishDefault {
+func NewBACnetConstructedDataPositiveIntegerValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataPositiveIntegerValueRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataPositiveIntegerValueRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueResolution.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueResolution.go
index de408d1f6f3..362b54dd50e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueResolution.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueResolution.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPositiveIntegerValueResolution = (*_BACnetConstructed
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPositiveIntegerValueResolution)(nil)
 
 // NewBACnetConstructedDataPositiveIntegerValueResolution factory function for _BACnetConstructedDataPositiveIntegerValueResolution
-func NewBACnetConstructedDataPositiveIntegerValueResolution(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, resolution BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueResolution {
+func NewBACnetConstructedDataPositiveIntegerValueResolution(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, resolution BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPositiveIntegerValueResolution {
 	if resolution == nil {
 		panic("resolution of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataPositiveIntegerValueResolution must not be nil")
 	}
 	_result := &_BACnetConstructedDataPositiveIntegerValueResolution{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Resolution:                    resolution,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPower.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPower.go
index e34451c2e22..8e3370e31fa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPower.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPower.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPower = (*_BACnetConstructedDataPower)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPower)(nil)
 
 // NewBACnetConstructedDataPower factory function for _BACnetConstructedDataPower
-func NewBACnetConstructedDataPower(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, power BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPower {
+func NewBACnetConstructedDataPower(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, power BACnetApplicationTagReal) *_BACnetConstructedDataPower {
 	if power == nil {
 		panic("power of type BACnetApplicationTagReal for BACnetConstructedDataPower must not be nil")
 	}
 	_result := &_BACnetConstructedDataPower{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Power:                         power,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPowerMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPowerMode.go
index 66711b976ab..21297cbbeca 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPowerMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPowerMode.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPowerMode = (*_BACnetConstructedDataPowerMode)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPowerMode)(nil)
 
 // NewBACnetConstructedDataPowerMode factory function for _BACnetConstructedDataPowerMode
-func NewBACnetConstructedDataPowerMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, powerMode BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPowerMode {
+func NewBACnetConstructedDataPowerMode(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, powerMode BACnetApplicationTagBoolean) *_BACnetConstructedDataPowerMode {
 	if powerMode == nil {
 		panic("powerMode of type BACnetApplicationTagBoolean for BACnetConstructedDataPowerMode must not be nil")
 	}
 	_result := &_BACnetConstructedDataPowerMode{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PowerMode:                     powerMode,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPrescale.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPrescale.go
index e3d7bd8b8ab..6b8a03daf3c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPrescale.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPrescale.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPrescale = (*_BACnetConstructedDataPrescale)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPrescale)(nil)
 
 // NewBACnetConstructedDataPrescale factory function for _BACnetConstructedDataPrescale
-func NewBACnetConstructedDataPrescale(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, prescale BACnetPrescale, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPrescale {
+func NewBACnetConstructedDataPrescale(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, prescale BACnetPrescale) *_BACnetConstructedDataPrescale {
 	if prescale == nil {
 		panic("prescale of type BACnetPrescale for BACnetConstructedDataPrescale must not be nil")
 	}
 	_result := &_BACnetConstructedDataPrescale{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Prescale:                      prescale,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPresentValue.go
index 6111fac9bac..4900665990b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPresentValue = (*_BACnetConstructedDataPresentValue)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPresentValue)(nil)
 
 // NewBACnetConstructedDataPresentValue factory function for _BACnetConstructedDataPresentValue
-func NewBACnetConstructedDataPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPresentValue {
+func NewBACnetConstructedDataPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriority.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriority.go
index a795f653142..77b5b67750a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriority.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriority.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataPriority = (*_BACnetConstructedDataPriority)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPriority)(nil)
 
 // NewBACnetConstructedDataPriority factory function for _BACnetConstructedDataPriority
-func NewBACnetConstructedDataPriority(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, priority []BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPriority {
+func NewBACnetConstructedDataPriority(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, priority []BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPriority {
 	_result := &_BACnetConstructedDataPriority{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		Priority:                      priority,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityArray.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityArray.go
index dd862392f93..961981c3710 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityArray.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityArray.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPriorityArray = (*_BACnetConstructedDataPriorityArray
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPriorityArray)(nil)
 
 // NewBACnetConstructedDataPriorityArray factory function for _BACnetConstructedDataPriorityArray
-func NewBACnetConstructedDataPriorityArray(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, priorityArray BACnetPriorityArray, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPriorityArray {
+func NewBACnetConstructedDataPriorityArray(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, priorityArray BACnetPriorityArray) *_BACnetConstructedDataPriorityArray {
 	if priorityArray == nil {
 		panic("priorityArray of type BACnetPriorityArray for BACnetConstructedDataPriorityArray must not be nil")
 	}
 	_result := &_BACnetConstructedDataPriorityArray{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PriorityArray:                 priorityArray,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityForWriting.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityForWriting.go
index ddf18d3e7cb..161baf6ccac 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityForWriting.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityForWriting.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPriorityForWriting = (*_BACnetConstructedDataPriority
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPriorityForWriting)(nil)
 
 // NewBACnetConstructedDataPriorityForWriting factory function for _BACnetConstructedDataPriorityForWriting
-func NewBACnetConstructedDataPriorityForWriting(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, priorityForWriting BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPriorityForWriting {
+func NewBACnetConstructedDataPriorityForWriting(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, priorityForWriting BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPriorityForWriting {
 	if priorityForWriting == nil {
 		panic("priorityForWriting of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataPriorityForWriting must not be nil")
 	}
 	_result := &_BACnetConstructedDataPriorityForWriting{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PriorityForWriting:            priorityForWriting,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifier.go
index 77bbd002082..ffbb1f7da0a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifier.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataProcessIdentifier = (*_BACnetConstructedDataProcessId
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataProcessIdentifier)(nil)
 
 // NewBACnetConstructedDataProcessIdentifier factory function for _BACnetConstructedDataProcessIdentifier
-func NewBACnetConstructedDataProcessIdentifier(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, processIdentifier BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataProcessIdentifier {
+func NewBACnetConstructedDataProcessIdentifier(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, processIdentifier BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataProcessIdentifier {
 	if processIdentifier == nil {
 		panic("processIdentifier of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataProcessIdentifier must not be nil")
 	}
 	_result := &_BACnetConstructedDataProcessIdentifier{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ProcessIdentifier:             processIdentifier,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifierFilter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifierFilter.go
index 7ede4f44c7f..a7ffb2fbb9c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifierFilter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifierFilter.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataProcessIdentifierFilter = (*_BACnetConstructedDataPro
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataProcessIdentifierFilter)(nil)
 
 // NewBACnetConstructedDataProcessIdentifierFilter factory function for _BACnetConstructedDataProcessIdentifierFilter
-func NewBACnetConstructedDataProcessIdentifierFilter(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, processIdentifierFilter BACnetProcessIdSelection, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataProcessIdentifierFilter {
+func NewBACnetConstructedDataProcessIdentifierFilter(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, processIdentifierFilter BACnetProcessIdSelection) *_BACnetConstructedDataProcessIdentifierFilter {
 	if processIdentifierFilter == nil {
 		panic("processIdentifierFilter of type BACnetProcessIdSelection for BACnetConstructedDataProcessIdentifierFilter must not be nil")
 	}
 	_result := &_BACnetConstructedDataProcessIdentifierFilter{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ProcessIdentifierFilter:       processIdentifierFilter,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileLocation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileLocation.go
index 1c590d677d6..e2f174adc8a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileLocation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileLocation.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataProfileLocation = (*_BACnetConstructedDataProfileLoca
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataProfileLocation)(nil)
 
 // NewBACnetConstructedDataProfileLocation factory function for _BACnetConstructedDataProfileLocation
-func NewBACnetConstructedDataProfileLocation(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, profileLocation BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataProfileLocation {
+func NewBACnetConstructedDataProfileLocation(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, profileLocation BACnetApplicationTagCharacterString) *_BACnetConstructedDataProfileLocation {
 	if profileLocation == nil {
 		panic("profileLocation of type BACnetApplicationTagCharacterString for BACnetConstructedDataProfileLocation must not be nil")
 	}
 	_result := &_BACnetConstructedDataProfileLocation{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ProfileLocation:               profileLocation,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileName.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileName.go
index 20885ee957a..ce696d4a92f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileName.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileName.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataProfileName = (*_BACnetConstructedDataProfileName)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataProfileName)(nil)
 
 // NewBACnetConstructedDataProfileName factory function for _BACnetConstructedDataProfileName
-func NewBACnetConstructedDataProfileName(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, profileName BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataProfileName {
+func NewBACnetConstructedDataProfileName(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, profileName BACnetApplicationTagCharacterString) *_BACnetConstructedDataProfileName {
 	if profileName == nil {
 		panic("profileName of type BACnetApplicationTagCharacterString for BACnetConstructedDataProfileName must not be nil")
 	}
 	_result := &_BACnetConstructedDataProfileName{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ProfileName:                   profileName,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramAll.go
index 4200aa66906..9e6ef1af5e5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataProgramAll = (*_BACnetConstructedDataProgramAll)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataProgramAll)(nil)
 
 // NewBACnetConstructedDataProgramAll factory function for _BACnetConstructedDataProgramAll
-func NewBACnetConstructedDataProgramAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataProgramAll {
+func NewBACnetConstructedDataProgramAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataProgramAll {
 	_result := &_BACnetConstructedDataProgramAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramChange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramChange.go
index fbacc725d5c..f7bc8d4b8fb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramChange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramChange.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataProgramChange = (*_BACnetConstructedDataProgramChange
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataProgramChange)(nil)
 
 // NewBACnetConstructedDataProgramChange factory function for _BACnetConstructedDataProgramChange
-func NewBACnetConstructedDataProgramChange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, programChange BACnetProgramRequestTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataProgramChange {
+func NewBACnetConstructedDataProgramChange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, programChange BACnetProgramRequestTagged) *_BACnetConstructedDataProgramChange {
 	if programChange == nil {
 		panic("programChange of type BACnetProgramRequestTagged for BACnetConstructedDataProgramChange must not be nil")
 	}
 	_result := &_BACnetConstructedDataProgramChange{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ProgramChange:                 programChange,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramLocation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramLocation.go
index e58b6dac1e3..12317b2d4f7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramLocation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramLocation.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataProgramLocation = (*_BACnetConstructedDataProgramLoca
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataProgramLocation)(nil)
 
 // NewBACnetConstructedDataProgramLocation factory function for _BACnetConstructedDataProgramLocation
-func NewBACnetConstructedDataProgramLocation(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, programLocation BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataProgramLocation {
+func NewBACnetConstructedDataProgramLocation(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, programLocation BACnetApplicationTagCharacterString) *_BACnetConstructedDataProgramLocation {
 	if programLocation == nil {
 		panic("programLocation of type BACnetApplicationTagCharacterString for BACnetConstructedDataProgramLocation must not be nil")
 	}
 	_result := &_BACnetConstructedDataProgramLocation{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ProgramLocation:               programLocation,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramState.go
index 1ff4f133e37..a926fba0ddb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramState.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataProgramState = (*_BACnetConstructedDataProgramState)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataProgramState)(nil)
 
 // NewBACnetConstructedDataProgramState factory function for _BACnetConstructedDataProgramState
-func NewBACnetConstructedDataProgramState(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, programState BACnetProgramStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataProgramState {
+func NewBACnetConstructedDataProgramState(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, programState BACnetProgramStateTagged) *_BACnetConstructedDataProgramState {
 	if programState == nil {
 		panic("programState of type BACnetProgramStateTagged for BACnetConstructedDataProgramState must not be nil")
 	}
 	_result := &_BACnetConstructedDataProgramState{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ProgramState:                  programState,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPropertyList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPropertyList.go
index 2427c6dac87..4a9e64fd3f5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPropertyList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPropertyList.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataPropertyList = (*_BACnetConstructedDataPropertyList)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPropertyList)(nil)
 
 // NewBACnetConstructedDataPropertyList factory function for _BACnetConstructedDataPropertyList
-func NewBACnetConstructedDataPropertyList(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, propertyList []BACnetPropertyIdentifierTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPropertyList {
+func NewBACnetConstructedDataPropertyList(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, propertyList []BACnetPropertyIdentifierTagged) *_BACnetConstructedDataPropertyList {
 	_result := &_BACnetConstructedDataPropertyList{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		PropertyList:                  propertyList,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstant.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstant.go
index 54c9bff7940..34a8f423402 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstant.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstant.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataProportionalConstant = (*_BACnetConstructedDataPropor
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataProportionalConstant)(nil)
 
 // NewBACnetConstructedDataProportionalConstant factory function for _BACnetConstructedDataProportionalConstant
-func NewBACnetConstructedDataProportionalConstant(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, proportionalConstant BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataProportionalConstant {
+func NewBACnetConstructedDataProportionalConstant(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, proportionalConstant BACnetApplicationTagReal) *_BACnetConstructedDataProportionalConstant {
 	if proportionalConstant == nil {
 		panic("proportionalConstant of type BACnetApplicationTagReal for BACnetConstructedDataProportionalConstant must not be nil")
 	}
 	_result := &_BACnetConstructedDataProportionalConstant{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ProportionalConstant:          proportionalConstant,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstantUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstantUnits.go
index ac8aba867a4..1490ce57df0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstantUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstantUnits.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataProportionalConstantUnits = (*_BACnetConstructedDataP
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataProportionalConstantUnits)(nil)
 
 // NewBACnetConstructedDataProportionalConstantUnits factory function for _BACnetConstructedDataProportionalConstantUnits
-func NewBACnetConstructedDataProportionalConstantUnits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, units BACnetEngineeringUnitsTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataProportionalConstantUnits {
+func NewBACnetConstructedDataProportionalConstantUnits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, units BACnetEngineeringUnitsTagged) *_BACnetConstructedDataProportionalConstantUnits {
 	if units == nil {
 		panic("units of type BACnetEngineeringUnitsTagged for BACnetConstructedDataProportionalConstantUnits must not be nil")
 	}
 	_result := &_BACnetConstructedDataProportionalConstantUnits{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Units:                         units,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolLevel.go
index e4477fcf99e..cc36f2102dc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolLevel.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataProtocolLevel = (*_BACnetConstructedDataProtocolLevel
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataProtocolLevel)(nil)
 
 // NewBACnetConstructedDataProtocolLevel factory function for _BACnetConstructedDataProtocolLevel
-func NewBACnetConstructedDataProtocolLevel(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, protocolLevel BACnetProtocolLevelTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataProtocolLevel {
+func NewBACnetConstructedDataProtocolLevel(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, protocolLevel BACnetProtocolLevelTagged) *_BACnetConstructedDataProtocolLevel {
 	if protocolLevel == nil {
 		panic("protocolLevel of type BACnetProtocolLevelTagged for BACnetConstructedDataProtocolLevel must not be nil")
 	}
 	_result := &_BACnetConstructedDataProtocolLevel{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ProtocolLevel:                 protocolLevel,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolObjectTypesSupported.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolObjectTypesSupported.go
index 07086ce4bfc..da677041fda 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolObjectTypesSupported.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolObjectTypesSupported.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataProtocolObjectTypesSupported = (*_BACnetConstructedDa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataProtocolObjectTypesSupported)(nil)
 
 // NewBACnetConstructedDataProtocolObjectTypesSupported factory function for _BACnetConstructedDataProtocolObjectTypesSupported
-func NewBACnetConstructedDataProtocolObjectTypesSupported(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, protocolObjectTypesSupported BACnetObjectTypesSupportedTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataProtocolObjectTypesSupported {
+func NewBACnetConstructedDataProtocolObjectTypesSupported(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, protocolObjectTypesSupported BACnetObjectTypesSupportedTagged) *_BACnetConstructedDataProtocolObjectTypesSupported {
 	if protocolObjectTypesSupported == nil {
 		panic("protocolObjectTypesSupported of type BACnetObjectTypesSupportedTagged for BACnetConstructedDataProtocolObjectTypesSupported must not be nil")
 	}
 	_result := &_BACnetConstructedDataProtocolObjectTypesSupported{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ProtocolObjectTypesSupported:  protocolObjectTypesSupported,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolRevision.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolRevision.go
index a6c66fd979f..8efbb4f455d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolRevision.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolRevision.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataProtocolRevision = (*_BACnetConstructedDataProtocolRe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataProtocolRevision)(nil)
 
 // NewBACnetConstructedDataProtocolRevision factory function for _BACnetConstructedDataProtocolRevision
-func NewBACnetConstructedDataProtocolRevision(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, protocolRevision BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataProtocolRevision {
+func NewBACnetConstructedDataProtocolRevision(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, protocolRevision BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataProtocolRevision {
 	if protocolRevision == nil {
 		panic("protocolRevision of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataProtocolRevision must not be nil")
 	}
 	_result := &_BACnetConstructedDataProtocolRevision{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ProtocolRevision:              protocolRevision,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolServicesSupported.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolServicesSupported.go
index 20a7c2cee70..3ee50d0cf3d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolServicesSupported.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolServicesSupported.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataProtocolServicesSupported = (*_BACnetConstructedDataP
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataProtocolServicesSupported)(nil)
 
 // NewBACnetConstructedDataProtocolServicesSupported factory function for _BACnetConstructedDataProtocolServicesSupported
-func NewBACnetConstructedDataProtocolServicesSupported(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, protocolServicesSupported BACnetServicesSupportedTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataProtocolServicesSupported {
+func NewBACnetConstructedDataProtocolServicesSupported(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, protocolServicesSupported BACnetServicesSupportedTagged) *_BACnetConstructedDataProtocolServicesSupported {
 	if protocolServicesSupported == nil {
 		panic("protocolServicesSupported of type BACnetServicesSupportedTagged for BACnetConstructedDataProtocolServicesSupported must not be nil")
 	}
 	_result := &_BACnetConstructedDataProtocolServicesSupported{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ProtocolServicesSupported:     protocolServicesSupported,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolVersion.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolVersion.go
index 208d35baf57..71270904c6b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolVersion.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolVersion.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataProtocolVersion = (*_BACnetConstructedDataProtocolVer
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataProtocolVersion)(nil)
 
 // NewBACnetConstructedDataProtocolVersion factory function for _BACnetConstructedDataProtocolVersion
-func NewBACnetConstructedDataProtocolVersion(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, protocolVersion BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataProtocolVersion {
+func NewBACnetConstructedDataProtocolVersion(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, protocolVersion BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataProtocolVersion {
 	if protocolVersion == nil {
 		panic("protocolVersion of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataProtocolVersion must not be nil")
 	}
 	_result := &_BACnetConstructedDataProtocolVersion{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ProtocolVersion:               protocolVersion,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAdjustValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAdjustValue.go
index cc80d58588a..41a865f224f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAdjustValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAdjustValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPulseConverterAdjustValue = (*_BACnetConstructedDataP
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPulseConverterAdjustValue)(nil)
 
 // NewBACnetConstructedDataPulseConverterAdjustValue factory function for _BACnetConstructedDataPulseConverterAdjustValue
-func NewBACnetConstructedDataPulseConverterAdjustValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, adjustValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPulseConverterAdjustValue {
+func NewBACnetConstructedDataPulseConverterAdjustValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, adjustValue BACnetApplicationTagReal) *_BACnetConstructedDataPulseConverterAdjustValue {
 	if adjustValue == nil {
 		panic("adjustValue of type BACnetApplicationTagReal for BACnetConstructedDataPulseConverterAdjustValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataPulseConverterAdjustValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AdjustValue:                   adjustValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAll.go
index 45edf41f395..1b176e3cefd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataPulseConverterAll = (*_BACnetConstructedDataPulseConv
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPulseConverterAll)(nil)
 
 // NewBACnetConstructedDataPulseConverterAll factory function for _BACnetConstructedDataPulseConverterAll
-func NewBACnetConstructedDataPulseConverterAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPulseConverterAll {
+func NewBACnetConstructedDataPulseConverterAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataPulseConverterAll {
 	_result := &_BACnetConstructedDataPulseConverterAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterPresentValue.go
index 40395d30f6c..a01bea45055 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterPresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPulseConverterPresentValue = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPulseConverterPresentValue)(nil)
 
 // NewBACnetConstructedDataPulseConverterPresentValue factory function for _BACnetConstructedDataPulseConverterPresentValue
-func NewBACnetConstructedDataPulseConverterPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPulseConverterPresentValue {
+func NewBACnetConstructedDataPulseConverterPresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagReal) *_BACnetConstructedDataPulseConverterPresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagReal for BACnetConstructedDataPulseConverterPresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataPulseConverterPresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseRate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseRate.go
index 0f72010441c..b528dfc1a08 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseRate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseRate.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataPulseRate = (*_BACnetConstructedDataPulseRate)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataPulseRate)(nil)
 
 // NewBACnetConstructedDataPulseRate factory function for _BACnetConstructedDataPulseRate
-func NewBACnetConstructedDataPulseRate(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, pulseRate BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataPulseRate {
+func NewBACnetConstructedDataPulseRate(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, pulseRate BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataPulseRate {
 	if pulseRate == nil {
 		panic("pulseRate of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataPulseRate must not be nil")
 	}
 	_result := &_BACnetConstructedDataPulseRate{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PulseRate:                     pulseRate,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReadOnly.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReadOnly.go
index 1eca167288d..4152fbddc15 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReadOnly.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReadOnly.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataReadOnly = (*_BACnetConstructedDataReadOnly)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataReadOnly)(nil)
 
 // NewBACnetConstructedDataReadOnly factory function for _BACnetConstructedDataReadOnly
-func NewBACnetConstructedDataReadOnly(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, readOnly BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataReadOnly {
+func NewBACnetConstructedDataReadOnly(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, readOnly BACnetApplicationTagBoolean) *_BACnetConstructedDataReadOnly {
 	if readOnly == nil {
 		panic("readOnly of type BACnetApplicationTagBoolean for BACnetConstructedDataReadOnly must not be nil")
 	}
 	_result := &_BACnetConstructedDataReadOnly{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ReadOnly:                      readOnly,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForDisable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForDisable.go
index 986f008e1c6..381c6183a0e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForDisable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForDisable.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataReasonForDisable = (*_BACnetConstructedDataReasonForD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataReasonForDisable)(nil)
 
 // NewBACnetConstructedDataReasonForDisable factory function for _BACnetConstructedDataReasonForDisable
-func NewBACnetConstructedDataReasonForDisable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, reasonForDisable []BACnetAccessCredentialDisableReasonTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataReasonForDisable {
+func NewBACnetConstructedDataReasonForDisable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, reasonForDisable []BACnetAccessCredentialDisableReasonTagged) *_BACnetConstructedDataReasonForDisable {
 	_result := &_BACnetConstructedDataReasonForDisable{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ReasonForDisable:              reasonForDisable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForHalt.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForHalt.go
index 3a35f141886..58f6e0513dd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForHalt.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForHalt.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataReasonForHalt = (*_BACnetConstructedDataReasonForHalt
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataReasonForHalt)(nil)
 
 // NewBACnetConstructedDataReasonForHalt factory function for _BACnetConstructedDataReasonForHalt
-func NewBACnetConstructedDataReasonForHalt(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, programError BACnetProgramErrorTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataReasonForHalt {
+func NewBACnetConstructedDataReasonForHalt(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, programError BACnetProgramErrorTagged) *_BACnetConstructedDataReasonForHalt {
 	if programError == nil {
 		panic("programError of type BACnetProgramErrorTagged for BACnetConstructedDataReasonForHalt must not be nil")
 	}
 	_result := &_BACnetConstructedDataReasonForHalt{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ProgramError:                  programError,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecipientList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecipientList.go
index bb16558a55a..b15be9f36b7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecipientList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecipientList.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataRecipientList = (*_BACnetConstructedDataRecipientList
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataRecipientList)(nil)
 
 // NewBACnetConstructedDataRecipientList factory function for _BACnetConstructedDataRecipientList
-func NewBACnetConstructedDataRecipientList(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, recipientList []BACnetDestination, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataRecipientList {
+func NewBACnetConstructedDataRecipientList(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, recipientList []BACnetDestination) *_BACnetConstructedDataRecipientList {
 	_result := &_BACnetConstructedDataRecipientList{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RecipientList:                 recipientList,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordCount.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordCount.go
index 92f85dcfcb0..8800ed58e2b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordCount.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordCount.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataRecordCount = (*_BACnetConstructedDataRecordCount)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataRecordCount)(nil)
 
 // NewBACnetConstructedDataRecordCount factory function for _BACnetConstructedDataRecordCount
-func NewBACnetConstructedDataRecordCount(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, recordCount BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataRecordCount {
+func NewBACnetConstructedDataRecordCount(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, recordCount BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataRecordCount {
 	if recordCount == nil {
 		panic("recordCount of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataRecordCount must not be nil")
 	}
 	_result := &_BACnetConstructedDataRecordCount{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RecordCount:                   recordCount,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordsSinceNotification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordsSinceNotification.go
index 946311857eb..57df77ea85d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordsSinceNotification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordsSinceNotification.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataRecordsSinceNotification = (*_BACnetConstructedDataRe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataRecordsSinceNotification)(nil)
 
 // NewBACnetConstructedDataRecordsSinceNotification factory function for _BACnetConstructedDataRecordsSinceNotification
-func NewBACnetConstructedDataRecordsSinceNotification(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, recordsSinceNotifications BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataRecordsSinceNotification {
+func NewBACnetConstructedDataRecordsSinceNotification(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, recordsSinceNotifications BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataRecordsSinceNotification {
 	if recordsSinceNotifications == nil {
 		panic("recordsSinceNotifications of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataRecordsSinceNotification must not be nil")
 	}
 	_result := &_BACnetConstructedDataRecordsSinceNotification{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RecordsSinceNotifications:     recordsSinceNotifications,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReferencePort.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReferencePort.go
index fde9172fa3b..22ceccbf991 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReferencePort.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReferencePort.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataReferencePort = (*_BACnetConstructedDataReferencePort
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataReferencePort)(nil)
 
 // NewBACnetConstructedDataReferencePort factory function for _BACnetConstructedDataReferencePort
-func NewBACnetConstructedDataReferencePort(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, referencePort BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataReferencePort {
+func NewBACnetConstructedDataReferencePort(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, referencePort BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataReferencePort {
 	if referencePort == nil {
 		panic("referencePort of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataReferencePort must not be nil")
 	}
 	_result := &_BACnetConstructedDataReferencePort{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ReferencePort:                 referencePort,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRegisteredCarCall.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRegisteredCarCall.go
index 7598079382d..73b575b6c1b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRegisteredCarCall.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRegisteredCarCall.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataRegisteredCarCall = (*_BACnetConstructedDataRegistere
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataRegisteredCarCall)(nil)
 
 // NewBACnetConstructedDataRegisteredCarCall factory function for _BACnetConstructedDataRegisteredCarCall
-func NewBACnetConstructedDataRegisteredCarCall(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, registeredCarCall []BACnetLiftCarCallList, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataRegisteredCarCall {
+func NewBACnetConstructedDataRegisteredCarCall(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, registeredCarCall []BACnetLiftCarCallList) *_BACnetConstructedDataRegisteredCarCall {
 	_result := &_BACnetConstructedDataRegisteredCarCall{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		RegisteredCarCall:             registeredCarCall,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliability.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliability.go
index fa3d4f3f9f2..e8d66eb7f5f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliability.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliability.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataReliability = (*_BACnetConstructedDataReliability)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataReliability)(nil)
 
 // NewBACnetConstructedDataReliability factory function for _BACnetConstructedDataReliability
-func NewBACnetConstructedDataReliability(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, reliability BACnetReliabilityTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataReliability {
+func NewBACnetConstructedDataReliability(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, reliability BACnetReliabilityTagged) *_BACnetConstructedDataReliability {
 	if reliability == nil {
 		panic("reliability of type BACnetReliabilityTagged for BACnetConstructedDataReliability must not be nil")
 	}
 	_result := &_BACnetConstructedDataReliability{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Reliability:                   reliability,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliabilityEvaluationInhibit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliabilityEvaluationInhibit.go
index cbeb77718e3..17cf6c4dba4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliabilityEvaluationInhibit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliabilityEvaluationInhibit.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataReliabilityEvaluationInhibit = (*_BACnetConstructedDa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataReliabilityEvaluationInhibit)(nil)
 
 // NewBACnetConstructedDataReliabilityEvaluationInhibit factory function for _BACnetConstructedDataReliabilityEvaluationInhibit
-func NewBACnetConstructedDataReliabilityEvaluationInhibit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, reliabilityEvaluationInhibit BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataReliabilityEvaluationInhibit {
+func NewBACnetConstructedDataReliabilityEvaluationInhibit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, reliabilityEvaluationInhibit BACnetApplicationTagBoolean) *_BACnetConstructedDataReliabilityEvaluationInhibit {
 	if reliabilityEvaluationInhibit == nil {
 		panic("reliabilityEvaluationInhibit of type BACnetApplicationTagBoolean for BACnetConstructedDataReliabilityEvaluationInhibit must not be nil")
 	}
 	_result := &_BACnetConstructedDataReliabilityEvaluationInhibit{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ReliabilityEvaluationInhibit:  reliabilityEvaluationInhibit,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRelinquishDefault.go
index 015c5cdf691..c3cf0e63b6f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataRelinquishDefault = (*_BACnetConstructedDataRelinquis
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataRelinquishDefault factory function for _BACnetConstructedDataRelinquishDefault
-func NewBACnetConstructedDataRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataRelinquishDefault {
+func NewBACnetConstructedDataRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRepresents.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRepresents.go
index 5ba36f15029..daf328dd30c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRepresents.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRepresents.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataRepresents = (*_BACnetConstructedDataRepresents)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataRepresents)(nil)
 
 // NewBACnetConstructedDataRepresents factory function for _BACnetConstructedDataRepresents
-func NewBACnetConstructedDataRepresents(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, represents BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataRepresents {
+func NewBACnetConstructedDataRepresents(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, represents BACnetDeviceObjectReference) *_BACnetConstructedDataRepresents {
 	if represents == nil {
 		panic("represents of type BACnetDeviceObjectReference for BACnetConstructedDataRepresents must not be nil")
 	}
 	_result := &_BACnetConstructedDataRepresents{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Represents:                    represents,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedShedLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedShedLevel.go
index 4c5afcdb1b0..06af8702acd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedShedLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedShedLevel.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataRequestedShedLevel = (*_BACnetConstructedDataRequeste
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataRequestedShedLevel)(nil)
 
 // NewBACnetConstructedDataRequestedShedLevel factory function for _BACnetConstructedDataRequestedShedLevel
-func NewBACnetConstructedDataRequestedShedLevel(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, requestedShedLevel BACnetShedLevel, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataRequestedShedLevel {
+func NewBACnetConstructedDataRequestedShedLevel(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, requestedShedLevel BACnetShedLevel) *_BACnetConstructedDataRequestedShedLevel {
 	if requestedShedLevel == nil {
 		panic("requestedShedLevel of type BACnetShedLevel for BACnetConstructedDataRequestedShedLevel must not be nil")
 	}
 	_result := &_BACnetConstructedDataRequestedShedLevel{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RequestedShedLevel:            requestedShedLevel,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedUpdateInterval.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedUpdateInterval.go
index 4141f4efd34..56ec4b72af3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedUpdateInterval.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedUpdateInterval.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataRequestedUpdateInterval = (*_BACnetConstructedDataReq
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataRequestedUpdateInterval)(nil)
 
 // NewBACnetConstructedDataRequestedUpdateInterval factory function for _BACnetConstructedDataRequestedUpdateInterval
-func NewBACnetConstructedDataRequestedUpdateInterval(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, requestedUpdateInterval BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataRequestedUpdateInterval {
+func NewBACnetConstructedDataRequestedUpdateInterval(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, requestedUpdateInterval BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataRequestedUpdateInterval {
 	if requestedUpdateInterval == nil {
 		panic("requestedUpdateInterval of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataRequestedUpdateInterval must not be nil")
 	}
 	_result := &_BACnetConstructedDataRequestedUpdateInterval{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RequestedUpdateInterval:       requestedUpdateInterval,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequired.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequired.go
index 13d8c13f883..9ddc2aad651 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequired.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequired.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataRequired = (*_BACnetConstructedDataRequired)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataRequired)(nil)
 
 // NewBACnetConstructedDataRequired factory function for _BACnetConstructedDataRequired
-func NewBACnetConstructedDataRequired(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataRequired {
+func NewBACnetConstructedDataRequired(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataRequired {
 	_result := &_BACnetConstructedDataRequired{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataResolution.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataResolution.go
index 804d7358b2f..cd58b468108 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataResolution.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataResolution.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataResolution = (*_BACnetConstructedDataResolution)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataResolution)(nil)
 
 // NewBACnetConstructedDataResolution factory function for _BACnetConstructedDataResolution
-func NewBACnetConstructedDataResolution(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, resolution BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataResolution {
+func NewBACnetConstructedDataResolution(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, resolution BACnetApplicationTagReal) *_BACnetConstructedDataResolution {
 	if resolution == nil {
 		panic("resolution of type BACnetApplicationTagReal for BACnetConstructedDataResolution must not be nil")
 	}
 	_result := &_BACnetConstructedDataResolution{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Resolution:                    resolution,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestartNotificationRecipients.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestartNotificationRecipients.go
index 9ddde97a1ca..7bbf2ce3a8a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestartNotificationRecipients.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestartNotificationRecipients.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataRestartNotificationRecipients = (*_BACnetConstructedD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataRestartNotificationRecipients)(nil)
 
 // NewBACnetConstructedDataRestartNotificationRecipients factory function for _BACnetConstructedDataRestartNotificationRecipients
-func NewBACnetConstructedDataRestartNotificationRecipients(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, restartNotificationRecipients []BACnetRecipient, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataRestartNotificationRecipients {
+func NewBACnetConstructedDataRestartNotificationRecipients(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, restartNotificationRecipients []BACnetRecipient) *_BACnetConstructedDataRestartNotificationRecipients {
 	_result := &_BACnetConstructedDataRestartNotificationRecipients{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RestartNotificationRecipients: restartNotificationRecipients,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestoreCompletionTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestoreCompletionTime.go
index 58846146c05..415a21d5cdf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestoreCompletionTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestoreCompletionTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataRestoreCompletionTime = (*_BACnetConstructedDataResto
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataRestoreCompletionTime)(nil)
 
 // NewBACnetConstructedDataRestoreCompletionTime factory function for _BACnetConstructedDataRestoreCompletionTime
-func NewBACnetConstructedDataRestoreCompletionTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, completionTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataRestoreCompletionTime {
+func NewBACnetConstructedDataRestoreCompletionTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, completionTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataRestoreCompletionTime {
 	if completionTime == nil {
 		panic("completionTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataRestoreCompletionTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataRestoreCompletionTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		CompletionTime:                completionTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestorePreparationTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestorePreparationTime.go
index 6d3c02a6e9f..897ecc58af8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestorePreparationTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestorePreparationTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataRestorePreparationTime = (*_BACnetConstructedDataRest
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataRestorePreparationTime)(nil)
 
 // NewBACnetConstructedDataRestorePreparationTime factory function for _BACnetConstructedDataRestorePreparationTime
-func NewBACnetConstructedDataRestorePreparationTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, restorePreparationTime BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataRestorePreparationTime {
+func NewBACnetConstructedDataRestorePreparationTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, restorePreparationTime BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataRestorePreparationTime {
 	if restorePreparationTime == nil {
 		panic("restorePreparationTime of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataRestorePreparationTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataRestorePreparationTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RestorePreparationTime:        restorePreparationTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRoutingTable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRoutingTable.go
index a8c6797f447..070ed530d8c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRoutingTable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRoutingTable.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataRoutingTable = (*_BACnetConstructedDataRoutingTable)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataRoutingTable)(nil)
 
 // NewBACnetConstructedDataRoutingTable factory function for _BACnetConstructedDataRoutingTable
-func NewBACnetConstructedDataRoutingTable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, routingTable []BACnetRouterEntry, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataRoutingTable {
+func NewBACnetConstructedDataRoutingTable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, routingTable []BACnetRouterEntry) *_BACnetConstructedDataRoutingTable {
 	_result := &_BACnetConstructedDataRoutingTable{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RoutingTable:                  routingTable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScale.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScale.go
index 7177a7fdc8d..d71b883911b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScale.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScale.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataScale = (*_BACnetConstructedDataScale)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataScale)(nil)
 
 // NewBACnetConstructedDataScale factory function for _BACnetConstructedDataScale
-func NewBACnetConstructedDataScale(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, scale BACnetScale, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataScale {
+func NewBACnetConstructedDataScale(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, scale BACnetScale) *_BACnetConstructedDataScale {
 	if scale == nil {
 		panic("scale of type BACnetScale for BACnetConstructedDataScale must not be nil")
 	}
 	_result := &_BACnetConstructedDataScale{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Scale:                         scale,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScaleFactor.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScaleFactor.go
index f10f5874bd1..bf51715add1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScaleFactor.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScaleFactor.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataScaleFactor = (*_BACnetConstructedDataScaleFactor)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataScaleFactor)(nil)
 
 // NewBACnetConstructedDataScaleFactor factory function for _BACnetConstructedDataScaleFactor
-func NewBACnetConstructedDataScaleFactor(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, scaleFactor BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataScaleFactor {
+func NewBACnetConstructedDataScaleFactor(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, scaleFactor BACnetApplicationTagReal) *_BACnetConstructedDataScaleFactor {
 	if scaleFactor == nil {
 		panic("scaleFactor of type BACnetApplicationTagReal for BACnetConstructedDataScaleFactor must not be nil")
 	}
 	_result := &_BACnetConstructedDataScaleFactor{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ScaleFactor:                   scaleFactor,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleAll.go
index f18230b6174..7717eb1664d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataScheduleAll = (*_BACnetConstructedDataScheduleAll)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataScheduleAll)(nil)
 
 // NewBACnetConstructedDataScheduleAll factory function for _BACnetConstructedDataScheduleAll
-func NewBACnetConstructedDataScheduleAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataScheduleAll {
+func NewBACnetConstructedDataScheduleAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataScheduleAll {
 	_result := &_BACnetConstructedDataScheduleAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleDefault.go
index d41d9155bc7..28cfd82d0b7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataScheduleDefault = (*_BACnetConstructedDataScheduleDef
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataScheduleDefault)(nil)
 
 // NewBACnetConstructedDataScheduleDefault factory function for _BACnetConstructedDataScheduleDefault
-func NewBACnetConstructedDataScheduleDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, scheduleDefault BACnetConstructedDataElement, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataScheduleDefault {
+func NewBACnetConstructedDataScheduleDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, scheduleDefault BACnetConstructedDataElement) *_BACnetConstructedDataScheduleDefault {
 	if scheduleDefault == nil {
 		panic("scheduleDefault of type BACnetConstructedDataElement for BACnetConstructedDataScheduleDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataScheduleDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ScheduleDefault:               scheduleDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSchedulePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSchedulePresentValue.go
index 2647f1a9485..0b9dd36a151 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSchedulePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSchedulePresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataSchedulePresentValue = (*_BACnetConstructedDataSchedu
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSchedulePresentValue)(nil)
 
 // NewBACnetConstructedDataSchedulePresentValue factory function for _BACnetConstructedDataSchedulePresentValue
-func NewBACnetConstructedDataSchedulePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetConstructedDataElement, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSchedulePresentValue {
+func NewBACnetConstructedDataSchedulePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetConstructedDataElement) *_BACnetConstructedDataSchedulePresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetConstructedDataElement for BACnetConstructedDataSchedulePresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataSchedulePresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecuredStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecuredStatus.go
index 03d7be1e345..ace4b7e292f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecuredStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecuredStatus.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataSecuredStatus = (*_BACnetConstructedDataSecuredStatus
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSecuredStatus)(nil)
 
 // NewBACnetConstructedDataSecuredStatus factory function for _BACnetConstructedDataSecuredStatus
-func NewBACnetConstructedDataSecuredStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, securedStatus BACnetDoorSecuredStatusTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSecuredStatus {
+func NewBACnetConstructedDataSecuredStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, securedStatus BACnetDoorSecuredStatusTagged) *_BACnetConstructedDataSecuredStatus {
 	if securedStatus == nil {
 		panic("securedStatus of type BACnetDoorSecuredStatusTagged for BACnetConstructedDataSecuredStatus must not be nil")
 	}
 	_result := &_BACnetConstructedDataSecuredStatus{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		SecuredStatus:                 securedStatus,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityPDUTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityPDUTimeout.go
index e61c66f7a9b..a77fce9cffd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityPDUTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityPDUTimeout.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataSecurityPDUTimeout = (*_BACnetConstructedDataSecurity
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSecurityPDUTimeout)(nil)
 
 // NewBACnetConstructedDataSecurityPDUTimeout factory function for _BACnetConstructedDataSecurityPDUTimeout
-func NewBACnetConstructedDataSecurityPDUTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, securityPduTimeout BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSecurityPDUTimeout {
+func NewBACnetConstructedDataSecurityPDUTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, securityPduTimeout BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataSecurityPDUTimeout {
 	if securityPduTimeout == nil {
 		panic("securityPduTimeout of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataSecurityPDUTimeout must not be nil")
 	}
 	_result := &_BACnetConstructedDataSecurityPDUTimeout{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		SecurityPduTimeout:            securityPduTimeout,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityTimeWindow.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityTimeWindow.go
index f9b5fe879df..bac0380d4b2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityTimeWindow.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityTimeWindow.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataSecurityTimeWindow = (*_BACnetConstructedDataSecurity
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSecurityTimeWindow)(nil)
 
 // NewBACnetConstructedDataSecurityTimeWindow factory function for _BACnetConstructedDataSecurityTimeWindow
-func NewBACnetConstructedDataSecurityTimeWindow(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, securityTimeWindow BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSecurityTimeWindow {
+func NewBACnetConstructedDataSecurityTimeWindow(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, securityTimeWindow BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataSecurityTimeWindow {
 	if securityTimeWindow == nil {
 		panic("securityTimeWindow of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataSecurityTimeWindow must not be nil")
 	}
 	_result := &_BACnetConstructedDataSecurityTimeWindow{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		SecurityTimeWindow:            securityTimeWindow,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSegmentationSupported.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSegmentationSupported.go
index b57caf0d85f..a53677dad67 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSegmentationSupported.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSegmentationSupported.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataSegmentationSupported = (*_BACnetConstructedDataSegme
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSegmentationSupported)(nil)
 
 // NewBACnetConstructedDataSegmentationSupported factory function for _BACnetConstructedDataSegmentationSupported
-func NewBACnetConstructedDataSegmentationSupported(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, segmentationSupported BACnetSegmentationTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSegmentationSupported {
+func NewBACnetConstructedDataSegmentationSupported(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, segmentationSupported BACnetSegmentationTagged) *_BACnetConstructedDataSegmentationSupported {
 	if segmentationSupported == nil {
 		panic("segmentationSupported of type BACnetSegmentationTagged for BACnetConstructedDataSegmentationSupported must not be nil")
 	}
 	_result := &_BACnetConstructedDataSegmentationSupported{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		SegmentationSupported:         segmentationSupported,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSerialNumber.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSerialNumber.go
index 89c06d1b0a8..89d85717871 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSerialNumber.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSerialNumber.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataSerialNumber = (*_BACnetConstructedDataSerialNumber)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSerialNumber)(nil)
 
 // NewBACnetConstructedDataSerialNumber factory function for _BACnetConstructedDataSerialNumber
-func NewBACnetConstructedDataSerialNumber(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, serialNumber BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSerialNumber {
+func NewBACnetConstructedDataSerialNumber(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, serialNumber BACnetApplicationTagCharacterString) *_BACnetConstructedDataSerialNumber {
 	if serialNumber == nil {
 		panic("serialNumber of type BACnetApplicationTagCharacterString for BACnetConstructedDataSerialNumber must not be nil")
 	}
 	_result := &_BACnetConstructedDataSerialNumber{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		SerialNumber:                  serialNumber,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpoint.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpoint.go
index c8cea9b66ce..101f1a42cc5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpoint.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpoint.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataSetpoint = (*_BACnetConstructedDataSetpoint)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSetpoint)(nil)
 
 // NewBACnetConstructedDataSetpoint factory function for _BACnetConstructedDataSetpoint
-func NewBACnetConstructedDataSetpoint(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, setpoint BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSetpoint {
+func NewBACnetConstructedDataSetpoint(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, setpoint BACnetApplicationTagReal) *_BACnetConstructedDataSetpoint {
 	if setpoint == nil {
 		panic("setpoint of type BACnetApplicationTagReal for BACnetConstructedDataSetpoint must not be nil")
 	}
 	_result := &_BACnetConstructedDataSetpoint{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Setpoint:                      setpoint,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpointReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpointReference.go
index aa3f346e1d0..3fd3d2c7510 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpointReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpointReference.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataSetpointReference = (*_BACnetConstructedDataSetpointR
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSetpointReference)(nil)
 
 // NewBACnetConstructedDataSetpointReference factory function for _BACnetConstructedDataSetpointReference
-func NewBACnetConstructedDataSetpointReference(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, setpointReference BACnetSetpointReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSetpointReference {
+func NewBACnetConstructedDataSetpointReference(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, setpointReference BACnetSetpointReference) *_BACnetConstructedDataSetpointReference {
 	if setpointReference == nil {
 		panic("setpointReference of type BACnetSetpointReference for BACnetConstructedDataSetpointReference must not be nil")
 	}
 	_result := &_BACnetConstructedDataSetpointReference{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		SetpointReference:             setpointReference,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetting.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetting.go
index ca539f595f5..c1faaae5182 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetting.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetting.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataSetting = (*_BACnetConstructedDataSetting)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSetting)(nil)
 
 // NewBACnetConstructedDataSetting factory function for _BACnetConstructedDataSetting
-func NewBACnetConstructedDataSetting(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, setting BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSetting {
+func NewBACnetConstructedDataSetting(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, setting BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataSetting {
 	if setting == nil {
 		panic("setting of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataSetting must not be nil")
 	}
 	_result := &_BACnetConstructedDataSetting{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Setting:                       setting,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedDuration.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedDuration.go
index 36e2a69b4b0..c8b6cf9db34 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedDuration.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedDuration.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataShedDuration = (*_BACnetConstructedDataShedDuration)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataShedDuration)(nil)
 
 // NewBACnetConstructedDataShedDuration factory function for _BACnetConstructedDataShedDuration
-func NewBACnetConstructedDataShedDuration(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, shedDuration BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataShedDuration {
+func NewBACnetConstructedDataShedDuration(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, shedDuration BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataShedDuration {
 	if shedDuration == nil {
 		panic("shedDuration of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataShedDuration must not be nil")
 	}
 	_result := &_BACnetConstructedDataShedDuration{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ShedDuration:                  shedDuration,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevelDescriptions.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevelDescriptions.go
index 33518bc49e0..58e0fde3e98 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevelDescriptions.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevelDescriptions.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataShedLevelDescriptions = (*_BACnetConstructedDataShedL
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataShedLevelDescriptions)(nil)
 
 // NewBACnetConstructedDataShedLevelDescriptions factory function for _BACnetConstructedDataShedLevelDescriptions
-func NewBACnetConstructedDataShedLevelDescriptions(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, shedLevelDescriptions []BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataShedLevelDescriptions {
+func NewBACnetConstructedDataShedLevelDescriptions(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, shedLevelDescriptions []BACnetApplicationTagCharacterString) *_BACnetConstructedDataShedLevelDescriptions {
 	_result := &_BACnetConstructedDataShedLevelDescriptions{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		ShedLevelDescriptions:         shedLevelDescriptions,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevels.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevels.go
index 38616deb206..2a54e52dec3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevels.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevels.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataShedLevels = (*_BACnetConstructedDataShedLevels)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataShedLevels)(nil)
 
 // NewBACnetConstructedDataShedLevels factory function for _BACnetConstructedDataShedLevels
-func NewBACnetConstructedDataShedLevels(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, shedLevels []BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataShedLevels {
+func NewBACnetConstructedDataShedLevels(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, shedLevels []BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataShedLevels {
 	_result := &_BACnetConstructedDataShedLevels{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		ShedLevels:                    shedLevels,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSilenced.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSilenced.go
index 68471297fcd..16b90f31689 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSilenced.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSilenced.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataSilenced = (*_BACnetConstructedDataSilenced)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSilenced)(nil)
 
 // NewBACnetConstructedDataSilenced factory function for _BACnetConstructedDataSilenced
-func NewBACnetConstructedDataSilenced(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, silenced BACnetSilencedStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSilenced {
+func NewBACnetConstructedDataSilenced(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, silenced BACnetSilencedStateTagged) *_BACnetConstructedDataSilenced {
 	if silenced == nil {
 		panic("silenced of type BACnetSilencedStateTagged for BACnetConstructedDataSilenced must not be nil")
 	}
 	_result := &_BACnetConstructedDataSilenced{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Silenced:                      silenced,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveAddressBinding.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveAddressBinding.go
index 9235abd1ddd..d0608b8c3fa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveAddressBinding.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveAddressBinding.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataSlaveAddressBinding = (*_BACnetConstructedDataSlaveAd
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSlaveAddressBinding)(nil)
 
 // NewBACnetConstructedDataSlaveAddressBinding factory function for _BACnetConstructedDataSlaveAddressBinding
-func NewBACnetConstructedDataSlaveAddressBinding(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, slaveAddressBinding []BACnetAddressBinding, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSlaveAddressBinding {
+func NewBACnetConstructedDataSlaveAddressBinding(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, slaveAddressBinding []BACnetAddressBinding) *_BACnetConstructedDataSlaveAddressBinding {
 	_result := &_BACnetConstructedDataSlaveAddressBinding{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		SlaveAddressBinding:           slaveAddressBinding,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveProxyEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveProxyEnable.go
index 26a06ac67eb..3da6c65c85d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveProxyEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveProxyEnable.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataSlaveProxyEnable = (*_BACnetConstructedDataSlaveProxy
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSlaveProxyEnable)(nil)
 
 // NewBACnetConstructedDataSlaveProxyEnable factory function for _BACnetConstructedDataSlaveProxyEnable
-func NewBACnetConstructedDataSlaveProxyEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, slaveProxyEnable BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSlaveProxyEnable {
+func NewBACnetConstructedDataSlaveProxyEnable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, slaveProxyEnable BACnetApplicationTagBoolean) *_BACnetConstructedDataSlaveProxyEnable {
 	if slaveProxyEnable == nil {
 		panic("slaveProxyEnable of type BACnetApplicationTagBoolean for BACnetConstructedDataSlaveProxyEnable must not be nil")
 	}
 	_result := &_BACnetConstructedDataSlaveProxyEnable{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		SlaveProxyEnable:              slaveProxyEnable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStartTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStartTime.go
index ddb419fdbfa..19312257076 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStartTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStartTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataStartTime = (*_BACnetConstructedDataStartTime)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataStartTime)(nil)
 
 // NewBACnetConstructedDataStartTime factory function for _BACnetConstructedDataStartTime
-func NewBACnetConstructedDataStartTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, startTime BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataStartTime {
+func NewBACnetConstructedDataStartTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, startTime BACnetDateTime) *_BACnetConstructedDataStartTime {
 	if startTime == nil {
 		panic("startTime of type BACnetDateTime for BACnetConstructedDataStartTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataStartTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		StartTime:                     startTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateChangeValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateChangeValues.go
index 5690f0fa70d..efab11ae941 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateChangeValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateChangeValues.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataStateChangeValues = (*_BACnetConstructedDataStateChan
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataStateChangeValues)(nil)
 
 // NewBACnetConstructedDataStateChangeValues factory function for _BACnetConstructedDataStateChangeValues
-func NewBACnetConstructedDataStateChangeValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, stateChangeValues []BACnetTimerStateChangeValue, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataStateChangeValues {
+func NewBACnetConstructedDataStateChangeValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, stateChangeValues []BACnetTimerStateChangeValue) *_BACnetConstructedDataStateChangeValues {
 	_result := &_BACnetConstructedDataStateChangeValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		StateChangeValues:             stateChangeValues,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateDescription.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateDescription.go
index f0009b2b38d..acc5d660a50 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateDescription.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateDescription.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataStateDescription = (*_BACnetConstructedDataStateDescr
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataStateDescription)(nil)
 
 // NewBACnetConstructedDataStateDescription factory function for _BACnetConstructedDataStateDescription
-func NewBACnetConstructedDataStateDescription(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, stateDescription BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataStateDescription {
+func NewBACnetConstructedDataStateDescription(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, stateDescription BACnetApplicationTagCharacterString) *_BACnetConstructedDataStateDescription {
 	if stateDescription == nil {
 		panic("stateDescription of type BACnetApplicationTagCharacterString for BACnetConstructedDataStateDescription must not be nil")
 	}
 	_result := &_BACnetConstructedDataStateDescription{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		StateDescription:              stateDescription,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateText.go
index 4eab4ead35c..6d01e60d29c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateText.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataStateText = (*_BACnetConstructedDataStateText)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataStateText)(nil)
 
 // NewBACnetConstructedDataStateText factory function for _BACnetConstructedDataStateText
-func NewBACnetConstructedDataStateText(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, stateText []BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataStateText {
+func NewBACnetConstructedDataStateText(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, stateText []BACnetApplicationTagCharacterString) *_BACnetConstructedDataStateText {
 	_result := &_BACnetConstructedDataStateText{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		StateText:                     stateText,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStatusFlags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStatusFlags.go
index 989cc2a5be3..95a16e09402 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStatusFlags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStatusFlags.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataStatusFlags = (*_BACnetConstructedDataStatusFlags)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataStatusFlags)(nil)
 
 // NewBACnetConstructedDataStatusFlags factory function for _BACnetConstructedDataStatusFlags
-func NewBACnetConstructedDataStatusFlags(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, statusFlags BACnetStatusFlagsTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataStatusFlags {
+func NewBACnetConstructedDataStatusFlags(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, statusFlags BACnetStatusFlagsTagged) *_BACnetConstructedDataStatusFlags {
 	if statusFlags == nil {
 		panic("statusFlags of type BACnetStatusFlagsTagged for BACnetConstructedDataStatusFlags must not be nil")
 	}
 	_result := &_BACnetConstructedDataStatusFlags{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		StatusFlags:                   statusFlags,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopTime.go
index 833dcb4a0dc..0f53db80faf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataStopTime = (*_BACnetConstructedDataStopTime)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataStopTime)(nil)
 
 // NewBACnetConstructedDataStopTime factory function for _BACnetConstructedDataStopTime
-func NewBACnetConstructedDataStopTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, stopTime BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataStopTime {
+func NewBACnetConstructedDataStopTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, stopTime BACnetDateTime) *_BACnetConstructedDataStopTime {
 	if stopTime == nil {
 		panic("stopTime of type BACnetDateTime for BACnetConstructedDataStopTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataStopTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		StopTime:                      stopTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopWhenFull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopWhenFull.go
index 6e4b821882b..98ef57574b7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopWhenFull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopWhenFull.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataStopWhenFull = (*_BACnetConstructedDataStopWhenFull)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataStopWhenFull)(nil)
 
 // NewBACnetConstructedDataStopWhenFull factory function for _BACnetConstructedDataStopWhenFull
-func NewBACnetConstructedDataStopWhenFull(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, stopWhenFull BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataStopWhenFull {
+func NewBACnetConstructedDataStopWhenFull(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, stopWhenFull BACnetApplicationTagBoolean) *_BACnetConstructedDataStopWhenFull {
 	if stopWhenFull == nil {
 		panic("stopWhenFull of type BACnetApplicationTagBoolean for BACnetConstructedDataStopWhenFull must not be nil")
 	}
 	_result := &_BACnetConstructedDataStopWhenFull{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		StopWhenFull:                  stopWhenFull,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStrikeCount.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStrikeCount.go
index dd12a67eee4..f247f5998e5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStrikeCount.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStrikeCount.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataStrikeCount = (*_BACnetConstructedDataStrikeCount)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataStrikeCount)(nil)
 
 // NewBACnetConstructedDataStrikeCount factory function for _BACnetConstructedDataStrikeCount
-func NewBACnetConstructedDataStrikeCount(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, strikeCount BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataStrikeCount {
+func NewBACnetConstructedDataStrikeCount(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, strikeCount BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataStrikeCount {
 	if strikeCount == nil {
 		panic("strikeCount of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataStrikeCount must not be nil")
 	}
 	_result := &_BACnetConstructedDataStrikeCount{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		StrikeCount:                   strikeCount,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredObjectList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredObjectList.go
index 210437261a2..4d4b3df3529 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredObjectList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredObjectList.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataStructuredObjectList = (*_BACnetConstructedDataStruct
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataStructuredObjectList)(nil)
 
 // NewBACnetConstructedDataStructuredObjectList factory function for _BACnetConstructedDataStructuredObjectList
-func NewBACnetConstructedDataStructuredObjectList(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, structuredObjectList []BACnetApplicationTagObjectIdentifier, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataStructuredObjectList {
+func NewBACnetConstructedDataStructuredObjectList(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, structuredObjectList []BACnetApplicationTagObjectIdentifier) *_BACnetConstructedDataStructuredObjectList {
 	_result := &_BACnetConstructedDataStructuredObjectList{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		StructuredObjectList:          structuredObjectList,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredViewAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredViewAll.go
index 0c9b1668a79..2dda15f1b49 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredViewAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredViewAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataStructuredViewAll = (*_BACnetConstructedDataStructure
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataStructuredViewAll)(nil)
 
 // NewBACnetConstructedDataStructuredViewAll factory function for _BACnetConstructedDataStructuredViewAll
-func NewBACnetConstructedDataStructuredViewAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataStructuredViewAll {
+func NewBACnetConstructedDataStructuredViewAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataStructuredViewAll {
 	_result := &_BACnetConstructedDataStructuredViewAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateAnnotations.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateAnnotations.go
index eaaba3fd095..bf80e019be4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateAnnotations.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateAnnotations.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataSubordinateAnnotations = (*_BACnetConstructedDataSubo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSubordinateAnnotations)(nil)
 
 // NewBACnetConstructedDataSubordinateAnnotations factory function for _BACnetConstructedDataSubordinateAnnotations
-func NewBACnetConstructedDataSubordinateAnnotations(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, subordinateAnnotations []BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSubordinateAnnotations {
+func NewBACnetConstructedDataSubordinateAnnotations(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, subordinateAnnotations []BACnetApplicationTagCharacterString) *_BACnetConstructedDataSubordinateAnnotations {
 	_result := &_BACnetConstructedDataSubordinateAnnotations{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		SubordinateAnnotations:        subordinateAnnotations,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateList.go
index b00147adcf2..9df2bc23716 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateList.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataSubordinateList = (*_BACnetConstructedDataSubordinate
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSubordinateList)(nil)
 
 // NewBACnetConstructedDataSubordinateList factory function for _BACnetConstructedDataSubordinateList
-func NewBACnetConstructedDataSubordinateList(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, subordinateList []BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSubordinateList {
+func NewBACnetConstructedDataSubordinateList(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, subordinateList []BACnetDeviceObjectReference) *_BACnetConstructedDataSubordinateList {
 	_result := &_BACnetConstructedDataSubordinateList{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		SubordinateList:               subordinateList,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateNodeTypes.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateNodeTypes.go
index 231858642b2..ce0fde7f982 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateNodeTypes.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateNodeTypes.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataSubordinateNodeTypes = (*_BACnetConstructedDataSubord
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSubordinateNodeTypes)(nil)
 
 // NewBACnetConstructedDataSubordinateNodeTypes factory function for _BACnetConstructedDataSubordinateNodeTypes
-func NewBACnetConstructedDataSubordinateNodeTypes(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, subordinateNodeTypes []BACnetNodeTypeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSubordinateNodeTypes {
+func NewBACnetConstructedDataSubordinateNodeTypes(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, subordinateNodeTypes []BACnetNodeTypeTagged) *_BACnetConstructedDataSubordinateNodeTypes {
 	_result := &_BACnetConstructedDataSubordinateNodeTypes{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		SubordinateNodeTypes:          subordinateNodeTypes,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateRelationships.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateRelationships.go
index ec2d9218da0..79745586eaa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateRelationships.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateRelationships.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataSubordinateRelationships = (*_BACnetConstructedDataSu
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSubordinateRelationships)(nil)
 
 // NewBACnetConstructedDataSubordinateRelationships factory function for _BACnetConstructedDataSubordinateRelationships
-func NewBACnetConstructedDataSubordinateRelationships(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, subordinateRelationships []BACnetRelationshipTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSubordinateRelationships {
+func NewBACnetConstructedDataSubordinateRelationships(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, subordinateRelationships []BACnetRelationshipTagged) *_BACnetConstructedDataSubordinateRelationships {
 	_result := &_BACnetConstructedDataSubordinateRelationships{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		SubordinateRelationships:      subordinateRelationships,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateTags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateTags.go
index d494e50a09c..3c6582c2dba 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateTags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateTags.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataSubordinateTags = (*_BACnetConstructedDataSubordinate
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSubordinateTags)(nil)
 
 // NewBACnetConstructedDataSubordinateTags factory function for _BACnetConstructedDataSubordinateTags
-func NewBACnetConstructedDataSubordinateTags(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, subordinateList []BACnetNameValueCollection, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSubordinateTags {
+func NewBACnetConstructedDataSubordinateTags(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, subordinateList []BACnetNameValueCollection) *_BACnetConstructedDataSubordinateTags {
 	_result := &_BACnetConstructedDataSubordinateTags{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		SubordinateList:               subordinateList,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubscribedRecipients.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubscribedRecipients.go
index eb7001eeac4..137eb49b85c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubscribedRecipients.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubscribedRecipients.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataSubscribedRecipients = (*_BACnetConstructedDataSubscr
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSubscribedRecipients)(nil)
 
 // NewBACnetConstructedDataSubscribedRecipients factory function for _BACnetConstructedDataSubscribedRecipients
-func NewBACnetConstructedDataSubscribedRecipients(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, subscribedRecipients []BACnetEventNotificationSubscription, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSubscribedRecipients {
+func NewBACnetConstructedDataSubscribedRecipients(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, subscribedRecipients []BACnetEventNotificationSubscription) *_BACnetConstructedDataSubscribedRecipients {
 	_result := &_BACnetConstructedDataSubscribedRecipients{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		SubscribedRecipients:          subscribedRecipients,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormatClasses.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormatClasses.go
index 58b8dd2ee95..102daf5f912 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormatClasses.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormatClasses.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataSupportedFormatClasses = (*_BACnetConstructedDataSupp
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSupportedFormatClasses)(nil)
 
 // NewBACnetConstructedDataSupportedFormatClasses factory function for _BACnetConstructedDataSupportedFormatClasses
-func NewBACnetConstructedDataSupportedFormatClasses(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, supportedFormats []BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSupportedFormatClasses {
+func NewBACnetConstructedDataSupportedFormatClasses(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, supportedFormats []BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataSupportedFormatClasses {
 	_result := &_BACnetConstructedDataSupportedFormatClasses{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		SupportedFormats:              supportedFormats,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormats.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormats.go
index 8bb17541016..cb2aefe0add 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormats.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormats.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataSupportedFormats = (*_BACnetConstructedDataSupportedF
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSupportedFormats)(nil)
 
 // NewBACnetConstructedDataSupportedFormats factory function for _BACnetConstructedDataSupportedFormats
-func NewBACnetConstructedDataSupportedFormats(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, supportedFormats []BACnetAuthenticationFactorFormat, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSupportedFormats {
+func NewBACnetConstructedDataSupportedFormats(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, supportedFormats []BACnetAuthenticationFactorFormat) *_BACnetConstructedDataSupportedFormats {
 	_result := &_BACnetConstructedDataSupportedFormats{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		SupportedFormats:              supportedFormats,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedSecurityAlgorithms.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedSecurityAlgorithms.go
index 21444a70abc..8fa486ed46d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedSecurityAlgorithms.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedSecurityAlgorithms.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataSupportedSecurityAlgorithms = (*_BACnetConstructedDat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSupportedSecurityAlgorithms)(nil)
 
 // NewBACnetConstructedDataSupportedSecurityAlgorithms factory function for _BACnetConstructedDataSupportedSecurityAlgorithms
-func NewBACnetConstructedDataSupportedSecurityAlgorithms(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, supportedSecurityAlgorithms []BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSupportedSecurityAlgorithms {
+func NewBACnetConstructedDataSupportedSecurityAlgorithms(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, supportedSecurityAlgorithms []BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataSupportedSecurityAlgorithms {
 	_result := &_BACnetConstructedDataSupportedSecurityAlgorithms{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		SupportedSecurityAlgorithms:   supportedSecurityAlgorithms,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSystemStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSystemStatus.go
index c441d9df519..6e7d647a4ad 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSystemStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSystemStatus.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataSystemStatus = (*_BACnetConstructedDataSystemStatus)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataSystemStatus)(nil)
 
 // NewBACnetConstructedDataSystemStatus factory function for _BACnetConstructedDataSystemStatus
-func NewBACnetConstructedDataSystemStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, systemStatus BACnetDeviceStatusTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataSystemStatus {
+func NewBACnetConstructedDataSystemStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, systemStatus BACnetDeviceStatusTagged) *_BACnetConstructedDataSystemStatus {
 	if systemStatus == nil {
 		panic("systemStatus of type BACnetDeviceStatusTagged for BACnetConstructedDataSystemStatus must not be nil")
 	}
 	_result := &_BACnetConstructedDataSystemStatus{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		SystemStatus:                  systemStatus,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTags.go
index 645d6796cd4..75380f4fe5c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTags.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataTags = (*_BACnetConstructedDataTags)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTags)(nil)
 
 // NewBACnetConstructedDataTags factory function for _BACnetConstructedDataTags
-func NewBACnetConstructedDataTags(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, tags []BACnetNameValue, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTags {
+func NewBACnetConstructedDataTags(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, tags []BACnetNameValue) *_BACnetConstructedDataTags {
 	_result := &_BACnetConstructedDataTags{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		Tags:                          tags,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatAuthority.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatAuthority.go
index ba634431183..c64ef15f8a8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatAuthority.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatAuthority.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataThreatAuthority = (*_BACnetConstructedDataThreatAutho
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataThreatAuthority)(nil)
 
 // NewBACnetConstructedDataThreatAuthority factory function for _BACnetConstructedDataThreatAuthority
-func NewBACnetConstructedDataThreatAuthority(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, threatAuthority BACnetAccessThreatLevel, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataThreatAuthority {
+func NewBACnetConstructedDataThreatAuthority(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, threatAuthority BACnetAccessThreatLevel) *_BACnetConstructedDataThreatAuthority {
 	if threatAuthority == nil {
 		panic("threatAuthority of type BACnetAccessThreatLevel for BACnetConstructedDataThreatAuthority must not be nil")
 	}
 	_result := &_BACnetConstructedDataThreatAuthority{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ThreatAuthority:               threatAuthority,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatLevel.go
index fccfbe9c6a6..5f34f796d42 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatLevel.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataThreatLevel = (*_BACnetConstructedDataThreatLevel)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataThreatLevel)(nil)
 
 // NewBACnetConstructedDataThreatLevel factory function for _BACnetConstructedDataThreatLevel
-func NewBACnetConstructedDataThreatLevel(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, threatLevel BACnetAccessThreatLevel, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataThreatLevel {
+func NewBACnetConstructedDataThreatLevel(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, threatLevel BACnetAccessThreatLevel) *_BACnetConstructedDataThreatLevel {
 	if threatLevel == nil {
 		panic("threatLevel of type BACnetAccessThreatLevel for BACnetConstructedDataThreatLevel must not be nil")
 	}
 	_result := &_BACnetConstructedDataThreatLevel{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ThreatLevel:                   threatLevel,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelay.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelay.go
index 4c95e67f8f3..504fe354e34 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelay.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelay.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimeDelay = (*_BACnetConstructedDataTimeDelay)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimeDelay)(nil)
 
 // NewBACnetConstructedDataTimeDelay factory function for _BACnetConstructedDataTimeDelay
-func NewBACnetConstructedDataTimeDelay(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeDelay BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimeDelay {
+func NewBACnetConstructedDataTimeDelay(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeDelay BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataTimeDelay {
 	if timeDelay == nil {
 		panic("timeDelay of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataTimeDelay must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimeDelay{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		TimeDelay:                     timeDelay,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelayNormal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelayNormal.go
index 34c20720571..2ececfa05df 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelayNormal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelayNormal.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimeDelayNormal = (*_BACnetConstructedDataTimeDelayNo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimeDelayNormal)(nil)
 
 // NewBACnetConstructedDataTimeDelayNormal factory function for _BACnetConstructedDataTimeDelayNormal
-func NewBACnetConstructedDataTimeDelayNormal(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeDelayNormal BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimeDelayNormal {
+func NewBACnetConstructedDataTimeDelayNormal(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeDelayNormal BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataTimeDelayNormal {
 	if timeDelayNormal == nil {
 		panic("timeDelayNormal of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataTimeDelayNormal must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimeDelayNormal{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		TimeDelayNormal:               timeDelayNormal,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfActiveTimeReset.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfActiveTimeReset.go
index 28b3a4f2731..7676b9a622b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfActiveTimeReset.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfActiveTimeReset.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimeOfActiveTimeReset = (*_BACnetConstructedDataTimeO
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimeOfActiveTimeReset)(nil)
 
 // NewBACnetConstructedDataTimeOfActiveTimeReset factory function for _BACnetConstructedDataTimeOfActiveTimeReset
-func NewBACnetConstructedDataTimeOfActiveTimeReset(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeOfActiveTimeReset BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimeOfActiveTimeReset {
+func NewBACnetConstructedDataTimeOfActiveTimeReset(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeOfActiveTimeReset BACnetDateTime) *_BACnetConstructedDataTimeOfActiveTimeReset {
 	if timeOfActiveTimeReset == nil {
 		panic("timeOfActiveTimeReset of type BACnetDateTime for BACnetConstructedDataTimeOfActiveTimeReset must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimeOfActiveTimeReset{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		TimeOfActiveTimeReset:         timeOfActiveTimeReset,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfDeviceRestart.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfDeviceRestart.go
index b5ca75b6a2b..7a9ad3bfc1a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfDeviceRestart.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfDeviceRestart.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimeOfDeviceRestart = (*_BACnetConstructedDataTimeOfD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimeOfDeviceRestart)(nil)
 
 // NewBACnetConstructedDataTimeOfDeviceRestart factory function for _BACnetConstructedDataTimeOfDeviceRestart
-func NewBACnetConstructedDataTimeOfDeviceRestart(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeOfDeviceRestart BACnetTimeStamp, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimeOfDeviceRestart {
+func NewBACnetConstructedDataTimeOfDeviceRestart(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeOfDeviceRestart BACnetTimeStamp) *_BACnetConstructedDataTimeOfDeviceRestart {
 	if timeOfDeviceRestart == nil {
 		panic("timeOfDeviceRestart of type BACnetTimeStamp for BACnetConstructedDataTimeOfDeviceRestart must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimeOfDeviceRestart{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		TimeOfDeviceRestart:           timeOfDeviceRestart,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStateCountReset.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStateCountReset.go
index 467f5960fe1..1e3a9234467 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStateCountReset.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStateCountReset.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimeOfStateCountReset = (*_BACnetConstructedDataTimeO
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimeOfStateCountReset)(nil)
 
 // NewBACnetConstructedDataTimeOfStateCountReset factory function for _BACnetConstructedDataTimeOfStateCountReset
-func NewBACnetConstructedDataTimeOfStateCountReset(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeOfStateCountReset BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimeOfStateCountReset {
+func NewBACnetConstructedDataTimeOfStateCountReset(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeOfStateCountReset BACnetDateTime) *_BACnetConstructedDataTimeOfStateCountReset {
 	if timeOfStateCountReset == nil {
 		panic("timeOfStateCountReset of type BACnetDateTime for BACnetConstructedDataTimeOfStateCountReset must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimeOfStateCountReset{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		TimeOfStateCountReset:         timeOfStateCountReset,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStrikeCountReset.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStrikeCountReset.go
index fb74bd9cff0..6dea9677fed 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStrikeCountReset.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStrikeCountReset.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimeOfStrikeCountReset = (*_BACnetConstructedDataTime
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimeOfStrikeCountReset)(nil)
 
 // NewBACnetConstructedDataTimeOfStrikeCountReset factory function for _BACnetConstructedDataTimeOfStrikeCountReset
-func NewBACnetConstructedDataTimeOfStrikeCountReset(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeOfStrikeCountReset BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimeOfStrikeCountReset {
+func NewBACnetConstructedDataTimeOfStrikeCountReset(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeOfStrikeCountReset BACnetDateTime) *_BACnetConstructedDataTimeOfStrikeCountReset {
 	if timeOfStrikeCountReset == nil {
 		panic("timeOfStrikeCountReset of type BACnetDateTime for BACnetConstructedDataTimeOfStrikeCountReset must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimeOfStrikeCountReset{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		TimeOfStrikeCountReset:        timeOfStrikeCountReset,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValuePresentValue.go
index b72a5b12678..1d1319465c2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValuePresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimePatternValuePresentValue = (*_BACnetConstructedDa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimePatternValuePresentValue)(nil)
 
 // NewBACnetConstructedDataTimePatternValuePresentValue factory function for _BACnetConstructedDataTimePatternValuePresentValue
-func NewBACnetConstructedDataTimePatternValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimePatternValuePresentValue {
+func NewBACnetConstructedDataTimePatternValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagTime) *_BACnetConstructedDataTimePatternValuePresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagTime for BACnetConstructedDataTimePatternValuePresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimePatternValuePresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValueRelinquishDefault.go
index c73060c1eb3..0fffb4c0040 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValueRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimePatternValueRelinquishDefault = (*_BACnetConstruc
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimePatternValueRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataTimePatternValueRelinquishDefault factory function for _BACnetConstructedDataTimePatternValueRelinquishDefault
-func NewBACnetConstructedDataTimePatternValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimePatternValueRelinquishDefault {
+func NewBACnetConstructedDataTimePatternValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagTime) *_BACnetConstructedDataTimePatternValueRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagTime for BACnetConstructedDataTimePatternValueRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimePatternValueRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationInterval.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationInterval.go
index 129a1fac0b2..dd26ad1908a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationInterval.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationInterval.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimeSynchronizationInterval = (*_BACnetConstructedDat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimeSynchronizationInterval)(nil)
 
 // NewBACnetConstructedDataTimeSynchronizationInterval factory function for _BACnetConstructedDataTimeSynchronizationInterval
-func NewBACnetConstructedDataTimeSynchronizationInterval(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeSynchronization BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimeSynchronizationInterval {
+func NewBACnetConstructedDataTimeSynchronizationInterval(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeSynchronization BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataTimeSynchronizationInterval {
 	if timeSynchronization == nil {
 		panic("timeSynchronization of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataTimeSynchronizationInterval must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimeSynchronizationInterval{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		TimeSynchronization:           timeSynchronization,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationRecipients.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationRecipients.go
index cfb1e88d293..2483f59e0bc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationRecipients.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationRecipients.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataTimeSynchronizationRecipients = (*_BACnetConstructedD
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimeSynchronizationRecipients)(nil)
 
 // NewBACnetConstructedDataTimeSynchronizationRecipients factory function for _BACnetConstructedDataTimeSynchronizationRecipients
-func NewBACnetConstructedDataTimeSynchronizationRecipients(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeSynchronizationRecipients []BACnetRecipient, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimeSynchronizationRecipients {
+func NewBACnetConstructedDataTimeSynchronizationRecipients(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeSynchronizationRecipients []BACnetRecipient) *_BACnetConstructedDataTimeSynchronizationRecipients {
 	_result := &_BACnetConstructedDataTimeSynchronizationRecipients{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		TimeSynchronizationRecipients: timeSynchronizationRecipients,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueAll.go
index 0bce7d674f0..ca61ab952cc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataTimeValueAll = (*_BACnetConstructedDataTimeValueAll)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimeValueAll)(nil)
 
 // NewBACnetConstructedDataTimeValueAll factory function for _BACnetConstructedDataTimeValueAll
-func NewBACnetConstructedDataTimeValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimeValueAll {
+func NewBACnetConstructedDataTimeValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataTimeValueAll {
 	_result := &_BACnetConstructedDataTimeValueAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValuePresentValue.go
index d5e7676dd77..4f1eefff159 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValuePresentValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimeValuePresentValue = (*_BACnetConstructedDataTimeV
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimeValuePresentValue)(nil)
 
 // NewBACnetConstructedDataTimeValuePresentValue factory function for _BACnetConstructedDataTimeValuePresentValue
-func NewBACnetConstructedDataTimeValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimeValuePresentValue {
+func NewBACnetConstructedDataTimeValuePresentValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, presentValue BACnetApplicationTagTime) *_BACnetConstructedDataTimeValuePresentValue {
 	if presentValue == nil {
 		panic("presentValue of type BACnetApplicationTagTime for BACnetConstructedDataTimeValuePresentValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimeValuePresentValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		PresentValue:                  presentValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueRelinquishDefault.go
index be163c0b300..6c10faee6a0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueRelinquishDefault.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimeValueRelinquishDefault = (*_BACnetConstructedData
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimeValueRelinquishDefault)(nil)
 
 // NewBACnetConstructedDataTimeValueRelinquishDefault factory function for _BACnetConstructedDataTimeValueRelinquishDefault
-func NewBACnetConstructedDataTimeValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimeValueRelinquishDefault {
+func NewBACnetConstructedDataTimeValueRelinquishDefault(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, relinquishDefault BACnetApplicationTagTime) *_BACnetConstructedDataTimeValueRelinquishDefault {
 	if relinquishDefault == nil {
 		panic("relinquishDefault of type BACnetApplicationTagTime for BACnetConstructedDataTimeValueRelinquishDefault must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimeValueRelinquishDefault{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		RelinquishDefault:             relinquishDefault,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimepatternValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimepatternValueAll.go
index 72ae508a77b..11668dee373 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimepatternValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimepatternValueAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataTimepatternValueAll = (*_BACnetConstructedDataTimepat
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimepatternValueAll)(nil)
 
 // NewBACnetConstructedDataTimepatternValueAll factory function for _BACnetConstructedDataTimepatternValueAll
-func NewBACnetConstructedDataTimepatternValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimepatternValueAll {
+func NewBACnetConstructedDataTimepatternValueAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataTimepatternValueAll {
 	_result := &_BACnetConstructedDataTimepatternValueAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAlarmValues.go
index c9457abc0f8..a3f57986ac0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAlarmValues.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataTimerAlarmValues = (*_BACnetConstructedDataTimerAlarm
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimerAlarmValues)(nil)
 
 // NewBACnetConstructedDataTimerAlarmValues factory function for _BACnetConstructedDataTimerAlarmValues
-func NewBACnetConstructedDataTimerAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetTimerStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimerAlarmValues {
+func NewBACnetConstructedDataTimerAlarmValues(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, alarmValues []BACnetTimerStateTagged) *_BACnetConstructedDataTimerAlarmValues {
 	_result := &_BACnetConstructedDataTimerAlarmValues{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		AlarmValues:                   alarmValues,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAll.go
index 5afb32c06c6..6b24f010e0b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataTimerAll = (*_BACnetConstructedDataTimerAll)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimerAll)(nil)
 
 // NewBACnetConstructedDataTimerAll factory function for _BACnetConstructedDataTimerAll
-func NewBACnetConstructedDataTimerAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimerAll {
+func NewBACnetConstructedDataTimerAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataTimerAll {
 	_result := &_BACnetConstructedDataTimerAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMaxPresValue.go
index 3a77c108ff1..a4f1c2ca9b1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMaxPresValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimerMaxPresValue = (*_BACnetConstructedDataTimerMaxP
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimerMaxPresValue)(nil)
 
 // NewBACnetConstructedDataTimerMaxPresValue factory function for _BACnetConstructedDataTimerMaxPresValue
-func NewBACnetConstructedDataTimerMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimerMaxPresValue {
+func NewBACnetConstructedDataTimerMaxPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, maxPresValue BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataTimerMaxPresValue {
 	if maxPresValue == nil {
 		panic("maxPresValue of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataTimerMaxPresValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimerMaxPresValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MaxPresValue:                  maxPresValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMinPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMinPresValue.go
index 7762d9cd94d..4eed8eb742d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMinPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMinPresValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimerMinPresValue = (*_BACnetConstructedDataTimerMinP
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimerMinPresValue)(nil)
 
 // NewBACnetConstructedDataTimerMinPresValue factory function for _BACnetConstructedDataTimerMinPresValue
-func NewBACnetConstructedDataTimerMinPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minPresValue BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimerMinPresValue {
+func NewBACnetConstructedDataTimerMinPresValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, minPresValue BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataTimerMinPresValue {
 	if minPresValue == nil {
 		panic("minPresValue of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataTimerMinPresValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimerMinPresValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		MinPresValue:                  minPresValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerResolution.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerResolution.go
index 5bc172a12b3..6f77007baa4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerResolution.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerResolution.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimerResolution = (*_BACnetConstructedDataTimerResolu
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimerResolution)(nil)
 
 // NewBACnetConstructedDataTimerResolution factory function for _BACnetConstructedDataTimerResolution
-func NewBACnetConstructedDataTimerResolution(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, resolution BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimerResolution {
+func NewBACnetConstructedDataTimerResolution(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, resolution BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataTimerResolution {
 	if resolution == nil {
 		panic("resolution of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataTimerResolution must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimerResolution{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Resolution:                    resolution,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerRunning.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerRunning.go
index f4eeec08348..585e5ebfea4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerRunning.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerRunning.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimerRunning = (*_BACnetConstructedDataTimerRunning)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimerRunning)(nil)
 
 // NewBACnetConstructedDataTimerRunning factory function for _BACnetConstructedDataTimerRunning
-func NewBACnetConstructedDataTimerRunning(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timerRunning BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimerRunning {
+func NewBACnetConstructedDataTimerRunning(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timerRunning BACnetApplicationTagBoolean) *_BACnetConstructedDataTimerRunning {
 	if timerRunning == nil {
 		panic("timerRunning of type BACnetApplicationTagBoolean for BACnetConstructedDataTimerRunning must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimerRunning{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		TimerRunning:                  timerRunning,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerState.go
index 8b22fef1190..263a3692be7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerState.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTimerState = (*_BACnetConstructedDataTimerState)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTimerState)(nil)
 
 // NewBACnetConstructedDataTimerState factory function for _BACnetConstructedDataTimerState
-func NewBACnetConstructedDataTimerState(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timerState BACnetTimerStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTimerState {
+func NewBACnetConstructedDataTimerState(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timerState BACnetTimerStateTagged) *_BACnetConstructedDataTimerState {
 	if timerState == nil {
 		panic("timerState of type BACnetTimerStateTagged for BACnetConstructedDataTimerState must not be nil")
 	}
 	_result := &_BACnetConstructedDataTimerState{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		TimerState:                    timerState,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTotalRecordCount.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTotalRecordCount.go
index 688089a48c5..aaa781b3d95 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTotalRecordCount.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTotalRecordCount.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTotalRecordCount = (*_BACnetConstructedDataTotalRecor
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTotalRecordCount)(nil)
 
 // NewBACnetConstructedDataTotalRecordCount factory function for _BACnetConstructedDataTotalRecordCount
-func NewBACnetConstructedDataTotalRecordCount(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, totalRecordCount BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTotalRecordCount {
+func NewBACnetConstructedDataTotalRecordCount(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, totalRecordCount BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataTotalRecordCount {
 	if totalRecordCount == nil {
 		panic("totalRecordCount of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataTotalRecordCount must not be nil")
 	}
 	_result := &_BACnetConstructedDataTotalRecordCount{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		TotalRecordCount:              totalRecordCount,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTraceFlag.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTraceFlag.go
index f1d2feeed2b..55ef7685d69 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTraceFlag.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTraceFlag.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTraceFlag = (*_BACnetConstructedDataTraceFlag)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTraceFlag)(nil)
 
 // NewBACnetConstructedDataTraceFlag factory function for _BACnetConstructedDataTraceFlag
-func NewBACnetConstructedDataTraceFlag(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, traceFlag BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTraceFlag {
+func NewBACnetConstructedDataTraceFlag(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, traceFlag BACnetApplicationTagBoolean) *_BACnetConstructedDataTraceFlag {
 	if traceFlag == nil {
 		panic("traceFlag of type BACnetApplicationTagBoolean for BACnetConstructedDataTraceFlag must not be nil")
 	}
 	_result := &_BACnetConstructedDataTraceFlag{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		TraceFlag:                     traceFlag,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrackingValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrackingValue.go
index 5bf278827fb..dc51bfab00c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrackingValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrackingValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTrackingValue = (*_BACnetConstructedDataTrackingValue
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTrackingValue)(nil)
 
 // NewBACnetConstructedDataTrackingValue factory function for _BACnetConstructedDataTrackingValue
-func NewBACnetConstructedDataTrackingValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, trackingValue BACnetLifeSafetyStateTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTrackingValue {
+func NewBACnetConstructedDataTrackingValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, trackingValue BACnetLifeSafetyStateTagged) *_BACnetConstructedDataTrackingValue {
 	if trackingValue == nil {
 		panic("trackingValue of type BACnetLifeSafetyStateTagged for BACnetConstructedDataTrackingValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataTrackingValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		TrackingValue:                 trackingValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransactionNotificationClass.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransactionNotificationClass.go
index 88de9f1390d..8e8d59066bb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransactionNotificationClass.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransactionNotificationClass.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTransactionNotificationClass = (*_BACnetConstructedDa
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTransactionNotificationClass)(nil)
 
 // NewBACnetConstructedDataTransactionNotificationClass factory function for _BACnetConstructedDataTransactionNotificationClass
-func NewBACnetConstructedDataTransactionNotificationClass(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, transactionNotificationClass BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTransactionNotificationClass {
+func NewBACnetConstructedDataTransactionNotificationClass(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, transactionNotificationClass BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataTransactionNotificationClass {
 	if transactionNotificationClass == nil {
 		panic("transactionNotificationClass of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataTransactionNotificationClass must not be nil")
 	}
 	_result := &_BACnetConstructedDataTransactionNotificationClass{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		TransactionNotificationClass:  transactionNotificationClass,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransition.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransition.go
index d3fce4a5fee..ecd2b7974e1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransition.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransition.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTransition = (*_BACnetConstructedDataTransition)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTransition)(nil)
 
 // NewBACnetConstructedDataTransition factory function for _BACnetConstructedDataTransition
-func NewBACnetConstructedDataTransition(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, transition BACnetLightingTransitionTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTransition {
+func NewBACnetConstructedDataTransition(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, transition BACnetLightingTransitionTagged) *_BACnetConstructedDataTransition {
 	if transition == nil {
 		panic("transition of type BACnetLightingTransitionTagged for BACnetConstructedDataTransition must not be nil")
 	}
 	_result := &_BACnetConstructedDataTransition{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Transition:                    transition,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogAll.go
index c6cea20f436..c4aad3444cd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataTrendLogAll = (*_BACnetConstructedDataTrendLogAll)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTrendLogAll)(nil)
 
 // NewBACnetConstructedDataTrendLogAll factory function for _BACnetConstructedDataTrendLogAll
-func NewBACnetConstructedDataTrendLogAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTrendLogAll {
+func NewBACnetConstructedDataTrendLogAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataTrendLogAll {
 	_result := &_BACnetConstructedDataTrendLogAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogBuffer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogBuffer.go
index 8722a0615ba..d395c9498d4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogBuffer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogBuffer.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataTrendLogLogBuffer = (*_BACnetConstructedDataTrendLogL
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTrendLogLogBuffer)(nil)
 
 // NewBACnetConstructedDataTrendLogLogBuffer factory function for _BACnetConstructedDataTrendLogLogBuffer
-func NewBACnetConstructedDataTrendLogLogBuffer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, floorText []BACnetLogRecord, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTrendLogLogBuffer {
+func NewBACnetConstructedDataTrendLogLogBuffer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, floorText []BACnetLogRecord) *_BACnetConstructedDataTrendLogLogBuffer {
 	_result := &_BACnetConstructedDataTrendLogLogBuffer{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FloorText:                     floorText,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogDeviceObjectProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogDeviceObjectProperty.go
index 17e42644b0a..ca4c28bd6ab 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogDeviceObjectProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogDeviceObjectProperty.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTrendLogLogDeviceObjectProperty = (*_BACnetConstructe
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTrendLogLogDeviceObjectProperty)(nil)
 
 // NewBACnetConstructedDataTrendLogLogDeviceObjectProperty factory function for _BACnetConstructedDataTrendLogLogDeviceObjectProperty
-func NewBACnetConstructedDataTrendLogLogDeviceObjectProperty(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, logDeviceObjectProperty BACnetDeviceObjectPropertyReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTrendLogLogDeviceObjectProperty {
+func NewBACnetConstructedDataTrendLogLogDeviceObjectProperty(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, logDeviceObjectProperty BACnetDeviceObjectPropertyReference) *_BACnetConstructedDataTrendLogLogDeviceObjectProperty {
 	if logDeviceObjectProperty == nil {
 		panic("logDeviceObjectProperty of type BACnetDeviceObjectPropertyReference for BACnetConstructedDataTrendLogLogDeviceObjectProperty must not be nil")
 	}
 	_result := &_BACnetConstructedDataTrendLogLogDeviceObjectProperty{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		LogDeviceObjectProperty:       logDeviceObjectProperty,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleAll.go
index 413cd83030a..b14353fd450 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleAll.go
@@ -54,9 +54,9 @@ var _ BACnetConstructedDataTrendLogMultipleAll = (*_BACnetConstructedDataTrendLo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTrendLogMultipleAll)(nil)
 
 // NewBACnetConstructedDataTrendLogMultipleAll factory function for _BACnetConstructedDataTrendLogMultipleAll
-func NewBACnetConstructedDataTrendLogMultipleAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTrendLogMultipleAll {
+func NewBACnetConstructedDataTrendLogMultipleAll(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetConstructedDataTrendLogMultipleAll {
 	_result := &_BACnetConstructedDataTrendLogMultipleAll{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogBuffer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogBuffer.go
index 387e8bce15a..34cc37743a8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogBuffer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogBuffer.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataTrendLogMultipleLogBuffer = (*_BACnetConstructedDataT
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTrendLogMultipleLogBuffer)(nil)
 
 // NewBACnetConstructedDataTrendLogMultipleLogBuffer factory function for _BACnetConstructedDataTrendLogMultipleLogBuffer
-func NewBACnetConstructedDataTrendLogMultipleLogBuffer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, floorText []BACnetLogMultipleRecord, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTrendLogMultipleLogBuffer {
+func NewBACnetConstructedDataTrendLogMultipleLogBuffer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, floorText []BACnetLogMultipleRecord) *_BACnetConstructedDataTrendLogMultipleLogBuffer {
 	_result := &_BACnetConstructedDataTrendLogMultipleLogBuffer{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		FloorText:                     floorText,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.go
index a8d61fa34f2..cb4c7e6a486 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty = (*_BACnetCo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty)(nil)
 
 // NewBACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty factory function for _BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty
-func NewBACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, groupMembers []BACnetDeviceObjectPropertyReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty {
+func NewBACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, groupMembers []BACnetDeviceObjectPropertyReference) *_BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty {
 	_result := &_BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		GroupMembers:                  groupMembers,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrigger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrigger.go
index 59c118d1329..1c1e89fc5ff 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrigger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrigger.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataTrigger = (*_BACnetConstructedDataTrigger)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataTrigger)(nil)
 
 // NewBACnetConstructedDataTrigger factory function for _BACnetConstructedDataTrigger
-func NewBACnetConstructedDataTrigger(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, trigger BACnetApplicationTagBoolean, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataTrigger {
+func NewBACnetConstructedDataTrigger(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, trigger BACnetApplicationTagBoolean) *_BACnetConstructedDataTrigger {
 	if trigger == nil {
 		panic("trigger of type BACnetApplicationTagBoolean for BACnetConstructedDataTrigger must not be nil")
 	}
 	_result := &_BACnetConstructedDataTrigger{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Trigger:                       trigger,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCOffset.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCOffset.go
index 845be2f6ff3..f51e40c5ea8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCOffset.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCOffset.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataUTCOffset = (*_BACnetConstructedDataUTCOffset)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataUTCOffset)(nil)
 
 // NewBACnetConstructedDataUTCOffset factory function for _BACnetConstructedDataUTCOffset
-func NewBACnetConstructedDataUTCOffset(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, utcOffset BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataUTCOffset {
+func NewBACnetConstructedDataUTCOffset(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, utcOffset BACnetApplicationTagSignedInteger) *_BACnetConstructedDataUTCOffset {
 	if utcOffset == nil {
 		panic("utcOffset of type BACnetApplicationTagSignedInteger for BACnetConstructedDataUTCOffset must not be nil")
 	}
 	_result := &_BACnetConstructedDataUTCOffset{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		UtcOffset:                     utcOffset,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCTimeSynchronizationRecipients.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCTimeSynchronizationRecipients.go
index e96ee056a35..86e583876d7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCTimeSynchronizationRecipients.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCTimeSynchronizationRecipients.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataUTCTimeSynchronizationRecipients = (*_BACnetConstruct
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataUTCTimeSynchronizationRecipients)(nil)
 
 // NewBACnetConstructedDataUTCTimeSynchronizationRecipients factory function for _BACnetConstructedDataUTCTimeSynchronizationRecipients
-func NewBACnetConstructedDataUTCTimeSynchronizationRecipients(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, utcTimeSynchronizationRecipients []BACnetRecipient, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataUTCTimeSynchronizationRecipients {
+func NewBACnetConstructedDataUTCTimeSynchronizationRecipients(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, utcTimeSynchronizationRecipients []BACnetRecipient) *_BACnetConstructedDataUTCTimeSynchronizationRecipients {
 	_result := &_BACnetConstructedDataUTCTimeSynchronizationRecipients{
-		BACnetConstructedDataContract:    NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract:    NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		UtcTimeSynchronizationRecipients: utcTimeSynchronizationRecipients,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnits.go
index 4714ec11308..6ab32f4bce9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnits.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataUnits = (*_BACnetConstructedDataUnits)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataUnits)(nil)
 
 // NewBACnetConstructedDataUnits factory function for _BACnetConstructedDataUnits
-func NewBACnetConstructedDataUnits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, units BACnetEngineeringUnitsTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataUnits {
+func NewBACnetConstructedDataUnits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, units BACnetEngineeringUnitsTagged) *_BACnetConstructedDataUnits {
 	if units == nil {
 		panic("units of type BACnetEngineeringUnitsTagged for BACnetConstructedDataUnits must not be nil")
 	}
 	_result := &_BACnetConstructedDataUnits{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Units:                         units,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
index 4b2a61934fd..0ea99ec3027 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataUnspecified = (*_BACnetConstructedDataUnspecified)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataUnspecified)(nil)
 
 // NewBACnetConstructedDataUnspecified factory function for _BACnetConstructedDataUnspecified
-func NewBACnetConstructedDataUnspecified(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, data []BACnetConstructedDataElement, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataUnspecified {
+func NewBACnetConstructedDataUnspecified(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, data []BACnetConstructedDataElement) *_BACnetConstructedDataUnspecified {
 	_result := &_BACnetConstructedDataUnspecified{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		Data:                          data,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateInterval.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateInterval.go
index 11bf18eaf6e..25de971d349 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateInterval.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateInterval.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataUpdateInterval = (*_BACnetConstructedDataUpdateInterv
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataUpdateInterval)(nil)
 
 // NewBACnetConstructedDataUpdateInterval factory function for _BACnetConstructedDataUpdateInterval
-func NewBACnetConstructedDataUpdateInterval(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, updateInterval BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataUpdateInterval {
+func NewBACnetConstructedDataUpdateInterval(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, updateInterval BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataUpdateInterval {
 	if updateInterval == nil {
 		panic("updateInterval of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataUpdateInterval must not be nil")
 	}
 	_result := &_BACnetConstructedDataUpdateInterval{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		UpdateInterval:                updateInterval,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateKeySetTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateKeySetTimeout.go
index 19f18d06a9c..0d8539697c9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateKeySetTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateKeySetTimeout.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataUpdateKeySetTimeout = (*_BACnetConstructedDataUpdateK
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataUpdateKeySetTimeout)(nil)
 
 // NewBACnetConstructedDataUpdateKeySetTimeout factory function for _BACnetConstructedDataUpdateKeySetTimeout
-func NewBACnetConstructedDataUpdateKeySetTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, updateKeySetTimeout BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataUpdateKeySetTimeout {
+func NewBACnetConstructedDataUpdateKeySetTimeout(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, updateKeySetTimeout BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataUpdateKeySetTimeout {
 	if updateKeySetTimeout == nil {
 		panic("updateKeySetTimeout of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataUpdateKeySetTimeout must not be nil")
 	}
 	_result := &_BACnetConstructedDataUpdateKeySetTimeout{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		UpdateKeySetTimeout:           updateKeySetTimeout,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateTime.go
index 557b2b6955f..6e6596a8def 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataUpdateTime = (*_BACnetConstructedDataUpdateTime)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataUpdateTime)(nil)
 
 // NewBACnetConstructedDataUpdateTime factory function for _BACnetConstructedDataUpdateTime
-func NewBACnetConstructedDataUpdateTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, updateTime BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataUpdateTime {
+func NewBACnetConstructedDataUpdateTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, updateTime BACnetDateTime) *_BACnetConstructedDataUpdateTime {
 	if updateTime == nil {
 		panic("updateTime of type BACnetDateTime for BACnetConstructedDataUpdateTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataUpdateTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		UpdateTime:                    updateTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserExternalIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserExternalIdentifier.go
index 7392c5f1e2d..a2ab60efe4b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserExternalIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserExternalIdentifier.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataUserExternalIdentifier = (*_BACnetConstructedDataUser
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataUserExternalIdentifier)(nil)
 
 // NewBACnetConstructedDataUserExternalIdentifier factory function for _BACnetConstructedDataUserExternalIdentifier
-func NewBACnetConstructedDataUserExternalIdentifier(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, userExternalIdentifier BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataUserExternalIdentifier {
+func NewBACnetConstructedDataUserExternalIdentifier(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, userExternalIdentifier BACnetApplicationTagCharacterString) *_BACnetConstructedDataUserExternalIdentifier {
 	if userExternalIdentifier == nil {
 		panic("userExternalIdentifier of type BACnetApplicationTagCharacterString for BACnetConstructedDataUserExternalIdentifier must not be nil")
 	}
 	_result := &_BACnetConstructedDataUserExternalIdentifier{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		UserExternalIdentifier:        userExternalIdentifier,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserInformationReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserInformationReference.go
index 28dded5bba9..7151406590f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserInformationReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserInformationReference.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataUserInformationReference = (*_BACnetConstructedDataUs
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataUserInformationReference)(nil)
 
 // NewBACnetConstructedDataUserInformationReference factory function for _BACnetConstructedDataUserInformationReference
-func NewBACnetConstructedDataUserInformationReference(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, userInformationReference BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataUserInformationReference {
+func NewBACnetConstructedDataUserInformationReference(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, userInformationReference BACnetApplicationTagCharacterString) *_BACnetConstructedDataUserInformationReference {
 	if userInformationReference == nil {
 		panic("userInformationReference of type BACnetApplicationTagCharacterString for BACnetConstructedDataUserInformationReference must not be nil")
 	}
 	_result := &_BACnetConstructedDataUserInformationReference{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		UserInformationReference:      userInformationReference,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserName.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserName.go
index 46a9fdb3cc0..325e4025abe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserName.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserName.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataUserName = (*_BACnetConstructedDataUserName)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataUserName)(nil)
 
 // NewBACnetConstructedDataUserName factory function for _BACnetConstructedDataUserName
-func NewBACnetConstructedDataUserName(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, userName BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataUserName {
+func NewBACnetConstructedDataUserName(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, userName BACnetApplicationTagCharacterString) *_BACnetConstructedDataUserName {
 	if userName == nil {
 		panic("userName of type BACnetApplicationTagCharacterString for BACnetConstructedDataUserName must not be nil")
 	}
 	_result := &_BACnetConstructedDataUserName{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		UserName:                      userName,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserType.go
index 10361a211ef..9b2d8ac4d09 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserType.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataUserType = (*_BACnetConstructedDataUserType)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataUserType)(nil)
 
 // NewBACnetConstructedDataUserType factory function for _BACnetConstructedDataUserType
-func NewBACnetConstructedDataUserType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, userType BACnetAccessUserTypeTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataUserType {
+func NewBACnetConstructedDataUserType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, userType BACnetAccessUserTypeTagged) *_BACnetConstructedDataUserType {
 	if userType == nil {
 		panic("userType of type BACnetAccessUserTypeTagged for BACnetConstructedDataUserType must not be nil")
 	}
 	_result := &_BACnetConstructedDataUserType{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		UserType:                      userType,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUsesRemaining.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUsesRemaining.go
index 6736fd1bd1f..70139711068 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUsesRemaining.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUsesRemaining.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataUsesRemaining = (*_BACnetConstructedDataUsesRemaining
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataUsesRemaining)(nil)
 
 // NewBACnetConstructedDataUsesRemaining factory function for _BACnetConstructedDataUsesRemaining
-func NewBACnetConstructedDataUsesRemaining(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, usesRemaining BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataUsesRemaining {
+func NewBACnetConstructedDataUsesRemaining(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, usesRemaining BACnetApplicationTagSignedInteger) *_BACnetConstructedDataUsesRemaining {
 	if usesRemaining == nil {
 		panic("usesRemaining of type BACnetApplicationTagSignedInteger for BACnetConstructedDataUsesRemaining must not be nil")
 	}
 	_result := &_BACnetConstructedDataUsesRemaining{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		UsesRemaining:                 usesRemaining,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVTClassesSupported.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVTClassesSupported.go
index ebf767e6810..4fc2c75a8df 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVTClassesSupported.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVTClassesSupported.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataVTClassesSupported = (*_BACnetConstructedDataVTClasse
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataVTClassesSupported)(nil)
 
 // NewBACnetConstructedDataVTClassesSupported factory function for _BACnetConstructedDataVTClassesSupported
-func NewBACnetConstructedDataVTClassesSupported(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, vtClassesSupported []BACnetVTClassTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataVTClassesSupported {
+func NewBACnetConstructedDataVTClassesSupported(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, vtClassesSupported []BACnetVTClassTagged) *_BACnetConstructedDataVTClassesSupported {
 	_result := &_BACnetConstructedDataVTClassesSupported{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		VtClassesSupported:            vtClassesSupported,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValidSamples.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValidSamples.go
index 57478adcb51..c733752fa94 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValidSamples.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValidSamples.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataValidSamples = (*_BACnetConstructedDataValidSamples)(
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataValidSamples)(nil)
 
 // NewBACnetConstructedDataValidSamples factory function for _BACnetConstructedDataValidSamples
-func NewBACnetConstructedDataValidSamples(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, validSamples BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataValidSamples {
+func NewBACnetConstructedDataValidSamples(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, validSamples BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataValidSamples {
 	if validSamples == nil {
 		panic("validSamples of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataValidSamples must not be nil")
 	}
 	_result := &_BACnetConstructedDataValidSamples{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ValidSamples:                  validSamples,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueBeforeChange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueBeforeChange.go
index 13f340b8bfe..c6fe036ede0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueBeforeChange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueBeforeChange.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataValueBeforeChange = (*_BACnetConstructedDataValueBefo
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataValueBeforeChange)(nil)
 
 // NewBACnetConstructedDataValueBeforeChange factory function for _BACnetConstructedDataValueBeforeChange
-func NewBACnetConstructedDataValueBeforeChange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, valuesBeforeChange BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataValueBeforeChange {
+func NewBACnetConstructedDataValueBeforeChange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, valuesBeforeChange BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataValueBeforeChange {
 	if valuesBeforeChange == nil {
 		panic("valuesBeforeChange of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataValueBeforeChange must not be nil")
 	}
 	_result := &_BACnetConstructedDataValueBeforeChange{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ValuesBeforeChange:            valuesBeforeChange,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueChangeTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueChangeTime.go
index 9f72a8fd9a7..d4ecbd82cd7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueChangeTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueChangeTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataValueChangeTime = (*_BACnetConstructedDataValueChange
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataValueChangeTime)(nil)
 
 // NewBACnetConstructedDataValueChangeTime factory function for _BACnetConstructedDataValueChangeTime
-func NewBACnetConstructedDataValueChangeTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, valueChangeTime BACnetDateTime, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataValueChangeTime {
+func NewBACnetConstructedDataValueChangeTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, valueChangeTime BACnetDateTime) *_BACnetConstructedDataValueChangeTime {
 	if valueChangeTime == nil {
 		panic("valueChangeTime of type BACnetDateTime for BACnetConstructedDataValueChangeTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataValueChangeTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ValueChangeTime:               valueChangeTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSet.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSet.go
index 7a8a0b3fa79..4da233af485 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSet.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSet.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataValueSet = (*_BACnetConstructedDataValueSet)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataValueSet)(nil)
 
 // NewBACnetConstructedDataValueSet factory function for _BACnetConstructedDataValueSet
-func NewBACnetConstructedDataValueSet(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, valueSet BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataValueSet {
+func NewBACnetConstructedDataValueSet(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, valueSet BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataValueSet {
 	if valueSet == nil {
 		panic("valueSet of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataValueSet must not be nil")
 	}
 	_result := &_BACnetConstructedDataValueSet{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ValueSet:                      valueSet,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSource.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSource.go
index 0347716582f..9f6145c3fdf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSource.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSource.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataValueSource = (*_BACnetConstructedDataValueSource)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataValueSource)(nil)
 
 // NewBACnetConstructedDataValueSource factory function for _BACnetConstructedDataValueSource
-func NewBACnetConstructedDataValueSource(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, valueSource BACnetValueSource, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataValueSource {
+func NewBACnetConstructedDataValueSource(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, valueSource BACnetValueSource) *_BACnetConstructedDataValueSource {
 	if valueSource == nil {
 		panic("valueSource of type BACnetValueSource for BACnetConstructedDataValueSource must not be nil")
 	}
 	_result := &_BACnetConstructedDataValueSource{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ValueSource:                   valueSource,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSourceArray.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSourceArray.go
index eb9ecd54843..833048aef4a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSourceArray.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSourceArray.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataValueSourceArray = (*_BACnetConstructedDataValueSourc
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataValueSourceArray)(nil)
 
 // NewBACnetConstructedDataValueSourceArray factory function for _BACnetConstructedDataValueSourceArray
-func NewBACnetConstructedDataValueSourceArray(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, vtClassesSupported []BACnetValueSource, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataValueSourceArray {
+func NewBACnetConstructedDataValueSourceArray(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, vtClassesSupported []BACnetValueSource) *_BACnetConstructedDataValueSourceArray {
 	_result := &_BACnetConstructedDataValueSourceArray{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		VtClassesSupported:            vtClassesSupported,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVarianceValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVarianceValue.go
index 75e03ed5989..09c11ea993d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVarianceValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVarianceValue.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataVarianceValue = (*_BACnetConstructedDataVarianceValue
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataVarianceValue)(nil)
 
 // NewBACnetConstructedDataVarianceValue factory function for _BACnetConstructedDataVarianceValue
-func NewBACnetConstructedDataVarianceValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, varianceValue BACnetApplicationTagReal, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataVarianceValue {
+func NewBACnetConstructedDataVarianceValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, varianceValue BACnetApplicationTagReal) *_BACnetConstructedDataVarianceValue {
 	if varianceValue == nil {
 		panic("varianceValue of type BACnetApplicationTagReal for BACnetConstructedDataVarianceValue must not be nil")
 	}
 	_result := &_BACnetConstructedDataVarianceValue{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		VarianceValue:                 varianceValue,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorIdentifier.go
index 980f44ceae7..348bb9850b3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorIdentifier.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataVendorIdentifier = (*_BACnetConstructedDataVendorIden
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataVendorIdentifier)(nil)
 
 // NewBACnetConstructedDataVendorIdentifier factory function for _BACnetConstructedDataVendorIdentifier
-func NewBACnetConstructedDataVendorIdentifier(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, vendorIdentifier BACnetVendorIdTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataVendorIdentifier {
+func NewBACnetConstructedDataVendorIdentifier(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, vendorIdentifier BACnetVendorIdTagged) *_BACnetConstructedDataVendorIdentifier {
 	if vendorIdentifier == nil {
 		panic("vendorIdentifier of type BACnetVendorIdTagged for BACnetConstructedDataVendorIdentifier must not be nil")
 	}
 	_result := &_BACnetConstructedDataVendorIdentifier{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		VendorIdentifier:              vendorIdentifier,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorName.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorName.go
index 23446ddc40f..b2e4afb02c4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorName.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorName.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataVendorName = (*_BACnetConstructedDataVendorName)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataVendorName)(nil)
 
 // NewBACnetConstructedDataVendorName factory function for _BACnetConstructedDataVendorName
-func NewBACnetConstructedDataVendorName(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, vendorName BACnetApplicationTagCharacterString, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataVendorName {
+func NewBACnetConstructedDataVendorName(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, vendorName BACnetApplicationTagCharacterString) *_BACnetConstructedDataVendorName {
 	if vendorName == nil {
 		panic("vendorName of type BACnetApplicationTagCharacterString for BACnetConstructedDataVendorName must not be nil")
 	}
 	_result := &_BACnetConstructedDataVendorName{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		VendorName:                    vendorName,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVerificationTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVerificationTime.go
index 9e96f5d17ed..f7fce376afb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVerificationTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVerificationTime.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataVerificationTime = (*_BACnetConstructedDataVerificati
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataVerificationTime)(nil)
 
 // NewBACnetConstructedDataVerificationTime factory function for _BACnetConstructedDataVerificationTime
-func NewBACnetConstructedDataVerificationTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, verificationTime BACnetApplicationTagSignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataVerificationTime {
+func NewBACnetConstructedDataVerificationTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, verificationTime BACnetApplicationTagSignedInteger) *_BACnetConstructedDataVerificationTime {
 	if verificationTime == nil {
 		panic("verificationTime of type BACnetApplicationTagSignedInteger for BACnetConstructedDataVerificationTime must not be nil")
 	}
 	_result := &_BACnetConstructedDataVerificationTime{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		VerificationTime:              verificationTime,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVirtualMACAddressTable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVirtualMACAddressTable.go
index 0811cb8e71e..506d5b6da96 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVirtualMACAddressTable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVirtualMACAddressTable.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataVirtualMACAddressTable = (*_BACnetConstructedDataVirt
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataVirtualMACAddressTable)(nil)
 
 // NewBACnetConstructedDataVirtualMACAddressTable factory function for _BACnetConstructedDataVirtualMACAddressTable
-func NewBACnetConstructedDataVirtualMACAddressTable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, virtualMacAddressTable []BACnetVMACEntry, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataVirtualMACAddressTable {
+func NewBACnetConstructedDataVirtualMACAddressTable(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, virtualMacAddressTable []BACnetVMACEntry) *_BACnetConstructedDataVirtualMACAddressTable {
 	_result := &_BACnetConstructedDataVirtualMACAddressTable{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		VirtualMacAddressTable:        virtualMacAddressTable,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWeeklySchedule.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWeeklySchedule.go
index f896f9c110a..2c72be235fb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWeeklySchedule.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWeeklySchedule.go
@@ -64,9 +64,9 @@ var _ BACnetConstructedDataWeeklySchedule = (*_BACnetConstructedDataWeeklySchedu
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataWeeklySchedule)(nil)
 
 // NewBACnetConstructedDataWeeklySchedule factory function for _BACnetConstructedDataWeeklySchedule
-func NewBACnetConstructedDataWeeklySchedule(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, weeklySchedule []BACnetDailySchedule, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataWeeklySchedule {
+func NewBACnetConstructedDataWeeklySchedule(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, numberOfDataElements BACnetApplicationTagUnsignedInteger, weeklySchedule []BACnetDailySchedule) *_BACnetConstructedDataWeeklySchedule {
 	_result := &_BACnetConstructedDataWeeklySchedule{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		NumberOfDataElements:          numberOfDataElements,
 		WeeklySchedule:                weeklySchedule,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowInterval.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowInterval.go
index fde057d4394..d3fb327cfe3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowInterval.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowInterval.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataWindowInterval = (*_BACnetConstructedDataWindowInterv
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataWindowInterval)(nil)
 
 // NewBACnetConstructedDataWindowInterval factory function for _BACnetConstructedDataWindowInterval
-func NewBACnetConstructedDataWindowInterval(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, windowInterval BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataWindowInterval {
+func NewBACnetConstructedDataWindowInterval(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, windowInterval BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataWindowInterval {
 	if windowInterval == nil {
 		panic("windowInterval of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataWindowInterval must not be nil")
 	}
 	_result := &_BACnetConstructedDataWindowInterval{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		WindowInterval:                windowInterval,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowSamples.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowSamples.go
index b9864c78a59..d69b3229821 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowSamples.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowSamples.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataWindowSamples = (*_BACnetConstructedDataWindowSamples
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataWindowSamples)(nil)
 
 // NewBACnetConstructedDataWindowSamples factory function for _BACnetConstructedDataWindowSamples
-func NewBACnetConstructedDataWindowSamples(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, windowSamples BACnetApplicationTagUnsignedInteger, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataWindowSamples {
+func NewBACnetConstructedDataWindowSamples(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, windowSamples BACnetApplicationTagUnsignedInteger) *_BACnetConstructedDataWindowSamples {
 	if windowSamples == nil {
 		panic("windowSamples of type BACnetApplicationTagUnsignedInteger for BACnetConstructedDataWindowSamples must not be nil")
 	}
 	_result := &_BACnetConstructedDataWindowSamples{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		WindowSamples:                 windowSamples,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWriteStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWriteStatus.go
index 536d80c4c4e..a668cf24a39 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWriteStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWriteStatus.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataWriteStatus = (*_BACnetConstructedDataWriteStatus)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataWriteStatus)(nil)
 
 // NewBACnetConstructedDataWriteStatus factory function for _BACnetConstructedDataWriteStatus
-func NewBACnetConstructedDataWriteStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, writeStatus BACnetWriteStatusTagged, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataWriteStatus {
+func NewBACnetConstructedDataWriteStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, writeStatus BACnetWriteStatusTagged) *_BACnetConstructedDataWriteStatus {
 	if writeStatus == nil {
 		panic("writeStatus of type BACnetWriteStatusTagged for BACnetConstructedDataWriteStatus must not be nil")
 	}
 	_result := &_BACnetConstructedDataWriteStatus{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		WriteStatus:                   writeStatus,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneFrom.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneFrom.go
index 2bff020f819..3df66c4aa0a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneFrom.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneFrom.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataZoneFrom = (*_BACnetConstructedDataZoneFrom)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataZoneFrom)(nil)
 
 // NewBACnetConstructedDataZoneFrom factory function for _BACnetConstructedDataZoneFrom
-func NewBACnetConstructedDataZoneFrom(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, zoneFrom BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataZoneFrom {
+func NewBACnetConstructedDataZoneFrom(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, zoneFrom BACnetDeviceObjectReference) *_BACnetConstructedDataZoneFrom {
 	if zoneFrom == nil {
 		panic("zoneFrom of type BACnetDeviceObjectReference for BACnetConstructedDataZoneFrom must not be nil")
 	}
 	_result := &_BACnetConstructedDataZoneFrom{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ZoneFrom:                      zoneFrom,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneMembers.go
index 7a183d6ad38..8197d6c167b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneMembers.go
@@ -59,9 +59,9 @@ var _ BACnetConstructedDataZoneMembers = (*_BACnetConstructedDataZoneMembers)(ni
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataZoneMembers)(nil)
 
 // NewBACnetConstructedDataZoneMembers factory function for _BACnetConstructedDataZoneMembers
-func NewBACnetConstructedDataZoneMembers(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, members []BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataZoneMembers {
+func NewBACnetConstructedDataZoneMembers(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, members []BACnetDeviceObjectReference) *_BACnetConstructedDataZoneMembers {
 	_result := &_BACnetConstructedDataZoneMembers{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		Members:                       members,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneTo.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneTo.go
index 40ccc49497d..8bdacc7a253 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneTo.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneTo.go
@@ -61,12 +61,12 @@ var _ BACnetConstructedDataZoneTo = (*_BACnetConstructedDataZoneTo)(nil)
 var _ BACnetConstructedDataRequirements = (*_BACnetConstructedDataZoneTo)(nil)
 
 // NewBACnetConstructedDataZoneTo factory function for _BACnetConstructedDataZoneTo
-func NewBACnetConstructedDataZoneTo(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, zoneTo BACnetDeviceObjectReference, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetConstructedDataZoneTo {
+func NewBACnetConstructedDataZoneTo(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, zoneTo BACnetDeviceObjectReference) *_BACnetConstructedDataZoneTo {
 	if zoneTo == nil {
 		panic("zoneTo of type BACnetDeviceObjectReference for BACnetConstructedDataZoneTo must not be nil")
 	}
 	_result := &_BACnetConstructedDataZoneTo{
-		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument),
+		BACnetConstructedDataContract: NewBACnetConstructedData(openingTag, peekedTagHeader, closingTag),
 		ZoneTo:                        zoneTo,
 	}
 	_result.BACnetConstructedDataContract.(*_BACnetConstructedData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTag.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTag.go
index 4583c2b729a..5c65fceebce 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTag.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTag.go
@@ -56,8 +56,6 @@ type BACnetContextTagContract interface {
 	GetTagNumber() uint8
 	// GetActualLength returns ActualLength (virtual field)
 	GetActualLength() uint32
-	// GetTagNumberArgument() returns a parser argument
-	GetTagNumberArgument() uint8
 	// IsBACnetContextTag is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetContextTag()
 	// CreateBuilder creates a BACnetContextTagBuilder
@@ -79,19 +77,16 @@ type _BACnetContextTag struct {
 		BACnetContextTagRequirements
 	}
 	Header BACnetTagHeader
-
-	// Arguments.
-	TagNumberArgument uint8
 }
 
 var _ BACnetContextTagContract = (*_BACnetContextTag)(nil)
 
 // NewBACnetContextTag factory function for _BACnetContextTag
-func NewBACnetContextTag(header BACnetTagHeader, tagNumberArgument uint8) *_BACnetContextTag {
+func NewBACnetContextTag(header BACnetTagHeader) *_BACnetContextTag {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetContextTag must not be nil")
 	}
-	return &_BACnetContextTag{Header: header, TagNumberArgument: tagNumberArgument}
+	return &_BACnetContextTag{Header: header}
 }
 
 ///////////////////////////////////////////////////////////
@@ -108,8 +103,6 @@ type BACnetContextTagBuilder interface {
 	WithHeader(BACnetTagHeader) BACnetContextTagBuilder
 	// WithHeaderBuilder adds Header (property field) which is build by the builder
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetContextTagBuilder
-	// WithArgTagNumberArgument sets a parser argument
-	WithArgTagNumberArgument(uint8) BACnetContextTagBuilder
 	// AsBACnetContextTagNull converts this build to a subType of BACnetContextTag. It is always possible to return to current builder using Done()
 	AsBACnetContextTagNull() BACnetContextTagNullBuilder
 	// AsBACnetContextTagBoolean converts this build to a subType of BACnetContextTag. It is always possible to return to current builder using Done()
@@ -188,11 +181,6 @@ func (b *_BACnetContextTagBuilder) WithHeaderBuilder(builderSupplier func(BACnet
 	return b
 }
 
-func (b *_BACnetContextTagBuilder) WithArgTagNumberArgument(tagNumberArgument uint8) BACnetContextTagBuilder {
-	b.TagNumberArgument = tagNumberArgument
-	return b
-}
-
 func (b *_BACnetContextTagBuilder) PartialBuild() (BACnetContextTagContract, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -483,7 +471,7 @@ func BACnetContextTagParseWithBufferProducer[T BACnetContextTag](tagNumberArgume
 }
 
 func BACnetContextTagParseWithBuffer[T BACnetContextTag](ctx context.Context, readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType) (T, error) {
-	v, err := (&_BACnetContextTag{TagNumberArgument: tagNumberArgument}).parse(ctx, readBuffer, tagNumberArgument, dataType)
+	v, err := (new(_BACnetContextTag)).parse(ctx, readBuffer, tagNumberArgument, dataType)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -647,16 +635,6 @@ func (pm *_BACnetContextTag) serializeParent(ctx context.Context, writeBuffer ut
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetContextTag) GetTagNumberArgument() uint8 {
-	return m.TagNumberArgument
-}
-
-//
-////
-
 func (m *_BACnetContextTag) IsBACnetContextTag() {}
 
 func (m *_BACnetContextTag) DeepCopy() any {
@@ -670,7 +648,6 @@ func (m *_BACnetContextTag) deepCopy() *_BACnetContextTag {
 	_BACnetContextTagCopy := &_BACnetContextTag{
 		nil, // will be set by child
 		utils.DeepCopy[BACnetTagHeader](m.Header),
-		m.TagNumberArgument,
 	}
 	return _BACnetContextTagCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBitString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBitString.go
index 1ad17cb7b18..fd86309b844 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBitString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBitString.go
@@ -59,12 +59,12 @@ var _ BACnetContextTagBitString = (*_BACnetContextTagBitString)(nil)
 var _ BACnetContextTagRequirements = (*_BACnetContextTagBitString)(nil)
 
 // NewBACnetContextTagBitString factory function for _BACnetContextTagBitString
-func NewBACnetContextTagBitString(header BACnetTagHeader, payload BACnetTagPayloadBitString, tagNumberArgument uint8) *_BACnetContextTagBitString {
+func NewBACnetContextTagBitString(header BACnetTagHeader, payload BACnetTagPayloadBitString) *_BACnetContextTagBitString {
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadBitString for BACnetContextTagBitString must not be nil")
 	}
 	_result := &_BACnetContextTagBitString{
-		BACnetContextTagContract: NewBACnetContextTag(header, tagNumberArgument),
+		BACnetContextTagContract: NewBACnetContextTag(header),
 		Payload:                  payload,
 	}
 	_result.BACnetContextTagContract.(*_BACnetContextTag)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBoolean.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBoolean.go
index 38d1afa34b2..a8940b2c68f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBoolean.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBoolean.go
@@ -64,12 +64,12 @@ var _ BACnetContextTagBoolean = (*_BACnetContextTagBoolean)(nil)
 var _ BACnetContextTagRequirements = (*_BACnetContextTagBoolean)(nil)
 
 // NewBACnetContextTagBoolean factory function for _BACnetContextTagBoolean
-func NewBACnetContextTagBoolean(header BACnetTagHeader, value uint8, payload BACnetTagPayloadBoolean, tagNumberArgument uint8) *_BACnetContextTagBoolean {
+func NewBACnetContextTagBoolean(header BACnetTagHeader, value uint8, payload BACnetTagPayloadBoolean) *_BACnetContextTagBoolean {
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadBoolean for BACnetContextTagBoolean must not be nil")
 	}
 	_result := &_BACnetContextTagBoolean{
-		BACnetContextTagContract: NewBACnetContextTag(header, tagNumberArgument),
+		BACnetContextTagContract: NewBACnetContextTag(header),
 		Value:                    value,
 		Payload:                  payload,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagCharacterString.go
index db13ebf3a0e..214206a2798 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagCharacterString.go
@@ -61,12 +61,12 @@ var _ BACnetContextTagCharacterString = (*_BACnetContextTagCharacterString)(nil)
 var _ BACnetContextTagRequirements = (*_BACnetContextTagCharacterString)(nil)
 
 // NewBACnetContextTagCharacterString factory function for _BACnetContextTagCharacterString
-func NewBACnetContextTagCharacterString(header BACnetTagHeader, payload BACnetTagPayloadCharacterString, tagNumberArgument uint8) *_BACnetContextTagCharacterString {
+func NewBACnetContextTagCharacterString(header BACnetTagHeader, payload BACnetTagPayloadCharacterString) *_BACnetContextTagCharacterString {
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadCharacterString for BACnetContextTagCharacterString must not be nil")
 	}
 	_result := &_BACnetContextTagCharacterString{
-		BACnetContextTagContract: NewBACnetContextTag(header, tagNumberArgument),
+		BACnetContextTagContract: NewBACnetContextTag(header),
 		Payload:                  payload,
 	}
 	_result.BACnetContextTagContract.(*_BACnetContextTag)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDate.go
index 42826ec884f..d446b8e42a6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDate.go
@@ -59,12 +59,12 @@ var _ BACnetContextTagDate = (*_BACnetContextTagDate)(nil)
 var _ BACnetContextTagRequirements = (*_BACnetContextTagDate)(nil)
 
 // NewBACnetContextTagDate factory function for _BACnetContextTagDate
-func NewBACnetContextTagDate(header BACnetTagHeader, payload BACnetTagPayloadDate, tagNumberArgument uint8) *_BACnetContextTagDate {
+func NewBACnetContextTagDate(header BACnetTagHeader, payload BACnetTagPayloadDate) *_BACnetContextTagDate {
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadDate for BACnetContextTagDate must not be nil")
 	}
 	_result := &_BACnetContextTagDate{
-		BACnetContextTagContract: NewBACnetContextTag(header, tagNumberArgument),
+		BACnetContextTagContract: NewBACnetContextTag(header),
 		Payload:                  payload,
 	}
 	_result.BACnetContextTagContract.(*_BACnetContextTag)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDouble.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDouble.go
index a5ce9dc98de..7841c9cf24a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDouble.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDouble.go
@@ -61,12 +61,12 @@ var _ BACnetContextTagDouble = (*_BACnetContextTagDouble)(nil)
 var _ BACnetContextTagRequirements = (*_BACnetContextTagDouble)(nil)
 
 // NewBACnetContextTagDouble factory function for _BACnetContextTagDouble
-func NewBACnetContextTagDouble(header BACnetTagHeader, payload BACnetTagPayloadDouble, tagNumberArgument uint8) *_BACnetContextTagDouble {
+func NewBACnetContextTagDouble(header BACnetTagHeader, payload BACnetTagPayloadDouble) *_BACnetContextTagDouble {
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadDouble for BACnetContextTagDouble must not be nil")
 	}
 	_result := &_BACnetContextTagDouble{
-		BACnetContextTagContract: NewBACnetContextTag(header, tagNumberArgument),
+		BACnetContextTagContract: NewBACnetContextTag(header),
 		Payload:                  payload,
 	}
 	_result.BACnetContextTagContract.(*_BACnetContextTag)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagEnumerated.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagEnumerated.go
index bf5047c9eb5..e5e9f5083bd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagEnumerated.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagEnumerated.go
@@ -61,12 +61,12 @@ var _ BACnetContextTagEnumerated = (*_BACnetContextTagEnumerated)(nil)
 var _ BACnetContextTagRequirements = (*_BACnetContextTagEnumerated)(nil)
 
 // NewBACnetContextTagEnumerated factory function for _BACnetContextTagEnumerated
-func NewBACnetContextTagEnumerated(header BACnetTagHeader, payload BACnetTagPayloadEnumerated, tagNumberArgument uint8) *_BACnetContextTagEnumerated {
+func NewBACnetContextTagEnumerated(header BACnetTagHeader, payload BACnetTagPayloadEnumerated) *_BACnetContextTagEnumerated {
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadEnumerated for BACnetContextTagEnumerated must not be nil")
 	}
 	_result := &_BACnetContextTagEnumerated{
-		BACnetContextTagContract: NewBACnetContextTag(header, tagNumberArgument),
+		BACnetContextTagContract: NewBACnetContextTag(header),
 		Payload:                  payload,
 	}
 	_result.BACnetContextTagContract.(*_BACnetContextTag)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagNull.go
index df39a188256..45e44870e2b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagNull.go
@@ -54,9 +54,9 @@ var _ BACnetContextTagNull = (*_BACnetContextTagNull)(nil)
 var _ BACnetContextTagRequirements = (*_BACnetContextTagNull)(nil)
 
 // NewBACnetContextTagNull factory function for _BACnetContextTagNull
-func NewBACnetContextTagNull(header BACnetTagHeader, tagNumberArgument uint8) *_BACnetContextTagNull {
+func NewBACnetContextTagNull(header BACnetTagHeader) *_BACnetContextTagNull {
 	_result := &_BACnetContextTagNull{
-		BACnetContextTagContract: NewBACnetContextTag(header, tagNumberArgument),
+		BACnetContextTagContract: NewBACnetContextTag(header),
 	}
 	_result.BACnetContextTagContract.(*_BACnetContextTag)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go
index 3f56a8d3fc7..bf0cec42ac2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go
@@ -63,12 +63,12 @@ var _ BACnetContextTagObjectIdentifier = (*_BACnetContextTagObjectIdentifier)(ni
 var _ BACnetContextTagRequirements = (*_BACnetContextTagObjectIdentifier)(nil)
 
 // NewBACnetContextTagObjectIdentifier factory function for _BACnetContextTagObjectIdentifier
-func NewBACnetContextTagObjectIdentifier(header BACnetTagHeader, payload BACnetTagPayloadObjectIdentifier, tagNumberArgument uint8) *_BACnetContextTagObjectIdentifier {
+func NewBACnetContextTagObjectIdentifier(header BACnetTagHeader, payload BACnetTagPayloadObjectIdentifier) *_BACnetContextTagObjectIdentifier {
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadObjectIdentifier for BACnetContextTagObjectIdentifier must not be nil")
 	}
 	_result := &_BACnetContextTagObjectIdentifier{
-		BACnetContextTagContract: NewBACnetContextTag(header, tagNumberArgument),
+		BACnetContextTagContract: NewBACnetContextTag(header),
 		Payload:                  payload,
 	}
 	_result.BACnetContextTagContract.(*_BACnetContextTag)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagOctetString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagOctetString.go
index f408f8011b8..e557a4f4ab6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagOctetString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagOctetString.go
@@ -59,12 +59,12 @@ var _ BACnetContextTagOctetString = (*_BACnetContextTagOctetString)(nil)
 var _ BACnetContextTagRequirements = (*_BACnetContextTagOctetString)(nil)
 
 // NewBACnetContextTagOctetString factory function for _BACnetContextTagOctetString
-func NewBACnetContextTagOctetString(header BACnetTagHeader, payload BACnetTagPayloadOctetString, tagNumberArgument uint8) *_BACnetContextTagOctetString {
+func NewBACnetContextTagOctetString(header BACnetTagHeader, payload BACnetTagPayloadOctetString) *_BACnetContextTagOctetString {
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadOctetString for BACnetContextTagOctetString must not be nil")
 	}
 	_result := &_BACnetContextTagOctetString{
-		BACnetContextTagContract: NewBACnetContextTag(header, tagNumberArgument),
+		BACnetContextTagContract: NewBACnetContextTag(header),
 		Payload:                  payload,
 	}
 	_result.BACnetContextTagContract.(*_BACnetContextTag)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagReal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagReal.go
index 18fb80ea0ab..e92997485d0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagReal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagReal.go
@@ -61,12 +61,12 @@ var _ BACnetContextTagReal = (*_BACnetContextTagReal)(nil)
 var _ BACnetContextTagRequirements = (*_BACnetContextTagReal)(nil)
 
 // NewBACnetContextTagReal factory function for _BACnetContextTagReal
-func NewBACnetContextTagReal(header BACnetTagHeader, payload BACnetTagPayloadReal, tagNumberArgument uint8) *_BACnetContextTagReal {
+func NewBACnetContextTagReal(header BACnetTagHeader, payload BACnetTagPayloadReal) *_BACnetContextTagReal {
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadReal for BACnetContextTagReal must not be nil")
 	}
 	_result := &_BACnetContextTagReal{
-		BACnetContextTagContract: NewBACnetContextTag(header, tagNumberArgument),
+		BACnetContextTagContract: NewBACnetContextTag(header),
 		Payload:                  payload,
 	}
 	_result.BACnetContextTagContract.(*_BACnetContextTag)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go
index 96d3f027659..63cd59fcbc5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go
@@ -61,12 +61,12 @@ var _ BACnetContextTagSignedInteger = (*_BACnetContextTagSignedInteger)(nil)
 var _ BACnetContextTagRequirements = (*_BACnetContextTagSignedInteger)(nil)
 
 // NewBACnetContextTagSignedInteger factory function for _BACnetContextTagSignedInteger
-func NewBACnetContextTagSignedInteger(header BACnetTagHeader, payload BACnetTagPayloadSignedInteger, tagNumberArgument uint8) *_BACnetContextTagSignedInteger {
+func NewBACnetContextTagSignedInteger(header BACnetTagHeader, payload BACnetTagPayloadSignedInteger) *_BACnetContextTagSignedInteger {
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadSignedInteger for BACnetContextTagSignedInteger must not be nil")
 	}
 	_result := &_BACnetContextTagSignedInteger{
-		BACnetContextTagContract: NewBACnetContextTag(header, tagNumberArgument),
+		BACnetContextTagContract: NewBACnetContextTag(header),
 		Payload:                  payload,
 	}
 	_result.BACnetContextTagContract.(*_BACnetContextTag)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagTime.go
index 86c4fc0a953..9db454800c5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagTime.go
@@ -59,12 +59,12 @@ var _ BACnetContextTagTime = (*_BACnetContextTagTime)(nil)
 var _ BACnetContextTagRequirements = (*_BACnetContextTagTime)(nil)
 
 // NewBACnetContextTagTime factory function for _BACnetContextTagTime
-func NewBACnetContextTagTime(header BACnetTagHeader, payload BACnetTagPayloadTime, tagNumberArgument uint8) *_BACnetContextTagTime {
+func NewBACnetContextTagTime(header BACnetTagHeader, payload BACnetTagPayloadTime) *_BACnetContextTagTime {
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadTime for BACnetContextTagTime must not be nil")
 	}
 	_result := &_BACnetContextTagTime{
-		BACnetContextTagContract: NewBACnetContextTag(header, tagNumberArgument),
+		BACnetContextTagContract: NewBACnetContextTag(header),
 		Payload:                  payload,
 	}
 	_result.BACnetContextTagContract.(*_BACnetContextTag)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnknown.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnknown.go
index a393dfb6095..6999f34fde4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnknown.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnknown.go
@@ -53,18 +53,15 @@ type BACnetContextTagUnknown interface {
 type _BACnetContextTagUnknown struct {
 	BACnetContextTagContract
 	UnknownData []byte
-
-	// Arguments.
-	ActualLength uint32
 }
 
 var _ BACnetContextTagUnknown = (*_BACnetContextTagUnknown)(nil)
 var _ BACnetContextTagRequirements = (*_BACnetContextTagUnknown)(nil)
 
 // NewBACnetContextTagUnknown factory function for _BACnetContextTagUnknown
-func NewBACnetContextTagUnknown(header BACnetTagHeader, unknownData []byte, actualLength uint32, tagNumberArgument uint8) *_BACnetContextTagUnknown {
+func NewBACnetContextTagUnknown(header BACnetTagHeader, unknownData []byte) *_BACnetContextTagUnknown {
 	_result := &_BACnetContextTagUnknown{
-		BACnetContextTagContract: NewBACnetContextTag(header, tagNumberArgument),
+		BACnetContextTagContract: NewBACnetContextTag(header),
 		UnknownData:              unknownData,
 	}
 	_result.BACnetContextTagContract.(*_BACnetContextTag)._SubType = _result
@@ -83,8 +80,6 @@ type BACnetContextTagUnknownBuilder interface {
 	WithMandatoryFields(unknownData []byte) BACnetContextTagUnknownBuilder
 	// WithUnknownData adds UnknownData (property field)
 	WithUnknownData(...byte) BACnetContextTagUnknownBuilder
-	// WithArgActualLength sets a parser argument
-	WithArgActualLength(uint32) BACnetContextTagUnknownBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BACnetContextTagBuilder
 	// Build builds the BACnetContextTagUnknown or returns an error if something is wrong
@@ -122,11 +117,6 @@ func (b *_BACnetContextTagUnknownBuilder) WithUnknownData(unknownData ...byte) B
 	return b
 }
 
-func (b *_BACnetContextTagUnknownBuilder) WithArgActualLength(actualLength uint32) BACnetContextTagUnknownBuilder {
-	b.ActualLength = actualLength
-	return b
-}
-
 func (b *_BACnetContextTagUnknownBuilder) Build() (BACnetContextTagUnknown, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -290,16 +280,6 @@ func (m *_BACnetContextTagUnknown) SerializeWithWriteBuffer(ctx context.Context,
 	return m.BACnetContextTagContract.(*_BACnetContextTag).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetContextTagUnknown) GetActualLength() uint32 {
-	return m.ActualLength
-}
-
-//
-////
-
 func (m *_BACnetContextTagUnknown) IsBACnetContextTagUnknown() {}
 
 func (m *_BACnetContextTagUnknown) DeepCopy() any {
@@ -313,7 +293,6 @@ func (m *_BACnetContextTagUnknown) deepCopy() *_BACnetContextTagUnknown {
 	_BACnetContextTagUnknownCopy := &_BACnetContextTagUnknown{
 		m.BACnetContextTagContract.(*_BACnetContextTag).deepCopy(),
 		utils.DeepCopySlice[byte, byte](m.UnknownData),
-		m.ActualLength,
 	}
 	_BACnetContextTagUnknownCopy.BACnetContextTagContract.(*_BACnetContextTag)._SubType = m
 	return _BACnetContextTagUnknownCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go
index 89298211c5c..8a2b3314778 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go
@@ -61,12 +61,12 @@ var _ BACnetContextTagUnsignedInteger = (*_BACnetContextTagUnsignedInteger)(nil)
 var _ BACnetContextTagRequirements = (*_BACnetContextTagUnsignedInteger)(nil)
 
 // NewBACnetContextTagUnsignedInteger factory function for _BACnetContextTagUnsignedInteger
-func NewBACnetContextTagUnsignedInteger(header BACnetTagHeader, payload BACnetTagPayloadUnsignedInteger, tagNumberArgument uint8) *_BACnetContextTagUnsignedInteger {
+func NewBACnetContextTagUnsignedInteger(header BACnetTagHeader, payload BACnetTagPayloadUnsignedInteger) *_BACnetContextTagUnsignedInteger {
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadUnsignedInteger for BACnetContextTagUnsignedInteger must not be nil")
 	}
 	_result := &_BACnetContextTagUnsignedInteger{
-		BACnetContextTagContract: NewBACnetContextTag(header, tagNumberArgument),
+		BACnetContextTagContract: NewBACnetContextTag(header),
 		Payload:                  payload,
 	}
 	_result.BACnetContextTagContract.(*_BACnetContextTag)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCredentialAuthenticationFactor.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCredentialAuthenticationFactor.go
index 6f43c445c85..3f1824ce098 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCredentialAuthenticationFactor.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCredentialAuthenticationFactor.go
@@ -242,7 +242,7 @@ func BACnetCredentialAuthenticationFactorParseWithBufferProducer() func(ctx cont
 }
 
 func BACnetCredentialAuthenticationFactorParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetCredentialAuthenticationFactor, error) {
-	v, err := (&_BACnetCredentialAuthenticationFactor{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetCredentialAuthenticationFactor)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDailySchedule.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDailySchedule.go
index db33f8188b3..755dc09a17b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDailySchedule.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDailySchedule.go
@@ -263,7 +263,7 @@ func BACnetDailyScheduleParseWithBufferProducer() func(ctx context.Context, read
 }
 
 func BACnetDailyScheduleParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetDailySchedule, error) {
-	v, err := (&_BACnetDailySchedule{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetDailySchedule)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRange.go
index 8f24a9c9026..900d654465a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRange.go
@@ -242,7 +242,7 @@ func BACnetDateRangeParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func BACnetDateRangeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetDateRange, error) {
-	v, err := (&_BACnetDateRange{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetDateRange)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRangeEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRangeEnclosed.go
index 4c0fe736c4f..f9d539dd5d2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRangeEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRangeEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetDateRangeEnclosed struct {
 	OpeningTag BACnetOpeningTag
 	DateRange  BACnetDateRange
 	ClosingTag BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetDateRangeEnclosed = (*_BACnetDateRangeEnclosed)(nil)
 
 // NewBACnetDateRangeEnclosed factory function for _BACnetDateRangeEnclosed
-func NewBACnetDateRangeEnclosed(openingTag BACnetOpeningTag, dateRange BACnetDateRange, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetDateRangeEnclosed {
+func NewBACnetDateRangeEnclosed(openingTag BACnetOpeningTag, dateRange BACnetDateRange, closingTag BACnetClosingTag) *_BACnetDateRangeEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetDateRangeEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetDateRangeEnclosed(openingTag BACnetOpeningTag, dateRange BACnetDat
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetDateRangeEnclosed must not be nil")
 	}
-	return &_BACnetDateRangeEnclosed{OpeningTag: openingTag, DateRange: dateRange, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetDateRangeEnclosed{OpeningTag: openingTag, DateRange: dateRange, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetDateRangeEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetDateRangeEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetDateRangeEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetDateRangeEnclosedBuilder
 	// Build builds the BACnetDateRangeEnclosed or returns an error if something is wrong
 	Build() (BACnetDateRangeEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetDateRangeEnclosedBuilder) WithClosingTagBuilder(builderSupplier
 	return b
 }
 
-func (b *_BACnetDateRangeEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetDateRangeEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetDateRangeEnclosedBuilder) Build() (BACnetDateRangeEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetDateRangeEnclosedParseWithBufferProducer(tagNumber uint8) func(ctx co
 }
 
 func BACnetDateRangeEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetDateRangeEnclosed, error) {
-	v, err := (&_BACnetDateRangeEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetDateRangeEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetDateRangeEnclosed) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetDateRangeEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetDateRangeEnclosed) IsBACnetDateRangeEnclosed() {}
 
 func (m *_BACnetDateRangeEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetDateRangeEnclosed) deepCopy() *_BACnetDateRangeEnclosed {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetDateRange](m.DateRange),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetDateRangeEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTime.go
index 9c7e95120ea..1c56068f25e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTime.go
@@ -242,7 +242,7 @@ func BACnetDateTimeParseWithBufferProducer() func(ctx context.Context, readBuffe
 }
 
 func BACnetDateTimeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetDateTime, error) {
-	v, err := (&_BACnetDateTime{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetDateTime)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTimeEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTimeEnclosed.go
index 2a8b3fe883d..11af7eb2e88 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTimeEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTimeEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetDateTimeEnclosed struct {
 	OpeningTag    BACnetOpeningTag
 	DateTimeValue BACnetDateTime
 	ClosingTag    BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetDateTimeEnclosed = (*_BACnetDateTimeEnclosed)(nil)
 
 // NewBACnetDateTimeEnclosed factory function for _BACnetDateTimeEnclosed
-func NewBACnetDateTimeEnclosed(openingTag BACnetOpeningTag, dateTimeValue BACnetDateTime, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetDateTimeEnclosed {
+func NewBACnetDateTimeEnclosed(openingTag BACnetOpeningTag, dateTimeValue BACnetDateTime, closingTag BACnetClosingTag) *_BACnetDateTimeEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetDateTimeEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetDateTimeEnclosed(openingTag BACnetOpeningTag, dateTimeValue BACnet
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetDateTimeEnclosed must not be nil")
 	}
-	return &_BACnetDateTimeEnclosed{OpeningTag: openingTag, DateTimeValue: dateTimeValue, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetDateTimeEnclosed{OpeningTag: openingTag, DateTimeValue: dateTimeValue, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetDateTimeEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetDateTimeEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetDateTimeEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetDateTimeEnclosedBuilder
 	// Build builds the BACnetDateTimeEnclosed or returns an error if something is wrong
 	Build() (BACnetDateTimeEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetDateTimeEnclosedBuilder) WithClosingTagBuilder(builderSupplier f
 	return b
 }
 
-func (b *_BACnetDateTimeEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetDateTimeEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetDateTimeEnclosedBuilder) Build() (BACnetDateTimeEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetDateTimeEnclosedParseWithBufferProducer(tagNumber uint8) func(ctx con
 }
 
 func BACnetDateTimeEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetDateTimeEnclosed, error) {
-	v, err := (&_BACnetDateTimeEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetDateTimeEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetDateTimeEnclosed) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetDateTimeEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetDateTimeEnclosed) IsBACnetDateTimeEnclosed() {}
 
 func (m *_BACnetDateTimeEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetDateTimeEnclosed) deepCopy() *_BACnetDateTimeEnclosed {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetDateTime](m.DateTimeValue),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetDateTimeEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeekTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeekTagged.go
index b32e29f8915..8ec2f613dbc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeekTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeekTagged.go
@@ -68,23 +68,19 @@ type BACnetDaysOfWeekTagged interface {
 type _BACnetDaysOfWeekTagged struct {
 	Header  BACnetTagHeader
 	Payload BACnetTagPayloadBitString
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetDaysOfWeekTagged = (*_BACnetDaysOfWeekTagged)(nil)
 
 // NewBACnetDaysOfWeekTagged factory function for _BACnetDaysOfWeekTagged
-func NewBACnetDaysOfWeekTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString, tagNumber uint8, tagClass TagClass) *_BACnetDaysOfWeekTagged {
+func NewBACnetDaysOfWeekTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString) *_BACnetDaysOfWeekTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetDaysOfWeekTagged must not be nil")
 	}
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadBitString for BACnetDaysOfWeekTagged must not be nil")
 	}
-	return &_BACnetDaysOfWeekTagged{Header: header, Payload: payload, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetDaysOfWeekTagged{Header: header, Payload: payload}
 }
 
 ///////////////////////////////////////////////////////////
@@ -105,10 +101,6 @@ type BACnetDaysOfWeekTaggedBuilder interface {
 	WithPayload(BACnetTagPayloadBitString) BACnetDaysOfWeekTaggedBuilder
 	// WithPayloadBuilder adds Payload (property field) which is build by the builder
 	WithPayloadBuilder(func(BACnetTagPayloadBitStringBuilder) BACnetTagPayloadBitStringBuilder) BACnetDaysOfWeekTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetDaysOfWeekTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetDaysOfWeekTaggedBuilder
 	// Build builds the BACnetDaysOfWeekTagged or returns an error if something is wrong
 	Build() (BACnetDaysOfWeekTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -162,15 +154,6 @@ func (b *_BACnetDaysOfWeekTaggedBuilder) WithPayloadBuilder(builderSupplier func
 	return b
 }
 
-func (b *_BACnetDaysOfWeekTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetDaysOfWeekTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetDaysOfWeekTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetDaysOfWeekTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetDaysOfWeekTaggedBuilder) Build() (BACnetDaysOfWeekTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -338,7 +321,7 @@ func BACnetDaysOfWeekTaggedParseWithBufferProducer(tagNumber uint8, tagClass Tag
 }
 
 func BACnetDaysOfWeekTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetDaysOfWeekTagged, error) {
-	v, err := (&_BACnetDaysOfWeekTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetDaysOfWeekTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -498,19 +481,6 @@ func (m *_BACnetDaysOfWeekTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetDaysOfWeekTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetDaysOfWeekTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetDaysOfWeekTagged) IsBACnetDaysOfWeekTagged() {}
 
 func (m *_BACnetDaysOfWeekTagged) DeepCopy() any {
@@ -524,8 +494,6 @@ func (m *_BACnetDaysOfWeekTagged) deepCopy() *_BACnetDaysOfWeekTagged {
 	_BACnetDaysOfWeekTaggedCopy := &_BACnetDaysOfWeekTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		utils.DeepCopy[BACnetTagPayloadBitString](m.Payload),
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetDaysOfWeekTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDestination.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDestination.go
index 32c8868cd39..9e5bef6f0c6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDestination.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDestination.go
@@ -417,7 +417,7 @@ func BACnetDestinationParseWithBufferProducer() func(ctx context.Context, readBu
 }
 
 func BACnetDestinationParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetDestination, error) {
-	v, err := (&_BACnetDestination{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetDestination)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go
index 769bc6a6b39..db1b5d9482e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go
@@ -304,7 +304,7 @@ func BACnetDeviceObjectPropertyReferenceParseWithBufferProducer() func(ctx conte
 }
 
 func BACnetDeviceObjectPropertyReferenceParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetDeviceObjectPropertyReference, error) {
-	v, err := (&_BACnetDeviceObjectPropertyReference{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetDeviceObjectPropertyReference)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReferenceEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReferenceEnclosed.go
index c55d4c6c416..1432a99731b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReferenceEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReferenceEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetDeviceObjectPropertyReferenceEnclosed struct {
 	OpeningTag BACnetOpeningTag
 	Value      BACnetDeviceObjectPropertyReference
 	ClosingTag BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetDeviceObjectPropertyReferenceEnclosed = (*_BACnetDeviceObjectPropertyReferenceEnclosed)(nil)
 
 // NewBACnetDeviceObjectPropertyReferenceEnclosed factory function for _BACnetDeviceObjectPropertyReferenceEnclosed
-func NewBACnetDeviceObjectPropertyReferenceEnclosed(openingTag BACnetOpeningTag, value BACnetDeviceObjectPropertyReference, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetDeviceObjectPropertyReferenceEnclosed {
+func NewBACnetDeviceObjectPropertyReferenceEnclosed(openingTag BACnetOpeningTag, value BACnetDeviceObjectPropertyReference, closingTag BACnetClosingTag) *_BACnetDeviceObjectPropertyReferenceEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetDeviceObjectPropertyReferenceEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetDeviceObjectPropertyReferenceEnclosed(openingTag BACnetOpeningTag,
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetDeviceObjectPropertyReferenceEnclosed must not be nil")
 	}
-	return &_BACnetDeviceObjectPropertyReferenceEnclosed{OpeningTag: openingTag, Value: value, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetDeviceObjectPropertyReferenceEnclosed{OpeningTag: openingTag, Value: value, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetDeviceObjectPropertyReferenceEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetDeviceObjectPropertyReferenceEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetDeviceObjectPropertyReferenceEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetDeviceObjectPropertyReferenceEnclosedBuilder
 	// Build builds the BACnetDeviceObjectPropertyReferenceEnclosed or returns an error if something is wrong
 	Build() (BACnetDeviceObjectPropertyReferenceEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetDeviceObjectPropertyReferenceEnclosedBuilder) WithClosingTagBuil
 	return b
 }
 
-func (b *_BACnetDeviceObjectPropertyReferenceEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetDeviceObjectPropertyReferenceEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetDeviceObjectPropertyReferenceEnclosedBuilder) Build() (BACnetDeviceObjectPropertyReferenceEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetDeviceObjectPropertyReferenceEnclosedParseWithBufferProducer(tagNumbe
 }
 
 func BACnetDeviceObjectPropertyReferenceEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetDeviceObjectPropertyReferenceEnclosed, error) {
-	v, err := (&_BACnetDeviceObjectPropertyReferenceEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetDeviceObjectPropertyReferenceEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetDeviceObjectPropertyReferenceEnclosed) SerializeWithWriteBuffer(
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetDeviceObjectPropertyReferenceEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetDeviceObjectPropertyReferenceEnclosed) IsBACnetDeviceObjectPropertyReferenceEnclosed() {
 }
 
@@ -388,7 +368,6 @@ func (m *_BACnetDeviceObjectPropertyReferenceEnclosed) deepCopy() *_BACnetDevice
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetDeviceObjectPropertyReference](m.Value),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetDeviceObjectPropertyReferenceEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReference.go
index 39011d86eae..1d8879bdab1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReference.go
@@ -238,7 +238,7 @@ func BACnetDeviceObjectReferenceParseWithBufferProducer() func(ctx context.Conte
 }
 
 func BACnetDeviceObjectReferenceParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetDeviceObjectReference, error) {
-	v, err := (&_BACnetDeviceObjectReference{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetDeviceObjectReference)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReferenceEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReferenceEnclosed.go
index d0ddc92f8c2..86ec5824af5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReferenceEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReferenceEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetDeviceObjectReferenceEnclosed struct {
 	OpeningTag      BACnetOpeningTag
 	ObjectReference BACnetDeviceObjectReference
 	ClosingTag      BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetDeviceObjectReferenceEnclosed = (*_BACnetDeviceObjectReferenceEnclosed)(nil)
 
 // NewBACnetDeviceObjectReferenceEnclosed factory function for _BACnetDeviceObjectReferenceEnclosed
-func NewBACnetDeviceObjectReferenceEnclosed(openingTag BACnetOpeningTag, objectReference BACnetDeviceObjectReference, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetDeviceObjectReferenceEnclosed {
+func NewBACnetDeviceObjectReferenceEnclosed(openingTag BACnetOpeningTag, objectReference BACnetDeviceObjectReference, closingTag BACnetClosingTag) *_BACnetDeviceObjectReferenceEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetDeviceObjectReferenceEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetDeviceObjectReferenceEnclosed(openingTag BACnetOpeningTag, objectR
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetDeviceObjectReferenceEnclosed must not be nil")
 	}
-	return &_BACnetDeviceObjectReferenceEnclosed{OpeningTag: openingTag, ObjectReference: objectReference, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetDeviceObjectReferenceEnclosed{OpeningTag: openingTag, ObjectReference: objectReference, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetDeviceObjectReferenceEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetDeviceObjectReferenceEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetDeviceObjectReferenceEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetDeviceObjectReferenceEnclosedBuilder
 	// Build builds the BACnetDeviceObjectReferenceEnclosed or returns an error if something is wrong
 	Build() (BACnetDeviceObjectReferenceEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetDeviceObjectReferenceEnclosedBuilder) WithClosingTagBuilder(buil
 	return b
 }
 
-func (b *_BACnetDeviceObjectReferenceEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetDeviceObjectReferenceEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetDeviceObjectReferenceEnclosedBuilder) Build() (BACnetDeviceObjectReferenceEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetDeviceObjectReferenceEnclosedParseWithBufferProducer(tagNumber uint8)
 }
 
 func BACnetDeviceObjectReferenceEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetDeviceObjectReferenceEnclosed, error) {
-	v, err := (&_BACnetDeviceObjectReferenceEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetDeviceObjectReferenceEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetDeviceObjectReferenceEnclosed) SerializeWithWriteBuffer(ctx cont
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetDeviceObjectReferenceEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetDeviceObjectReferenceEnclosed) IsBACnetDeviceObjectReferenceEnclosed() {}
 
 func (m *_BACnetDeviceObjectReferenceEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetDeviceObjectReferenceEnclosed) deepCopy() *_BACnetDeviceObjectRe
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetDeviceObjectReference](m.ObjectReference),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetDeviceObjectReferenceEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatusTagged.go
index 1fc4388fd02..c56a3e6fd59 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatusTagged.go
@@ -59,20 +59,16 @@ type _BACnetDeviceStatusTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetDeviceStatus
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetDeviceStatusTagged = (*_BACnetDeviceStatusTagged)(nil)
 
 // NewBACnetDeviceStatusTagged factory function for _BACnetDeviceStatusTagged
-func NewBACnetDeviceStatusTagged(header BACnetTagHeader, value BACnetDeviceStatus, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetDeviceStatusTagged {
+func NewBACnetDeviceStatusTagged(header BACnetTagHeader, value BACnetDeviceStatus, proprietaryValue uint32) *_BACnetDeviceStatusTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetDeviceStatusTagged must not be nil")
 	}
-	return &_BACnetDeviceStatusTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetDeviceStatusTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetDeviceStatusTaggedBuilder interface {
 	WithValue(BACnetDeviceStatus) BACnetDeviceStatusTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetDeviceStatusTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetDeviceStatusTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetDeviceStatusTaggedBuilder
 	// Build builds the BACnetDeviceStatusTagged or returns an error if something is wrong
 	Build() (BACnetDeviceStatusTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetDeviceStatusTaggedBuilder) WithProprietaryValue(proprietaryValue
 	return b
 }
 
-func (b *_BACnetDeviceStatusTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetDeviceStatusTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetDeviceStatusTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetDeviceStatusTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetDeviceStatusTaggedBuilder) Build() (BACnetDeviceStatusTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetDeviceStatusTaggedParseWithBufferProducer(tagNumber uint8, tagClass T
 }
 
 func BACnetDeviceStatusTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetDeviceStatusTagged, error) {
-	v, err := (&_BACnetDeviceStatusTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetDeviceStatusTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetDeviceStatusTagged) SerializeWithWriteBuffer(ctx context.Context
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetDeviceStatusTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetDeviceStatusTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetDeviceStatusTagged) IsBACnetDeviceStatusTagged() {}
 
 func (m *_BACnetDeviceStatusTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetDeviceStatusTagged) deepCopy() *_BACnetDeviceStatusTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetDeviceStatusTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmStateTagged.go
index 0ca3e37fe27..db4116cafcf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmStateTagged.go
@@ -59,20 +59,16 @@ type _BACnetDoorAlarmStateTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetDoorAlarmState
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetDoorAlarmStateTagged = (*_BACnetDoorAlarmStateTagged)(nil)
 
 // NewBACnetDoorAlarmStateTagged factory function for _BACnetDoorAlarmStateTagged
-func NewBACnetDoorAlarmStateTagged(header BACnetTagHeader, value BACnetDoorAlarmState, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetDoorAlarmStateTagged {
+func NewBACnetDoorAlarmStateTagged(header BACnetTagHeader, value BACnetDoorAlarmState, proprietaryValue uint32) *_BACnetDoorAlarmStateTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetDoorAlarmStateTagged must not be nil")
 	}
-	return &_BACnetDoorAlarmStateTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetDoorAlarmStateTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetDoorAlarmStateTaggedBuilder interface {
 	WithValue(BACnetDoorAlarmState) BACnetDoorAlarmStateTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetDoorAlarmStateTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetDoorAlarmStateTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetDoorAlarmStateTaggedBuilder
 	// Build builds the BACnetDoorAlarmStateTagged or returns an error if something is wrong
 	Build() (BACnetDoorAlarmStateTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetDoorAlarmStateTaggedBuilder) WithProprietaryValue(proprietaryVal
 	return b
 }
 
-func (b *_BACnetDoorAlarmStateTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetDoorAlarmStateTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetDoorAlarmStateTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetDoorAlarmStateTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetDoorAlarmStateTaggedBuilder) Build() (BACnetDoorAlarmStateTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetDoorAlarmStateTaggedParseWithBufferProducer(tagNumber uint8, tagClass
 }
 
 func BACnetDoorAlarmStateTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetDoorAlarmStateTagged, error) {
-	v, err := (&_BACnetDoorAlarmStateTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetDoorAlarmStateTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetDoorAlarmStateTagged) SerializeWithWriteBuffer(ctx context.Conte
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetDoorAlarmStateTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetDoorAlarmStateTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetDoorAlarmStateTagged) IsBACnetDoorAlarmStateTagged() {}
 
 func (m *_BACnetDoorAlarmStateTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetDoorAlarmStateTagged) deepCopy() *_BACnetDoorAlarmStateTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetDoorAlarmStateTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatusTagged.go
index d44dde1e000..a590b2a6739 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatusTagged.go
@@ -54,20 +54,16 @@ type BACnetDoorSecuredStatusTagged interface {
 type _BACnetDoorSecuredStatusTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetDoorSecuredStatus
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetDoorSecuredStatusTagged = (*_BACnetDoorSecuredStatusTagged)(nil)
 
 // NewBACnetDoorSecuredStatusTagged factory function for _BACnetDoorSecuredStatusTagged
-func NewBACnetDoorSecuredStatusTagged(header BACnetTagHeader, value BACnetDoorSecuredStatus, tagNumber uint8, tagClass TagClass) *_BACnetDoorSecuredStatusTagged {
+func NewBACnetDoorSecuredStatusTagged(header BACnetTagHeader, value BACnetDoorSecuredStatus) *_BACnetDoorSecuredStatusTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetDoorSecuredStatusTagged must not be nil")
 	}
-	return &_BACnetDoorSecuredStatusTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetDoorSecuredStatusTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetDoorSecuredStatusTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetDoorSecuredStatusTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetDoorSecuredStatus) BACnetDoorSecuredStatusTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetDoorSecuredStatusTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetDoorSecuredStatusTaggedBuilder
 	// Build builds the BACnetDoorSecuredStatusTagged or returns an error if something is wrong
 	Build() (BACnetDoorSecuredStatusTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetDoorSecuredStatusTaggedBuilder) WithValue(value BACnetDoorSecure
 	return b
 }
 
-func (b *_BACnetDoorSecuredStatusTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetDoorSecuredStatusTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetDoorSecuredStatusTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetDoorSecuredStatusTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetDoorSecuredStatusTaggedBuilder) Build() (BACnetDoorSecuredStatusTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetDoorSecuredStatusTaggedParseWithBufferProducer(tagNumber uint8, tagCl
 }
 
 func BACnetDoorSecuredStatusTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetDoorSecuredStatusTagged, error) {
-	v, err := (&_BACnetDoorSecuredStatusTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetDoorSecuredStatusTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetDoorSecuredStatusTagged) SerializeWithWriteBuffer(ctx context.Co
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetDoorSecuredStatusTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetDoorSecuredStatusTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetDoorSecuredStatusTagged) IsBACnetDoorSecuredStatusTagged() {}
 
 func (m *_BACnetDoorSecuredStatusTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetDoorSecuredStatusTagged) deepCopy() *_BACnetDoorSecuredStatusTag
 	_BACnetDoorSecuredStatusTaggedCopy := &_BACnetDoorSecuredStatusTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetDoorSecuredStatusTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatusTagged.go
index 29022355f11..8bfd76c518c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatusTagged.go
@@ -59,20 +59,16 @@ type _BACnetDoorStatusTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetDoorStatus
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetDoorStatusTagged = (*_BACnetDoorStatusTagged)(nil)
 
 // NewBACnetDoorStatusTagged factory function for _BACnetDoorStatusTagged
-func NewBACnetDoorStatusTagged(header BACnetTagHeader, value BACnetDoorStatus, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetDoorStatusTagged {
+func NewBACnetDoorStatusTagged(header BACnetTagHeader, value BACnetDoorStatus, proprietaryValue uint32) *_BACnetDoorStatusTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetDoorStatusTagged must not be nil")
 	}
-	return &_BACnetDoorStatusTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetDoorStatusTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetDoorStatusTaggedBuilder interface {
 	WithValue(BACnetDoorStatus) BACnetDoorStatusTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetDoorStatusTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetDoorStatusTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetDoorStatusTaggedBuilder
 	// Build builds the BACnetDoorStatusTagged or returns an error if something is wrong
 	Build() (BACnetDoorStatusTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetDoorStatusTaggedBuilder) WithProprietaryValue(proprietaryValue u
 	return b
 }
 
-func (b *_BACnetDoorStatusTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetDoorStatusTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetDoorStatusTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetDoorStatusTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetDoorStatusTaggedBuilder) Build() (BACnetDoorStatusTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetDoorStatusTaggedParseWithBufferProducer(tagNumber uint8, tagClass Tag
 }
 
 func BACnetDoorStatusTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetDoorStatusTagged, error) {
-	v, err := (&_BACnetDoorStatusTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetDoorStatusTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetDoorStatusTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetDoorStatusTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetDoorStatusTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetDoorStatusTagged) IsBACnetDoorStatusTagged() {}
 
 func (m *_BACnetDoorStatusTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetDoorStatusTagged) deepCopy() *_BACnetDoorStatusTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetDoorStatusTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValueTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValueTagged.go
index 812facbbfec..da742840f8d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValueTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValueTagged.go
@@ -54,20 +54,16 @@ type BACnetDoorValueTagged interface {
 type _BACnetDoorValueTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetDoorValue
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetDoorValueTagged = (*_BACnetDoorValueTagged)(nil)
 
 // NewBACnetDoorValueTagged factory function for _BACnetDoorValueTagged
-func NewBACnetDoorValueTagged(header BACnetTagHeader, value BACnetDoorValue, tagNumber uint8, tagClass TagClass) *_BACnetDoorValueTagged {
+func NewBACnetDoorValueTagged(header BACnetTagHeader, value BACnetDoorValue) *_BACnetDoorValueTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetDoorValueTagged must not be nil")
 	}
-	return &_BACnetDoorValueTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetDoorValueTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetDoorValueTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetDoorValueTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetDoorValue) BACnetDoorValueTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetDoorValueTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetDoorValueTaggedBuilder
 	// Build builds the BACnetDoorValueTagged or returns an error if something is wrong
 	Build() (BACnetDoorValueTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetDoorValueTaggedBuilder) WithValue(value BACnetDoorValue) BACnetD
 	return b
 }
 
-func (b *_BACnetDoorValueTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetDoorValueTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetDoorValueTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetDoorValueTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetDoorValueTaggedBuilder) Build() (BACnetDoorValueTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetDoorValueTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagC
 }
 
 func BACnetDoorValueTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetDoorValueTagged, error) {
-	v, err := (&_BACnetDoorValueTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetDoorValueTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetDoorValueTagged) SerializeWithWriteBuffer(ctx context.Context, w
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetDoorValueTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetDoorValueTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetDoorValueTagged) IsBACnetDoorValueTagged() {}
 
 func (m *_BACnetDoorValueTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetDoorValueTagged) deepCopy() *_BACnetDoorValueTagged {
 	_BACnetDoorValueTaggedCopy := &_BACnetDoorValueTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetDoorValueTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnitsTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnitsTagged.go
index 317fa3dc104..2da9635343a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnitsTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnitsTagged.go
@@ -59,20 +59,16 @@ type _BACnetEngineeringUnitsTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetEngineeringUnits
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetEngineeringUnitsTagged = (*_BACnetEngineeringUnitsTagged)(nil)
 
 // NewBACnetEngineeringUnitsTagged factory function for _BACnetEngineeringUnitsTagged
-func NewBACnetEngineeringUnitsTagged(header BACnetTagHeader, value BACnetEngineeringUnits, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetEngineeringUnitsTagged {
+func NewBACnetEngineeringUnitsTagged(header BACnetTagHeader, value BACnetEngineeringUnits, proprietaryValue uint32) *_BACnetEngineeringUnitsTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetEngineeringUnitsTagged must not be nil")
 	}
-	return &_BACnetEngineeringUnitsTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetEngineeringUnitsTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetEngineeringUnitsTaggedBuilder interface {
 	WithValue(BACnetEngineeringUnits) BACnetEngineeringUnitsTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetEngineeringUnitsTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEngineeringUnitsTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetEngineeringUnitsTaggedBuilder
 	// Build builds the BACnetEngineeringUnitsTagged or returns an error if something is wrong
 	Build() (BACnetEngineeringUnitsTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetEngineeringUnitsTaggedBuilder) WithProprietaryValue(proprietaryV
 	return b
 }
 
-func (b *_BACnetEngineeringUnitsTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetEngineeringUnitsTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetEngineeringUnitsTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetEngineeringUnitsTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetEngineeringUnitsTaggedBuilder) Build() (BACnetEngineeringUnitsTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetEngineeringUnitsTaggedParseWithBufferProducer(tagNumber uint8, tagCla
 }
 
 func BACnetEngineeringUnitsTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetEngineeringUnitsTagged, error) {
-	v, err := (&_BACnetEngineeringUnitsTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetEngineeringUnitsTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetEngineeringUnitsTagged) SerializeWithWriteBuffer(ctx context.Con
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEngineeringUnitsTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetEngineeringUnitsTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetEngineeringUnitsTagged) IsBACnetEngineeringUnitsTagged() {}
 
 func (m *_BACnetEngineeringUnitsTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetEngineeringUnitsTagged) deepCopy() *_BACnetEngineeringUnitsTagge
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetEngineeringUnitsTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetError.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetError.go
index 7ba7d0ee168..1a3c7c549c8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetError.go
@@ -321,7 +321,7 @@ func BACnetErrorParseWithBufferProducer[T BACnetError](errorChoice BACnetConfirm
 }
 
 func BACnetErrorParseWithBuffer[T BACnetError](ctx context.Context, readBuffer utils.ReadBuffer, errorChoice BACnetConfirmedServiceChoice) (T, error) {
-	v, err := (&_BACnetError{}).parse(ctx, readBuffer, errorChoice)
+	v, err := (new(_BACnetError)).parse(ctx, readBuffer, errorChoice)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFaultTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFaultTagged.go
index 4736ad84f79..6bfc3cadfbe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFaultTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFaultTagged.go
@@ -59,20 +59,16 @@ type _BACnetEscalatorFaultTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetEscalatorFault
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetEscalatorFaultTagged = (*_BACnetEscalatorFaultTagged)(nil)
 
 // NewBACnetEscalatorFaultTagged factory function for _BACnetEscalatorFaultTagged
-func NewBACnetEscalatorFaultTagged(header BACnetTagHeader, value BACnetEscalatorFault, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetEscalatorFaultTagged {
+func NewBACnetEscalatorFaultTagged(header BACnetTagHeader, value BACnetEscalatorFault, proprietaryValue uint32) *_BACnetEscalatorFaultTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetEscalatorFaultTagged must not be nil")
 	}
-	return &_BACnetEscalatorFaultTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetEscalatorFaultTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetEscalatorFaultTaggedBuilder interface {
 	WithValue(BACnetEscalatorFault) BACnetEscalatorFaultTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetEscalatorFaultTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEscalatorFaultTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetEscalatorFaultTaggedBuilder
 	// Build builds the BACnetEscalatorFaultTagged or returns an error if something is wrong
 	Build() (BACnetEscalatorFaultTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetEscalatorFaultTaggedBuilder) WithProprietaryValue(proprietaryVal
 	return b
 }
 
-func (b *_BACnetEscalatorFaultTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetEscalatorFaultTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetEscalatorFaultTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetEscalatorFaultTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetEscalatorFaultTaggedBuilder) Build() (BACnetEscalatorFaultTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetEscalatorFaultTaggedParseWithBufferProducer(tagNumber uint8, tagClass
 }
 
 func BACnetEscalatorFaultTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetEscalatorFaultTagged, error) {
-	v, err := (&_BACnetEscalatorFaultTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetEscalatorFaultTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetEscalatorFaultTagged) SerializeWithWriteBuffer(ctx context.Conte
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEscalatorFaultTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetEscalatorFaultTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetEscalatorFaultTagged) IsBACnetEscalatorFaultTagged() {}
 
 func (m *_BACnetEscalatorFaultTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetEscalatorFaultTagged) deepCopy() *_BACnetEscalatorFaultTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetEscalatorFaultTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorModeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorModeTagged.go
index 51d633654d0..811bfda5a01 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorModeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorModeTagged.go
@@ -59,20 +59,16 @@ type _BACnetEscalatorModeTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetEscalatorMode
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetEscalatorModeTagged = (*_BACnetEscalatorModeTagged)(nil)
 
 // NewBACnetEscalatorModeTagged factory function for _BACnetEscalatorModeTagged
-func NewBACnetEscalatorModeTagged(header BACnetTagHeader, value BACnetEscalatorMode, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetEscalatorModeTagged {
+func NewBACnetEscalatorModeTagged(header BACnetTagHeader, value BACnetEscalatorMode, proprietaryValue uint32) *_BACnetEscalatorModeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetEscalatorModeTagged must not be nil")
 	}
-	return &_BACnetEscalatorModeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetEscalatorModeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetEscalatorModeTaggedBuilder interface {
 	WithValue(BACnetEscalatorMode) BACnetEscalatorModeTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetEscalatorModeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEscalatorModeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetEscalatorModeTaggedBuilder
 	// Build builds the BACnetEscalatorModeTagged or returns an error if something is wrong
 	Build() (BACnetEscalatorModeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetEscalatorModeTaggedBuilder) WithProprietaryValue(proprietaryValu
 	return b
 }
 
-func (b *_BACnetEscalatorModeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetEscalatorModeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetEscalatorModeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetEscalatorModeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetEscalatorModeTaggedBuilder) Build() (BACnetEscalatorModeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetEscalatorModeTaggedParseWithBufferProducer(tagNumber uint8, tagClass
 }
 
 func BACnetEscalatorModeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetEscalatorModeTagged, error) {
-	v, err := (&_BACnetEscalatorModeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetEscalatorModeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetEscalatorModeTagged) SerializeWithWriteBuffer(ctx context.Contex
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEscalatorModeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetEscalatorModeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetEscalatorModeTagged) IsBACnetEscalatorModeTagged() {}
 
 func (m *_BACnetEscalatorModeTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetEscalatorModeTagged) deepCopy() *_BACnetEscalatorModeTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetEscalatorModeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirectionTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirectionTagged.go
index 4a1bc6c5f96..bd0f2ac7474 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirectionTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirectionTagged.go
@@ -59,20 +59,16 @@ type _BACnetEscalatorOperationDirectionTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetEscalatorOperationDirection
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetEscalatorOperationDirectionTagged = (*_BACnetEscalatorOperationDirectionTagged)(nil)
 
 // NewBACnetEscalatorOperationDirectionTagged factory function for _BACnetEscalatorOperationDirectionTagged
-func NewBACnetEscalatorOperationDirectionTagged(header BACnetTagHeader, value BACnetEscalatorOperationDirection, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetEscalatorOperationDirectionTagged {
+func NewBACnetEscalatorOperationDirectionTagged(header BACnetTagHeader, value BACnetEscalatorOperationDirection, proprietaryValue uint32) *_BACnetEscalatorOperationDirectionTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetEscalatorOperationDirectionTagged must not be nil")
 	}
-	return &_BACnetEscalatorOperationDirectionTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetEscalatorOperationDirectionTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetEscalatorOperationDirectionTaggedBuilder interface {
 	WithValue(BACnetEscalatorOperationDirection) BACnetEscalatorOperationDirectionTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetEscalatorOperationDirectionTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEscalatorOperationDirectionTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetEscalatorOperationDirectionTaggedBuilder
 	// Build builds the BACnetEscalatorOperationDirectionTagged or returns an error if something is wrong
 	Build() (BACnetEscalatorOperationDirectionTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetEscalatorOperationDirectionTaggedBuilder) WithProprietaryValue(p
 	return b
 }
 
-func (b *_BACnetEscalatorOperationDirectionTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetEscalatorOperationDirectionTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetEscalatorOperationDirectionTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetEscalatorOperationDirectionTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetEscalatorOperationDirectionTaggedBuilder) Build() (BACnetEscalatorOperationDirectionTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetEscalatorOperationDirectionTaggedParseWithBufferProducer(tagNumber ui
 }
 
 func BACnetEscalatorOperationDirectionTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetEscalatorOperationDirectionTagged, error) {
-	v, err := (&_BACnetEscalatorOperationDirectionTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetEscalatorOperationDirectionTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetEscalatorOperationDirectionTagged) SerializeWithWriteBuffer(ctx
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEscalatorOperationDirectionTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetEscalatorOperationDirectionTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetEscalatorOperationDirectionTagged) IsBACnetEscalatorOperationDirectionTagged() {}
 
 func (m *_BACnetEscalatorOperationDirectionTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetEscalatorOperationDirectionTagged) deepCopy() *_BACnetEscalatorO
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetEscalatorOperationDirectionTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecord.go
index 8c3b75e9d0d..bd7260857bc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecord.go
@@ -242,7 +242,7 @@ func BACnetEventLogRecordParseWithBufferProducer() func(ctx context.Context, rea
 }
 
 func BACnetEventLogRecordParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetEventLogRecord, error) {
-	v, err := (&_BACnetEventLogRecord{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetEventLogRecord)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatum.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatum.go
index 49cb7e75a04..dd33cff30eb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatum.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatum.go
@@ -58,8 +58,6 @@ type BACnetEventLogRecordLogDatumContract interface {
 	GetClosingTag() BACnetClosingTag
 	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
-	// GetTagNumber() returns a parser argument
-	GetTagNumber() uint8
 	// IsBACnetEventLogRecordLogDatum is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetEventLogRecordLogDatum()
 	// CreateBuilder creates a BACnetEventLogRecordLogDatumBuilder
@@ -83,15 +81,12 @@ type _BACnetEventLogRecordLogDatum struct {
 	OpeningTag      BACnetOpeningTag
 	PeekedTagHeader BACnetTagHeader
 	ClosingTag      BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetEventLogRecordLogDatumContract = (*_BACnetEventLogRecordLogDatum)(nil)
 
 // NewBACnetEventLogRecordLogDatum factory function for _BACnetEventLogRecordLogDatum
-func NewBACnetEventLogRecordLogDatum(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetEventLogRecordLogDatum {
+func NewBACnetEventLogRecordLogDatum(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetEventLogRecordLogDatum {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetEventLogRecordLogDatum must not be nil")
 	}
@@ -101,7 +96,7 @@ func NewBACnetEventLogRecordLogDatum(openingTag BACnetOpeningTag, peekedTagHeade
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetEventLogRecordLogDatum must not be nil")
 	}
-	return &_BACnetEventLogRecordLogDatum{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetEventLogRecordLogDatum{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -126,8 +121,6 @@ type BACnetEventLogRecordLogDatumBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetEventLogRecordLogDatumBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetEventLogRecordLogDatumBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventLogRecordLogDatumBuilder
 	// AsBACnetEventLogRecordLogDatumLogStatus converts this build to a subType of BACnetEventLogRecordLogDatum. It is always possible to return to current builder using Done()
 	AsBACnetEventLogRecordLogDatumLogStatus() BACnetEventLogRecordLogDatumLogStatusBuilder
 	// AsBACnetEventLogRecordLogDatumNotification converts this build to a subType of BACnetEventLogRecordLogDatum. It is always possible to return to current builder using Done()
@@ -214,11 +207,6 @@ func (b *_BACnetEventLogRecordLogDatumBuilder) WithClosingTagBuilder(builderSupp
 	return b
 }
 
-func (b *_BACnetEventLogRecordLogDatumBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventLogRecordLogDatumBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetEventLogRecordLogDatumBuilder) PartialBuild() (BACnetEventLogRecordLogDatumContract, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -407,7 +395,7 @@ func BACnetEventLogRecordLogDatumParseWithBufferProducer[T BACnetEventLogRecordL
 }
 
 func BACnetEventLogRecordLogDatumParseWithBuffer[T BACnetEventLogRecordLogDatum](ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (T, error) {
-	v, err := (&_BACnetEventLogRecordLogDatum{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetEventLogRecordLogDatum)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -516,16 +504,6 @@ func (pm *_BACnetEventLogRecordLogDatum) serializeParent(ctx context.Context, wr
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventLogRecordLogDatum) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetEventLogRecordLogDatum) IsBACnetEventLogRecordLogDatum() {}
 
 func (m *_BACnetEventLogRecordLogDatum) DeepCopy() any {
@@ -541,7 +519,6 @@ func (m *_BACnetEventLogRecordLogDatum) deepCopy() *_BACnetEventLogRecordLogDatu
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetTagHeader](m.PeekedTagHeader),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetEventLogRecordLogDatumCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumLogStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumLogStatus.go
index a526114acb8..c6785ba3d61 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumLogStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumLogStatus.go
@@ -59,12 +59,12 @@ var _ BACnetEventLogRecordLogDatumLogStatus = (*_BACnetEventLogRecordLogDatumLog
 var _ BACnetEventLogRecordLogDatumRequirements = (*_BACnetEventLogRecordLogDatumLogStatus)(nil)
 
 // NewBACnetEventLogRecordLogDatumLogStatus factory function for _BACnetEventLogRecordLogDatumLogStatus
-func NewBACnetEventLogRecordLogDatumLogStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, logStatus BACnetLogStatusTagged, tagNumber uint8) *_BACnetEventLogRecordLogDatumLogStatus {
+func NewBACnetEventLogRecordLogDatumLogStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, logStatus BACnetLogStatusTagged) *_BACnetEventLogRecordLogDatumLogStatus {
 	if logStatus == nil {
 		panic("logStatus of type BACnetLogStatusTagged for BACnetEventLogRecordLogDatumLogStatus must not be nil")
 	}
 	_result := &_BACnetEventLogRecordLogDatumLogStatus{
-		BACnetEventLogRecordLogDatumContract: NewBACnetEventLogRecordLogDatum(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetEventLogRecordLogDatumContract: NewBACnetEventLogRecordLogDatum(openingTag, peekedTagHeader, closingTag),
 		LogStatus:                            logStatus,
 	}
 	_result.BACnetEventLogRecordLogDatumContract.(*_BACnetEventLogRecordLogDatum)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumNotification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumNotification.go
index 9c172fea6a6..d27e95b6880 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumNotification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumNotification.go
@@ -65,7 +65,7 @@ var _ BACnetEventLogRecordLogDatumNotification = (*_BACnetEventLogRecordLogDatum
 var _ BACnetEventLogRecordLogDatumRequirements = (*_BACnetEventLogRecordLogDatumNotification)(nil)
 
 // NewBACnetEventLogRecordLogDatumNotification factory function for _BACnetEventLogRecordLogDatumNotification
-func NewBACnetEventLogRecordLogDatumNotification(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, notification ConfirmedEventNotificationRequest, innerClosingTag BACnetClosingTag, tagNumber uint8) *_BACnetEventLogRecordLogDatumNotification {
+func NewBACnetEventLogRecordLogDatumNotification(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, notification ConfirmedEventNotificationRequest, innerClosingTag BACnetClosingTag) *_BACnetEventLogRecordLogDatumNotification {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetEventLogRecordLogDatumNotification must not be nil")
 	}
@@ -76,7 +76,7 @@ func NewBACnetEventLogRecordLogDatumNotification(openingTag BACnetOpeningTag, pe
 		panic("innerClosingTag of type BACnetClosingTag for BACnetEventLogRecordLogDatumNotification must not be nil")
 	}
 	_result := &_BACnetEventLogRecordLogDatumNotification{
-		BACnetEventLogRecordLogDatumContract: NewBACnetEventLogRecordLogDatum(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetEventLogRecordLogDatumContract: NewBACnetEventLogRecordLogDatum(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		Notification:                         notification,
 		InnerClosingTag:                      innerClosingTag,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumTimeChange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumTimeChange.go
index 7920d9003e4..79dacbaa2e9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumTimeChange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumTimeChange.go
@@ -59,12 +59,12 @@ var _ BACnetEventLogRecordLogDatumTimeChange = (*_BACnetEventLogRecordLogDatumTi
 var _ BACnetEventLogRecordLogDatumRequirements = (*_BACnetEventLogRecordLogDatumTimeChange)(nil)
 
 // NewBACnetEventLogRecordLogDatumTimeChange factory function for _BACnetEventLogRecordLogDatumTimeChange
-func NewBACnetEventLogRecordLogDatumTimeChange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeChange BACnetContextTagReal, tagNumber uint8) *_BACnetEventLogRecordLogDatumTimeChange {
+func NewBACnetEventLogRecordLogDatumTimeChange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeChange BACnetContextTagReal) *_BACnetEventLogRecordLogDatumTimeChange {
 	if timeChange == nil {
 		panic("timeChange of type BACnetContextTagReal for BACnetEventLogRecordLogDatumTimeChange must not be nil")
 	}
 	_result := &_BACnetEventLogRecordLogDatumTimeChange{
-		BACnetEventLogRecordLogDatumContract: NewBACnetEventLogRecordLogDatum(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetEventLogRecordLogDatumContract: NewBACnetEventLogRecordLogDatum(openingTag, peekedTagHeader, closingTag),
 		TimeChange:                           timeChange,
 	}
 	_result.BACnetEventLogRecordLogDatumContract.(*_BACnetEventLogRecordLogDatum)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventNotificationSubscription.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventNotificationSubscription.go
index e8b8b2066db..9f08715aeb7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventNotificationSubscription.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventNotificationSubscription.go
@@ -308,7 +308,7 @@ func BACnetEventNotificationSubscriptionParseWithBufferProducer() func(ctx conte
 }
 
 func BACnetEventNotificationSubscriptionParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetEventNotificationSubscription, error) {
-	v, err := (&_BACnetEventNotificationSubscription{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetEventNotificationSubscription)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameter.go
index 7168fcdf5c9..4aa22faf508 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameter.go
@@ -517,7 +517,7 @@ func BACnetEventParameterParseWithBufferProducer[T BACnetEventParameter]() func(
 }
 
 func BACnetEventParameterParseWithBuffer[T BACnetEventParameter](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetEventParameter{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetEventParameter)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterAccessEventListOfAccessEvents.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterAccessEventListOfAccessEvents.go
index 76a5cc75c38..b58fe9e484b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterAccessEventListOfAccessEvents.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterAccessEventListOfAccessEvents.go
@@ -57,22 +57,19 @@ type _BACnetEventParameterAccessEventListOfAccessEvents struct {
 	OpeningTag         BACnetOpeningTag
 	ListOfAccessEvents []BACnetDeviceObjectPropertyReference
 	ClosingTag         BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetEventParameterAccessEventListOfAccessEvents = (*_BACnetEventParameterAccessEventListOfAccessEvents)(nil)
 
 // NewBACnetEventParameterAccessEventListOfAccessEvents factory function for _BACnetEventParameterAccessEventListOfAccessEvents
-func NewBACnetEventParameterAccessEventListOfAccessEvents(openingTag BACnetOpeningTag, listOfAccessEvents []BACnetDeviceObjectPropertyReference, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetEventParameterAccessEventListOfAccessEvents {
+func NewBACnetEventParameterAccessEventListOfAccessEvents(openingTag BACnetOpeningTag, listOfAccessEvents []BACnetDeviceObjectPropertyReference, closingTag BACnetClosingTag) *_BACnetEventParameterAccessEventListOfAccessEvents {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetEventParameterAccessEventListOfAccessEvents must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetEventParameterAccessEventListOfAccessEvents must not be nil")
 	}
-	return &_BACnetEventParameterAccessEventListOfAccessEvents{OpeningTag: openingTag, ListOfAccessEvents: listOfAccessEvents, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetEventParameterAccessEventListOfAccessEvents{OpeningTag: openingTag, ListOfAccessEvents: listOfAccessEvents, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetEventParameterAccessEventListOfAccessEventsBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetEventParameterAccessEventListOfAccessEventsBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetEventParameterAccessEventListOfAccessEventsBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventParameterAccessEventListOfAccessEventsBuilder
 	// Build builds the BACnetEventParameterAccessEventListOfAccessEvents or returns an error if something is wrong
 	Build() (BACnetEventParameterAccessEventListOfAccessEvents, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetEventParameterAccessEventListOfAccessEventsBuilder) WithClosingT
 	return b
 }
 
-func (b *_BACnetEventParameterAccessEventListOfAccessEventsBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventParameterAccessEventListOfAccessEventsBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetEventParameterAccessEventListOfAccessEventsBuilder) Build() (BACnetEventParameterAccessEventListOfAccessEvents, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetEventParameterAccessEventListOfAccessEventsParseWithBufferProducer(ta
 }
 
 func BACnetEventParameterAccessEventListOfAccessEventsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetEventParameterAccessEventListOfAccessEvents, error) {
-	v, err := (&_BACnetEventParameterAccessEventListOfAccessEvents{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetEventParameterAccessEventListOfAccessEvents)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetEventParameterAccessEventListOfAccessEvents) SerializeWithWriteB
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventParameterAccessEventListOfAccessEvents) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetEventParameterAccessEventListOfAccessEvents) IsBACnetEventParameterAccessEventListOfAccessEvents() {
 }
 
@@ -374,7 +354,6 @@ func (m *_BACnetEventParameterAccessEventListOfAccessEvents) deepCopy() *_BACnet
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetDeviceObjectPropertyReference, BACnetDeviceObjectPropertyReference](m.ListOfAccessEvents),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetEventParameterAccessEventListOfAccessEventsCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfBitstringListOfBitstringValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfBitstringListOfBitstringValues.go
index 1c99c793315..80cfb03f230 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfBitstringListOfBitstringValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfBitstringListOfBitstringValues.go
@@ -57,22 +57,19 @@ type _BACnetEventParameterChangeOfBitstringListOfBitstringValues struct {
 	OpeningTag            BACnetOpeningTag
 	ListOfBitstringValues []BACnetApplicationTagBitString
 	ClosingTag            BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetEventParameterChangeOfBitstringListOfBitstringValues = (*_BACnetEventParameterChangeOfBitstringListOfBitstringValues)(nil)
 
 // NewBACnetEventParameterChangeOfBitstringListOfBitstringValues factory function for _BACnetEventParameterChangeOfBitstringListOfBitstringValues
-func NewBACnetEventParameterChangeOfBitstringListOfBitstringValues(openingTag BACnetOpeningTag, listOfBitstringValues []BACnetApplicationTagBitString, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetEventParameterChangeOfBitstringListOfBitstringValues {
+func NewBACnetEventParameterChangeOfBitstringListOfBitstringValues(openingTag BACnetOpeningTag, listOfBitstringValues []BACnetApplicationTagBitString, closingTag BACnetClosingTag) *_BACnetEventParameterChangeOfBitstringListOfBitstringValues {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetEventParameterChangeOfBitstringListOfBitstringValues must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetEventParameterChangeOfBitstringListOfBitstringValues must not be nil")
 	}
-	return &_BACnetEventParameterChangeOfBitstringListOfBitstringValues{OpeningTag: openingTag, ListOfBitstringValues: listOfBitstringValues, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetEventParameterChangeOfBitstringListOfBitstringValues{OpeningTag: openingTag, ListOfBitstringValues: listOfBitstringValues, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetEventParameterChangeOfBitstringListOfBitstringValuesBuilder interface
 	WithClosingTag(BACnetClosingTag) BACnetEventParameterChangeOfBitstringListOfBitstringValuesBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetEventParameterChangeOfBitstringListOfBitstringValuesBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventParameterChangeOfBitstringListOfBitstringValuesBuilder
 	// Build builds the BACnetEventParameterChangeOfBitstringListOfBitstringValues or returns an error if something is wrong
 	Build() (BACnetEventParameterChangeOfBitstringListOfBitstringValues, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetEventParameterChangeOfBitstringListOfBitstringValuesBuilder) Wit
 	return b
 }
 
-func (b *_BACnetEventParameterChangeOfBitstringListOfBitstringValuesBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventParameterChangeOfBitstringListOfBitstringValuesBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetEventParameterChangeOfBitstringListOfBitstringValuesBuilder) Build() (BACnetEventParameterChangeOfBitstringListOfBitstringValues, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetEventParameterChangeOfBitstringListOfBitstringValuesParseWithBufferPr
 }
 
 func BACnetEventParameterChangeOfBitstringListOfBitstringValuesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetEventParameterChangeOfBitstringListOfBitstringValues, error) {
-	v, err := (&_BACnetEventParameterChangeOfBitstringListOfBitstringValues{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetEventParameterChangeOfBitstringListOfBitstringValues)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetEventParameterChangeOfBitstringListOfBitstringValues) SerializeW
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventParameterChangeOfBitstringListOfBitstringValues) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetEventParameterChangeOfBitstringListOfBitstringValues) IsBACnetEventParameterChangeOfBitstringListOfBitstringValues() {
 }
 
@@ -374,7 +354,6 @@ func (m *_BACnetEventParameterChangeOfBitstringListOfBitstringValues) deepCopy()
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetApplicationTagBitString, BACnetApplicationTagBitString](m.ListOfBitstringValues),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetEventParameterChangeOfBitstringListOfBitstringValuesCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfCharacterStringListOfAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfCharacterStringListOfAlarmValues.go
index 1c1500e5019..8f6503f3cd8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfCharacterStringListOfAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfCharacterStringListOfAlarmValues.go
@@ -57,22 +57,19 @@ type _BACnetEventParameterChangeOfCharacterStringListOfAlarmValues struct {
 	OpeningTag        BACnetOpeningTag
 	ListOfAlarmValues []BACnetApplicationTagCharacterString
 	ClosingTag        BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetEventParameterChangeOfCharacterStringListOfAlarmValues = (*_BACnetEventParameterChangeOfCharacterStringListOfAlarmValues)(nil)
 
 // NewBACnetEventParameterChangeOfCharacterStringListOfAlarmValues factory function for _BACnetEventParameterChangeOfCharacterStringListOfAlarmValues
-func NewBACnetEventParameterChangeOfCharacterStringListOfAlarmValues(openingTag BACnetOpeningTag, listOfAlarmValues []BACnetApplicationTagCharacterString, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetEventParameterChangeOfCharacterStringListOfAlarmValues {
+func NewBACnetEventParameterChangeOfCharacterStringListOfAlarmValues(openingTag BACnetOpeningTag, listOfAlarmValues []BACnetApplicationTagCharacterString, closingTag BACnetClosingTag) *_BACnetEventParameterChangeOfCharacterStringListOfAlarmValues {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetEventParameterChangeOfCharacterStringListOfAlarmValues must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetEventParameterChangeOfCharacterStringListOfAlarmValues must not be nil")
 	}
-	return &_BACnetEventParameterChangeOfCharacterStringListOfAlarmValues{OpeningTag: openingTag, ListOfAlarmValues: listOfAlarmValues, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetEventParameterChangeOfCharacterStringListOfAlarmValues{OpeningTag: openingTag, ListOfAlarmValues: listOfAlarmValues, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetEventParameterChangeOfCharacterStringListOfAlarmValuesBuilder interfa
 	WithClosingTag(BACnetClosingTag) BACnetEventParameterChangeOfCharacterStringListOfAlarmValuesBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetEventParameterChangeOfCharacterStringListOfAlarmValuesBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventParameterChangeOfCharacterStringListOfAlarmValuesBuilder
 	// Build builds the BACnetEventParameterChangeOfCharacterStringListOfAlarmValues or returns an error if something is wrong
 	Build() (BACnetEventParameterChangeOfCharacterStringListOfAlarmValues, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetEventParameterChangeOfCharacterStringListOfAlarmValuesBuilder) W
 	return b
 }
 
-func (b *_BACnetEventParameterChangeOfCharacterStringListOfAlarmValuesBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventParameterChangeOfCharacterStringListOfAlarmValuesBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetEventParameterChangeOfCharacterStringListOfAlarmValuesBuilder) Build() (BACnetEventParameterChangeOfCharacterStringListOfAlarmValues, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetEventParameterChangeOfCharacterStringListOfAlarmValuesParseWithBuffer
 }
 
 func BACnetEventParameterChangeOfCharacterStringListOfAlarmValuesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetEventParameterChangeOfCharacterStringListOfAlarmValues, error) {
-	v, err := (&_BACnetEventParameterChangeOfCharacterStringListOfAlarmValues{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetEventParameterChangeOfCharacterStringListOfAlarmValues)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetEventParameterChangeOfCharacterStringListOfAlarmValues) Serializ
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventParameterChangeOfCharacterStringListOfAlarmValues) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetEventParameterChangeOfCharacterStringListOfAlarmValues) IsBACnetEventParameterChangeOfCharacterStringListOfAlarmValues() {
 }
 
@@ -374,7 +354,6 @@ func (m *_BACnetEventParameterChangeOfCharacterStringListOfAlarmValues) deepCopy
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetApplicationTagCharacterString, BACnetApplicationTagCharacterString](m.ListOfAlarmValues),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetEventParameterChangeOfCharacterStringListOfAlarmValuesCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues.go
index 974a8fcd660..cf552b1845a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues.go
@@ -57,22 +57,19 @@ type _BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues struct {
 	OpeningTag        BACnetOpeningTag
 	ListOfAlarmValues []BACnetLifeSafetyStateTagged
 	ClosingTag        BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues = (*_BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues)(nil)
 
 // NewBACnetEventParameterChangeOfLifeSavetyListOfAlarmValues factory function for _BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues
-func NewBACnetEventParameterChangeOfLifeSavetyListOfAlarmValues(openingTag BACnetOpeningTag, listOfAlarmValues []BACnetLifeSafetyStateTagged, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues {
+func NewBACnetEventParameterChangeOfLifeSavetyListOfAlarmValues(openingTag BACnetOpeningTag, listOfAlarmValues []BACnetLifeSafetyStateTagged, closingTag BACnetClosingTag) *_BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues must not be nil")
 	}
-	return &_BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues{OpeningTag: openingTag, ListOfAlarmValues: listOfAlarmValues, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues{OpeningTag: openingTag, ListOfAlarmValues: listOfAlarmValues, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetEventParameterChangeOfLifeSavetyListOfAlarmValuesBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetEventParameterChangeOfLifeSavetyListOfAlarmValuesBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetEventParameterChangeOfLifeSavetyListOfAlarmValuesBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventParameterChangeOfLifeSavetyListOfAlarmValuesBuilder
 	// Build builds the BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues or returns an error if something is wrong
 	Build() (BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetEventParameterChangeOfLifeSavetyListOfAlarmValuesBuilder) WithCl
 	return b
 }
 
-func (b *_BACnetEventParameterChangeOfLifeSavetyListOfAlarmValuesBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventParameterChangeOfLifeSavetyListOfAlarmValuesBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetEventParameterChangeOfLifeSavetyListOfAlarmValuesBuilder) Build() (BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetEventParameterChangeOfLifeSavetyListOfAlarmValuesParseWithBufferProdu
 }
 
 func BACnetEventParameterChangeOfLifeSavetyListOfAlarmValuesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues, error) {
-	v, err := (&_BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues) SerializeWith
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues) IsBACnetEventParameterChangeOfLifeSavetyListOfAlarmValues() {
 }
 
@@ -374,7 +354,6 @@ func (m *_BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues) deepCopy() *_
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetLifeSafetyStateTagged, BACnetLifeSafetyStateTagged](m.ListOfAlarmValues),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetEventParameterChangeOfLifeSavetyListOfAlarmValuesCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues.go
index e49d211ba84..011ad767ca0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues.go
@@ -57,22 +57,19 @@ type _BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues struct {
 	OpeningTag                  BACnetOpeningTag
 	ListOfLifeSavetyAlarmValues []BACnetLifeSafetyStateTagged
 	ClosingTag                  BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues = (*_BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues)(nil)
 
 // NewBACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues factory function for _BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues
-func NewBACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues(openingTag BACnetOpeningTag, listOfLifeSavetyAlarmValues []BACnetLifeSafetyStateTagged, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues {
+func NewBACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues(openingTag BACnetOpeningTag, listOfLifeSavetyAlarmValues []BACnetLifeSafetyStateTagged, closingTag BACnetClosingTag) *_BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues must not be nil")
 	}
-	return &_BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues{OpeningTag: openingTag, ListOfLifeSavetyAlarmValues: listOfLifeSavetyAlarmValues, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues{OpeningTag: openingTag, ListOfLifeSavetyAlarmValues: listOfLifeSavetyAlarmValues, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValuesBuilder in
 	WithClosingTag(BACnetClosingTag) BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValuesBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValuesBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValuesBuilder
 	// Build builds the BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues or returns an error if something is wrong
 	Build() (BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValuesBuild
 	return b
 }
 
-func (b *_BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValuesBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValuesBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValuesBuilder) Build() (BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValuesParseWithB
 }
 
 func BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValuesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues, error) {
-	v, err := (&_BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues) Ser
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues) IsBACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues() {
 }
 
@@ -374,7 +354,6 @@ func (m *_BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues) dee
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetLifeSafetyStateTagged, BACnetLifeSafetyStateTagged](m.ListOfLifeSavetyAlarmValues),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValuesCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfStateListOfValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfStateListOfValues.go
index c6f8df8f7aa..f633d01b1f4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfStateListOfValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfStateListOfValues.go
@@ -57,22 +57,19 @@ type _BACnetEventParameterChangeOfStateListOfValues struct {
 	OpeningTag   BACnetOpeningTag
 	ListOfValues []BACnetPropertyStates
 	ClosingTag   BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetEventParameterChangeOfStateListOfValues = (*_BACnetEventParameterChangeOfStateListOfValues)(nil)
 
 // NewBACnetEventParameterChangeOfStateListOfValues factory function for _BACnetEventParameterChangeOfStateListOfValues
-func NewBACnetEventParameterChangeOfStateListOfValues(openingTag BACnetOpeningTag, listOfValues []BACnetPropertyStates, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetEventParameterChangeOfStateListOfValues {
+func NewBACnetEventParameterChangeOfStateListOfValues(openingTag BACnetOpeningTag, listOfValues []BACnetPropertyStates, closingTag BACnetClosingTag) *_BACnetEventParameterChangeOfStateListOfValues {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetEventParameterChangeOfStateListOfValues must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetEventParameterChangeOfStateListOfValues must not be nil")
 	}
-	return &_BACnetEventParameterChangeOfStateListOfValues{OpeningTag: openingTag, ListOfValues: listOfValues, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetEventParameterChangeOfStateListOfValues{OpeningTag: openingTag, ListOfValues: listOfValues, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetEventParameterChangeOfStateListOfValuesBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetEventParameterChangeOfStateListOfValuesBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetEventParameterChangeOfStateListOfValuesBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventParameterChangeOfStateListOfValuesBuilder
 	// Build builds the BACnetEventParameterChangeOfStateListOfValues or returns an error if something is wrong
 	Build() (BACnetEventParameterChangeOfStateListOfValues, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetEventParameterChangeOfStateListOfValuesBuilder) WithClosingTagBu
 	return b
 }
 
-func (b *_BACnetEventParameterChangeOfStateListOfValuesBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventParameterChangeOfStateListOfValuesBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetEventParameterChangeOfStateListOfValuesBuilder) Build() (BACnetEventParameterChangeOfStateListOfValues, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetEventParameterChangeOfStateListOfValuesParseWithBufferProducer(tagNum
 }
 
 func BACnetEventParameterChangeOfStateListOfValuesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetEventParameterChangeOfStateListOfValues, error) {
-	v, err := (&_BACnetEventParameterChangeOfStateListOfValues{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetEventParameterChangeOfStateListOfValues)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetEventParameterChangeOfStateListOfValues) SerializeWithWriteBuffe
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventParameterChangeOfStateListOfValues) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetEventParameterChangeOfStateListOfValues) IsBACnetEventParameterChangeOfStateListOfValues() {
 }
 
@@ -374,7 +354,6 @@ func (m *_BACnetEventParameterChangeOfStateListOfValues) deepCopy() *_BACnetEven
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetPropertyStates, BACnetPropertyStates](m.ListOfValues),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetEventParameterChangeOfStateListOfValuesCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfTimerAlarmValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfTimerAlarmValue.go
index 86cdb254d2c..3f44e154987 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfTimerAlarmValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfTimerAlarmValue.go
@@ -57,22 +57,19 @@ type _BACnetEventParameterChangeOfTimerAlarmValue struct {
 	OpeningTag  BACnetOpeningTag
 	AlarmValues []BACnetTimerStateTagged
 	ClosingTag  BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetEventParameterChangeOfTimerAlarmValue = (*_BACnetEventParameterChangeOfTimerAlarmValue)(nil)
 
 // NewBACnetEventParameterChangeOfTimerAlarmValue factory function for _BACnetEventParameterChangeOfTimerAlarmValue
-func NewBACnetEventParameterChangeOfTimerAlarmValue(openingTag BACnetOpeningTag, alarmValues []BACnetTimerStateTagged, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetEventParameterChangeOfTimerAlarmValue {
+func NewBACnetEventParameterChangeOfTimerAlarmValue(openingTag BACnetOpeningTag, alarmValues []BACnetTimerStateTagged, closingTag BACnetClosingTag) *_BACnetEventParameterChangeOfTimerAlarmValue {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetEventParameterChangeOfTimerAlarmValue must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetEventParameterChangeOfTimerAlarmValue must not be nil")
 	}
-	return &_BACnetEventParameterChangeOfTimerAlarmValue{OpeningTag: openingTag, AlarmValues: alarmValues, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetEventParameterChangeOfTimerAlarmValue{OpeningTag: openingTag, AlarmValues: alarmValues, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetEventParameterChangeOfTimerAlarmValueBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetEventParameterChangeOfTimerAlarmValueBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetEventParameterChangeOfTimerAlarmValueBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventParameterChangeOfTimerAlarmValueBuilder
 	// Build builds the BACnetEventParameterChangeOfTimerAlarmValue or returns an error if something is wrong
 	Build() (BACnetEventParameterChangeOfTimerAlarmValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetEventParameterChangeOfTimerAlarmValueBuilder) WithClosingTagBuil
 	return b
 }
 
-func (b *_BACnetEventParameterChangeOfTimerAlarmValueBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventParameterChangeOfTimerAlarmValueBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetEventParameterChangeOfTimerAlarmValueBuilder) Build() (BACnetEventParameterChangeOfTimerAlarmValue, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetEventParameterChangeOfTimerAlarmValueParseWithBufferProducer(tagNumbe
 }
 
 func BACnetEventParameterChangeOfTimerAlarmValueParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetEventParameterChangeOfTimerAlarmValue, error) {
-	v, err := (&_BACnetEventParameterChangeOfTimerAlarmValue{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetEventParameterChangeOfTimerAlarmValue)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetEventParameterChangeOfTimerAlarmValue) SerializeWithWriteBuffer(
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventParameterChangeOfTimerAlarmValue) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetEventParameterChangeOfTimerAlarmValue) IsBACnetEventParameterChangeOfTimerAlarmValue() {
 }
 
@@ -374,7 +354,6 @@ func (m *_BACnetEventParameterChangeOfTimerAlarmValue) deepCopy() *_BACnetEventP
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetTimerStateTagged, BACnetTimerStateTagged](m.AlarmValues),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetEventParameterChangeOfTimerAlarmValueCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteria.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteria.go
index 34fefca63e7..3311f0a5f38 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteria.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteria.go
@@ -58,8 +58,6 @@ type BACnetEventParameterChangeOfValueCivCriteriaContract interface {
 	GetClosingTag() BACnetClosingTag
 	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
-	// GetTagNumber() returns a parser argument
-	GetTagNumber() uint8
 	// IsBACnetEventParameterChangeOfValueCivCriteria is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetEventParameterChangeOfValueCivCriteria()
 	// CreateBuilder creates a BACnetEventParameterChangeOfValueCivCriteriaBuilder
@@ -83,15 +81,12 @@ type _BACnetEventParameterChangeOfValueCivCriteria struct {
 	OpeningTag      BACnetOpeningTag
 	PeekedTagHeader BACnetTagHeader
 	ClosingTag      BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetEventParameterChangeOfValueCivCriteriaContract = (*_BACnetEventParameterChangeOfValueCivCriteria)(nil)
 
 // NewBACnetEventParameterChangeOfValueCivCriteria factory function for _BACnetEventParameterChangeOfValueCivCriteria
-func NewBACnetEventParameterChangeOfValueCivCriteria(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetEventParameterChangeOfValueCivCriteria {
+func NewBACnetEventParameterChangeOfValueCivCriteria(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetEventParameterChangeOfValueCivCriteria {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetEventParameterChangeOfValueCivCriteria must not be nil")
 	}
@@ -101,7 +96,7 @@ func NewBACnetEventParameterChangeOfValueCivCriteria(openingTag BACnetOpeningTag
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetEventParameterChangeOfValueCivCriteria must not be nil")
 	}
-	return &_BACnetEventParameterChangeOfValueCivCriteria{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetEventParameterChangeOfValueCivCriteria{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -126,8 +121,6 @@ type BACnetEventParameterChangeOfValueCivCriteriaBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetEventParameterChangeOfValueCivCriteriaBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetEventParameterChangeOfValueCivCriteriaBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventParameterChangeOfValueCivCriteriaBuilder
 	// AsBACnetEventParameterChangeOfValueCivCriteriaBitmask converts this build to a subType of BACnetEventParameterChangeOfValueCivCriteria. It is always possible to return to current builder using Done()
 	AsBACnetEventParameterChangeOfValueCivCriteriaBitmask() BACnetEventParameterChangeOfValueCivCriteriaBitmaskBuilder
 	// AsBACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement converts this build to a subType of BACnetEventParameterChangeOfValueCivCriteria. It is always possible to return to current builder using Done()
@@ -212,11 +205,6 @@ func (b *_BACnetEventParameterChangeOfValueCivCriteriaBuilder) WithClosingTagBui
 	return b
 }
 
-func (b *_BACnetEventParameterChangeOfValueCivCriteriaBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventParameterChangeOfValueCivCriteriaBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetEventParameterChangeOfValueCivCriteriaBuilder) PartialBuild() (BACnetEventParameterChangeOfValueCivCriteriaContract, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -395,7 +383,7 @@ func BACnetEventParameterChangeOfValueCivCriteriaParseWithBufferProducer[T BACne
 }
 
 func BACnetEventParameterChangeOfValueCivCriteriaParseWithBuffer[T BACnetEventParameterChangeOfValueCivCriteria](ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (T, error) {
-	v, err := (&_BACnetEventParameterChangeOfValueCivCriteria{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetEventParameterChangeOfValueCivCriteria)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -500,16 +488,6 @@ func (pm *_BACnetEventParameterChangeOfValueCivCriteria) serializeParent(ctx con
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventParameterChangeOfValueCivCriteria) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetEventParameterChangeOfValueCivCriteria) IsBACnetEventParameterChangeOfValueCivCriteria() {
 }
 
@@ -526,7 +504,6 @@ func (m *_BACnetEventParameterChangeOfValueCivCriteria) deepCopy() *_BACnetEvent
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetTagHeader](m.PeekedTagHeader),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetEventParameterChangeOfValueCivCriteriaCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaBitmask.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaBitmask.go
index 4fa315a3155..5daaad3d315 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaBitmask.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaBitmask.go
@@ -59,12 +59,12 @@ var _ BACnetEventParameterChangeOfValueCivCriteriaBitmask = (*_BACnetEventParame
 var _ BACnetEventParameterChangeOfValueCivCriteriaRequirements = (*_BACnetEventParameterChangeOfValueCivCriteriaBitmask)(nil)
 
 // NewBACnetEventParameterChangeOfValueCivCriteriaBitmask factory function for _BACnetEventParameterChangeOfValueCivCriteriaBitmask
-func NewBACnetEventParameterChangeOfValueCivCriteriaBitmask(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bitmask BACnetContextTagBitString, tagNumber uint8) *_BACnetEventParameterChangeOfValueCivCriteriaBitmask {
+func NewBACnetEventParameterChangeOfValueCivCriteriaBitmask(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bitmask BACnetContextTagBitString) *_BACnetEventParameterChangeOfValueCivCriteriaBitmask {
 	if bitmask == nil {
 		panic("bitmask of type BACnetContextTagBitString for BACnetEventParameterChangeOfValueCivCriteriaBitmask must not be nil")
 	}
 	_result := &_BACnetEventParameterChangeOfValueCivCriteriaBitmask{
-		BACnetEventParameterChangeOfValueCivCriteriaContract: NewBACnetEventParameterChangeOfValueCivCriteria(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetEventParameterChangeOfValueCivCriteriaContract: NewBACnetEventParameterChangeOfValueCivCriteria(openingTag, peekedTagHeader, closingTag),
 		Bitmask: bitmask,
 	}
 	_result.BACnetEventParameterChangeOfValueCivCriteriaContract.(*_BACnetEventParameterChangeOfValueCivCriteria)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement.go
index 4bb25157365..b9d74ecc227 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement.go
@@ -59,12 +59,12 @@ var _ BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement =
 var _ BACnetEventParameterChangeOfValueCivCriteriaRequirements = (*_BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement)(nil)
 
 // NewBACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement factory function for _BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement
-func NewBACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, referencedPropertyIncrement BACnetContextTagReal, tagNumber uint8) *_BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement {
+func NewBACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, referencedPropertyIncrement BACnetContextTagReal) *_BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement {
 	if referencedPropertyIncrement == nil {
 		panic("referencedPropertyIncrement of type BACnetContextTagReal for BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement must not be nil")
 	}
 	_result := &_BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement{
-		BACnetEventParameterChangeOfValueCivCriteriaContract: NewBACnetEventParameterChangeOfValueCivCriteria(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetEventParameterChangeOfValueCivCriteriaContract: NewBACnetEventParameterChangeOfValueCivCriteria(openingTag, peekedTagHeader, closingTag),
 		ReferencedPropertyIncrement:                          referencedPropertyIncrement,
 	}
 	_result.BACnetEventParameterChangeOfValueCivCriteriaContract.(*_BACnetEventParameterChangeOfValueCivCriteria)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go
index e726d62bf8e..e6bf8f4efbd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go
@@ -105,15 +105,12 @@ type _BACnetEventParameterExtendedParameters struct {
 	ObjectIdentifier     BACnetApplicationTagObjectIdentifier
 	Reference            BACnetDeviceObjectPropertyReferenceEnclosed
 	ClosingTag           BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetEventParameterExtendedParameters = (*_BACnetEventParameterExtendedParameters)(nil)
 
 // NewBACnetEventParameterExtendedParameters factory function for _BACnetEventParameterExtendedParameters
-func NewBACnetEventParameterExtendedParameters(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, nullValue BACnetApplicationTagNull, realValue BACnetApplicationTagReal, unsignedValue BACnetApplicationTagUnsignedInteger, booleanValue BACnetApplicationTagBoolean, integerValue BACnetApplicationTagSignedInteger, doubleValue BACnetApplicationTagDouble, octetStringValue BACnetApplicationTagOctetString, characterStringValue BACnetApplicationTagCharacterString, bitStringValue BACnetApplicationTagBitString, enumeratedValue BACnetApplicationTagEnumerated, dateValue BACnetApplicationTagDate, timeValue BACnetApplicationTagTime, objectIdentifier BACnetApplicationTagObjectIdentifier, reference BACnetDeviceObjectPropertyReferenceEnclosed, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetEventParameterExtendedParameters {
+func NewBACnetEventParameterExtendedParameters(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, nullValue BACnetApplicationTagNull, realValue BACnetApplicationTagReal, unsignedValue BACnetApplicationTagUnsignedInteger, booleanValue BACnetApplicationTagBoolean, integerValue BACnetApplicationTagSignedInteger, doubleValue BACnetApplicationTagDouble, octetStringValue BACnetApplicationTagOctetString, characterStringValue BACnetApplicationTagCharacterString, bitStringValue BACnetApplicationTagBitString, enumeratedValue BACnetApplicationTagEnumerated, dateValue BACnetApplicationTagDate, timeValue BACnetApplicationTagTime, objectIdentifier BACnetApplicationTagObjectIdentifier, reference BACnetDeviceObjectPropertyReferenceEnclosed, closingTag BACnetClosingTag) *_BACnetEventParameterExtendedParameters {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetEventParameterExtendedParameters must not be nil")
 	}
@@ -123,7 +120,7 @@ func NewBACnetEventParameterExtendedParameters(openingTag BACnetOpeningTag, peek
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetEventParameterExtendedParameters must not be nil")
 	}
-	return &_BACnetEventParameterExtendedParameters{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, NullValue: nullValue, RealValue: realValue, UnsignedValue: unsignedValue, BooleanValue: booleanValue, IntegerValue: integerValue, DoubleValue: doubleValue, OctetStringValue: octetStringValue, CharacterStringValue: characterStringValue, BitStringValue: bitStringValue, EnumeratedValue: enumeratedValue, DateValue: dateValue, TimeValue: timeValue, ObjectIdentifier: objectIdentifier, Reference: reference, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetEventParameterExtendedParameters{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, NullValue: nullValue, RealValue: realValue, UnsignedValue: unsignedValue, BooleanValue: booleanValue, IntegerValue: integerValue, DoubleValue: doubleValue, OctetStringValue: octetStringValue, CharacterStringValue: characterStringValue, BitStringValue: bitStringValue, EnumeratedValue: enumeratedValue, DateValue: dateValue, TimeValue: timeValue, ObjectIdentifier: objectIdentifier, Reference: reference, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -204,8 +201,6 @@ type BACnetEventParameterExtendedParametersBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetEventParameterExtendedParametersBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetEventParameterExtendedParametersBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventParameterExtendedParametersBuilder
 	// Build builds the BACnetEventParameterExtendedParameters or returns an error if something is wrong
 	Build() (BACnetEventParameterExtendedParameters, error)
 	// MustBuild does the same as Build but panics on error
@@ -484,11 +479,6 @@ func (b *_BACnetEventParameterExtendedParametersBuilder) WithClosingTagBuilder(b
 	return b
 }
 
-func (b *_BACnetEventParameterExtendedParametersBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventParameterExtendedParametersBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetEventParameterExtendedParametersBuilder) Build() (BACnetEventParameterExtendedParameters, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -841,7 +831,7 @@ func BACnetEventParameterExtendedParametersParseWithBufferProducer(tagNumber uin
 }
 
 func BACnetEventParameterExtendedParametersParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetEventParameterExtendedParameters, error) {
-	v, err := (&_BACnetEventParameterExtendedParameters{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetEventParameterExtendedParameters)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -1145,16 +1135,6 @@ func (m *_BACnetEventParameterExtendedParameters) SerializeWithWriteBuffer(ctx c
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventParameterExtendedParameters) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetEventParameterExtendedParameters) IsBACnetEventParameterExtendedParameters() {}
 
 func (m *_BACnetEventParameterExtendedParameters) DeepCopy() any {
@@ -1183,7 +1163,6 @@ func (m *_BACnetEventParameterExtendedParameters) deepCopy() *_BACnetEventParame
 		utils.DeepCopy[BACnetApplicationTagObjectIdentifier](m.ObjectIdentifier),
 		utils.DeepCopy[BACnetDeviceObjectPropertyReferenceEnclosed](m.Reference),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetEventParameterExtendedParametersCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventPriorities.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventPriorities.go
index 71ebdf11595..a694c0d2d91 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventPriorities.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventPriorities.go
@@ -63,15 +63,12 @@ type _BACnetEventPriorities struct {
 	ToFault     BACnetApplicationTagUnsignedInteger
 	ToNormal    BACnetApplicationTagUnsignedInteger
 	ClosingTag  BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetEventPriorities = (*_BACnetEventPriorities)(nil)
 
 // NewBACnetEventPriorities factory function for _BACnetEventPriorities
-func NewBACnetEventPriorities(openingTag BACnetOpeningTag, toOffnormal BACnetApplicationTagUnsignedInteger, toFault BACnetApplicationTagUnsignedInteger, toNormal BACnetApplicationTagUnsignedInteger, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetEventPriorities {
+func NewBACnetEventPriorities(openingTag BACnetOpeningTag, toOffnormal BACnetApplicationTagUnsignedInteger, toFault BACnetApplicationTagUnsignedInteger, toNormal BACnetApplicationTagUnsignedInteger, closingTag BACnetClosingTag) *_BACnetEventPriorities {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetEventPriorities must not be nil")
 	}
@@ -87,7 +84,7 @@ func NewBACnetEventPriorities(openingTag BACnetOpeningTag, toOffnormal BACnetApp
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetEventPriorities must not be nil")
 	}
-	return &_BACnetEventPriorities{OpeningTag: openingTag, ToOffnormal: toOffnormal, ToFault: toFault, ToNormal: toNormal, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetEventPriorities{OpeningTag: openingTag, ToOffnormal: toOffnormal, ToFault: toFault, ToNormal: toNormal, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -120,8 +117,6 @@ type BACnetEventPrioritiesBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetEventPrioritiesBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetEventPrioritiesBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventPrioritiesBuilder
 	// Build builds the BACnetEventPriorities or returns an error if something is wrong
 	Build() (BACnetEventPriorities, error)
 	// MustBuild does the same as Build but panics on error
@@ -220,11 +215,6 @@ func (b *_BACnetEventPrioritiesBuilder) WithClosingTagBuilder(builderSupplier fu
 	return b
 }
 
-func (b *_BACnetEventPrioritiesBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventPrioritiesBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetEventPrioritiesBuilder) Build() (BACnetEventPriorities, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -357,7 +347,7 @@ func BACnetEventPrioritiesParseWithBufferProducer(tagNumber uint8) func(ctx cont
 }
 
 func BACnetEventPrioritiesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetEventPriorities, error) {
-	v, err := (&_BACnetEventPriorities{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetEventPriorities)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -453,16 +443,6 @@ func (m *_BACnetEventPriorities) SerializeWithWriteBuffer(ctx context.Context, w
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventPriorities) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetEventPriorities) IsBACnetEventPriorities() {}
 
 func (m *_BACnetEventPriorities) DeepCopy() any {
@@ -479,7 +459,6 @@ func (m *_BACnetEventPriorities) deepCopy() *_BACnetEventPriorities {
 		utils.DeepCopy[BACnetApplicationTagUnsignedInteger](m.ToFault),
 		utils.DeepCopy[BACnetApplicationTagUnsignedInteger](m.ToNormal),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetEventPrioritiesCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventStateTagged.go
index a46b2d36c00..34c3e761bd7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventStateTagged.go
@@ -59,20 +59,16 @@ type _BACnetEventStateTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetEventState
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetEventStateTagged = (*_BACnetEventStateTagged)(nil)
 
 // NewBACnetEventStateTagged factory function for _BACnetEventStateTagged
-func NewBACnetEventStateTagged(header BACnetTagHeader, value BACnetEventState, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetEventStateTagged {
+func NewBACnetEventStateTagged(header BACnetTagHeader, value BACnetEventState, proprietaryValue uint32) *_BACnetEventStateTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetEventStateTagged must not be nil")
 	}
-	return &_BACnetEventStateTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetEventStateTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetEventStateTaggedBuilder interface {
 	WithValue(BACnetEventState) BACnetEventStateTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetEventStateTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventStateTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetEventStateTaggedBuilder
 	// Build builds the BACnetEventStateTagged or returns an error if something is wrong
 	Build() (BACnetEventStateTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetEventStateTaggedBuilder) WithProprietaryValue(proprietaryValue u
 	return b
 }
 
-func (b *_BACnetEventStateTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventStateTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetEventStateTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetEventStateTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetEventStateTaggedBuilder) Build() (BACnetEventStateTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetEventStateTaggedParseWithBufferProducer(tagNumber uint8, tagClass Tag
 }
 
 func BACnetEventStateTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetEventStateTagged, error) {
-	v, err := (&_BACnetEventStateTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetEventStateTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetEventStateTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventStateTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetEventStateTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetEventStateTagged) IsBACnetEventStateTagged() {}
 
 func (m *_BACnetEventStateTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetEventStateTagged) deepCopy() *_BACnetEventStateTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetEventStateTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummariesList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummariesList.go
index 2b760c54927..43599849e5c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummariesList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummariesList.go
@@ -57,22 +57,19 @@ type _BACnetEventSummariesList struct {
 	OpeningTag           BACnetOpeningTag
 	ListOfEventSummaries []BACnetEventSummary
 	ClosingTag           BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetEventSummariesList = (*_BACnetEventSummariesList)(nil)
 
 // NewBACnetEventSummariesList factory function for _BACnetEventSummariesList
-func NewBACnetEventSummariesList(openingTag BACnetOpeningTag, listOfEventSummaries []BACnetEventSummary, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetEventSummariesList {
+func NewBACnetEventSummariesList(openingTag BACnetOpeningTag, listOfEventSummaries []BACnetEventSummary, closingTag BACnetClosingTag) *_BACnetEventSummariesList {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetEventSummariesList must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetEventSummariesList must not be nil")
 	}
-	return &_BACnetEventSummariesList{OpeningTag: openingTag, ListOfEventSummaries: listOfEventSummaries, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetEventSummariesList{OpeningTag: openingTag, ListOfEventSummaries: listOfEventSummaries, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetEventSummariesListBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetEventSummariesListBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetEventSummariesListBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventSummariesListBuilder
 	// Build builds the BACnetEventSummariesList or returns an error if something is wrong
 	Build() (BACnetEventSummariesList, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetEventSummariesListBuilder) WithClosingTagBuilder(builderSupplier
 	return b
 }
 
-func (b *_BACnetEventSummariesListBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventSummariesListBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetEventSummariesListBuilder) Build() (BACnetEventSummariesList, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetEventSummariesListParseWithBufferProducer(tagNumber uint8) func(ctx c
 }
 
 func BACnetEventSummariesListParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetEventSummariesList, error) {
-	v, err := (&_BACnetEventSummariesList{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetEventSummariesList)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetEventSummariesList) SerializeWithWriteBuffer(ctx context.Context
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventSummariesList) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetEventSummariesList) IsBACnetEventSummariesList() {}
 
 func (m *_BACnetEventSummariesList) DeepCopy() any {
@@ -373,7 +353,6 @@ func (m *_BACnetEventSummariesList) deepCopy() *_BACnetEventSummariesList {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetEventSummary, BACnetEventSummary](m.ListOfEventSummaries),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetEventSummariesListCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummary.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummary.go
index 4562c2e45aa..d9d1c46e0b2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummary.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummary.go
@@ -417,7 +417,7 @@ func BACnetEventSummaryParseWithBufferProducer() func(ctx context.Context, readB
 }
 
 func BACnetEventSummaryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetEventSummary, error) {
-	v, err := (&_BACnetEventSummary{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetEventSummary)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestamps.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestamps.go
index f19999cb37b..5ec68bf2570 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestamps.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestamps.go
@@ -277,7 +277,7 @@ func BACnetEventTimestampsParseWithBufferProducer() func(ctx context.Context, re
 }
 
 func BACnetEventTimestampsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetEventTimestamps, error) {
-	v, err := (&_BACnetEventTimestamps{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetEventTimestamps)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestampsEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestampsEnclosed.go
index fa7e4d863ac..94d7fb61c80 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestampsEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestampsEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetEventTimestampsEnclosed struct {
 	OpeningTag      BACnetOpeningTag
 	EventTimestamps BACnetEventTimestamps
 	ClosingTag      BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetEventTimestampsEnclosed = (*_BACnetEventTimestampsEnclosed)(nil)
 
 // NewBACnetEventTimestampsEnclosed factory function for _BACnetEventTimestampsEnclosed
-func NewBACnetEventTimestampsEnclosed(openingTag BACnetOpeningTag, eventTimestamps BACnetEventTimestamps, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetEventTimestampsEnclosed {
+func NewBACnetEventTimestampsEnclosed(openingTag BACnetOpeningTag, eventTimestamps BACnetEventTimestamps, closingTag BACnetClosingTag) *_BACnetEventTimestampsEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetEventTimestampsEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetEventTimestampsEnclosed(openingTag BACnetOpeningTag, eventTimestam
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetEventTimestampsEnclosed must not be nil")
 	}
-	return &_BACnetEventTimestampsEnclosed{OpeningTag: openingTag, EventTimestamps: eventTimestamps, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetEventTimestampsEnclosed{OpeningTag: openingTag, EventTimestamps: eventTimestamps, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetEventTimestampsEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetEventTimestampsEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetEventTimestampsEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventTimestampsEnclosedBuilder
 	// Build builds the BACnetEventTimestampsEnclosed or returns an error if something is wrong
 	Build() (BACnetEventTimestampsEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetEventTimestampsEnclosedBuilder) WithClosingTagBuilder(builderSup
 	return b
 }
 
-func (b *_BACnetEventTimestampsEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventTimestampsEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetEventTimestampsEnclosedBuilder) Build() (BACnetEventTimestampsEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetEventTimestampsEnclosedParseWithBufferProducer(tagNumber uint8) func(
 }
 
 func BACnetEventTimestampsEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetEventTimestampsEnclosed, error) {
-	v, err := (&_BACnetEventTimestampsEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetEventTimestampsEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetEventTimestampsEnclosed) SerializeWithWriteBuffer(ctx context.Co
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventTimestampsEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetEventTimestampsEnclosed) IsBACnetEventTimestampsEnclosed() {}
 
 func (m *_BACnetEventTimestampsEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetEventTimestampsEnclosed) deepCopy() *_BACnetEventTimestampsEnclo
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetEventTimestamps](m.EventTimestamps),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetEventTimestampsEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBitsTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBitsTagged.go
index 4041b3df172..2163fd56f3c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBitsTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBitsTagged.go
@@ -60,23 +60,19 @@ type BACnetEventTransitionBitsTagged interface {
 type _BACnetEventTransitionBitsTagged struct {
 	Header  BACnetTagHeader
 	Payload BACnetTagPayloadBitString
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetEventTransitionBitsTagged = (*_BACnetEventTransitionBitsTagged)(nil)
 
 // NewBACnetEventTransitionBitsTagged factory function for _BACnetEventTransitionBitsTagged
-func NewBACnetEventTransitionBitsTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString, tagNumber uint8, tagClass TagClass) *_BACnetEventTransitionBitsTagged {
+func NewBACnetEventTransitionBitsTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString) *_BACnetEventTransitionBitsTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetEventTransitionBitsTagged must not be nil")
 	}
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadBitString for BACnetEventTransitionBitsTagged must not be nil")
 	}
-	return &_BACnetEventTransitionBitsTagged{Header: header, Payload: payload, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetEventTransitionBitsTagged{Header: header, Payload: payload}
 }
 
 ///////////////////////////////////////////////////////////
@@ -97,10 +93,6 @@ type BACnetEventTransitionBitsTaggedBuilder interface {
 	WithPayload(BACnetTagPayloadBitString) BACnetEventTransitionBitsTaggedBuilder
 	// WithPayloadBuilder adds Payload (property field) which is build by the builder
 	WithPayloadBuilder(func(BACnetTagPayloadBitStringBuilder) BACnetTagPayloadBitStringBuilder) BACnetEventTransitionBitsTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventTransitionBitsTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetEventTransitionBitsTaggedBuilder
 	// Build builds the BACnetEventTransitionBitsTagged or returns an error if something is wrong
 	Build() (BACnetEventTransitionBitsTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -154,15 +146,6 @@ func (b *_BACnetEventTransitionBitsTaggedBuilder) WithPayloadBuilder(builderSupp
 	return b
 }
 
-func (b *_BACnetEventTransitionBitsTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventTransitionBitsTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetEventTransitionBitsTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetEventTransitionBitsTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetEventTransitionBitsTaggedBuilder) Build() (BACnetEventTransitionBitsTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -298,7 +281,7 @@ func BACnetEventTransitionBitsTaggedParseWithBufferProducer(tagNumber uint8, tag
 }
 
 func BACnetEventTransitionBitsTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetEventTransitionBitsTagged, error) {
-	v, err := (&_BACnetEventTransitionBitsTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetEventTransitionBitsTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -410,19 +393,6 @@ func (m *_BACnetEventTransitionBitsTagged) SerializeWithWriteBuffer(ctx context.
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventTransitionBitsTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetEventTransitionBitsTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetEventTransitionBitsTagged) IsBACnetEventTransitionBitsTagged() {}
 
 func (m *_BACnetEventTransitionBitsTagged) DeepCopy() any {
@@ -436,8 +406,6 @@ func (m *_BACnetEventTransitionBitsTagged) deepCopy() *_BACnetEventTransitionBit
 	_BACnetEventTransitionBitsTaggedCopy := &_BACnetEventTransitionBitsTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		utils.DeepCopy[BACnetTagPayloadBitString](m.Payload),
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetEventTransitionBitsTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTypeTagged.go
index eacdab0c7b1..8c1bf0e9260 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTypeTagged.go
@@ -59,20 +59,16 @@ type _BACnetEventTypeTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetEventType
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetEventTypeTagged = (*_BACnetEventTypeTagged)(nil)
 
 // NewBACnetEventTypeTagged factory function for _BACnetEventTypeTagged
-func NewBACnetEventTypeTagged(header BACnetTagHeader, value BACnetEventType, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetEventTypeTagged {
+func NewBACnetEventTypeTagged(header BACnetTagHeader, value BACnetEventType, proprietaryValue uint32) *_BACnetEventTypeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetEventTypeTagged must not be nil")
 	}
-	return &_BACnetEventTypeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetEventTypeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetEventTypeTaggedBuilder interface {
 	WithValue(BACnetEventType) BACnetEventTypeTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetEventTypeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetEventTypeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetEventTypeTaggedBuilder
 	// Build builds the BACnetEventTypeTagged or returns an error if something is wrong
 	Build() (BACnetEventTypeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetEventTypeTaggedBuilder) WithProprietaryValue(proprietaryValue ui
 	return b
 }
 
-func (b *_BACnetEventTypeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetEventTypeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetEventTypeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetEventTypeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetEventTypeTaggedBuilder) Build() (BACnetEventTypeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetEventTypeTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagC
 }
 
 func BACnetEventTypeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetEventTypeTagged, error) {
-	v, err := (&_BACnetEventTypeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetEventTypeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetEventTypeTagged) SerializeWithWriteBuffer(ctx context.Context, w
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetEventTypeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetEventTypeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetEventTypeTagged) IsBACnetEventTypeTagged() {}
 
 func (m *_BACnetEventTypeTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetEventTypeTagged) deepCopy() *_BACnetEventTypeTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetEventTypeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameter.go
index f5c0f258315..9770eedb628 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameter.go
@@ -385,7 +385,7 @@ func BACnetFaultParameterParseWithBufferProducer[T BACnetFaultParameter]() func(
 }
 
 func BACnetFaultParameterParseWithBuffer[T BACnetFaultParameter](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetFaultParameter{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetFaultParameter)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultCharacterStringListOfFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultCharacterStringListOfFaultValues.go
index 20463b66155..ab2ff2021c4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultCharacterStringListOfFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultCharacterStringListOfFaultValues.go
@@ -57,22 +57,19 @@ type _BACnetFaultParameterFaultCharacterStringListOfFaultValues struct {
 	OpeningTag        BACnetOpeningTag
 	ListOfFaultValues []BACnetApplicationTagCharacterString
 	ClosingTag        BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetFaultParameterFaultCharacterStringListOfFaultValues = (*_BACnetFaultParameterFaultCharacterStringListOfFaultValues)(nil)
 
 // NewBACnetFaultParameterFaultCharacterStringListOfFaultValues factory function for _BACnetFaultParameterFaultCharacterStringListOfFaultValues
-func NewBACnetFaultParameterFaultCharacterStringListOfFaultValues(openingTag BACnetOpeningTag, listOfFaultValues []BACnetApplicationTagCharacterString, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetFaultParameterFaultCharacterStringListOfFaultValues {
+func NewBACnetFaultParameterFaultCharacterStringListOfFaultValues(openingTag BACnetOpeningTag, listOfFaultValues []BACnetApplicationTagCharacterString, closingTag BACnetClosingTag) *_BACnetFaultParameterFaultCharacterStringListOfFaultValues {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetFaultParameterFaultCharacterStringListOfFaultValues must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetFaultParameterFaultCharacterStringListOfFaultValues must not be nil")
 	}
-	return &_BACnetFaultParameterFaultCharacterStringListOfFaultValues{OpeningTag: openingTag, ListOfFaultValues: listOfFaultValues, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetFaultParameterFaultCharacterStringListOfFaultValues{OpeningTag: openingTag, ListOfFaultValues: listOfFaultValues, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetFaultParameterFaultCharacterStringListOfFaultValuesBuilder interface
 	WithClosingTag(BACnetClosingTag) BACnetFaultParameterFaultCharacterStringListOfFaultValuesBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetFaultParameterFaultCharacterStringListOfFaultValuesBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetFaultParameterFaultCharacterStringListOfFaultValuesBuilder
 	// Build builds the BACnetFaultParameterFaultCharacterStringListOfFaultValues or returns an error if something is wrong
 	Build() (BACnetFaultParameterFaultCharacterStringListOfFaultValues, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetFaultParameterFaultCharacterStringListOfFaultValuesBuilder) With
 	return b
 }
 
-func (b *_BACnetFaultParameterFaultCharacterStringListOfFaultValuesBuilder) WithArgTagNumber(tagNumber uint8) BACnetFaultParameterFaultCharacterStringListOfFaultValuesBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetFaultParameterFaultCharacterStringListOfFaultValuesBuilder) Build() (BACnetFaultParameterFaultCharacterStringListOfFaultValues, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetFaultParameterFaultCharacterStringListOfFaultValuesParseWithBufferPro
 }
 
 func BACnetFaultParameterFaultCharacterStringListOfFaultValuesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetFaultParameterFaultCharacterStringListOfFaultValues, error) {
-	v, err := (&_BACnetFaultParameterFaultCharacterStringListOfFaultValues{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetFaultParameterFaultCharacterStringListOfFaultValues)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetFaultParameterFaultCharacterStringListOfFaultValues) SerializeWi
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetFaultParameterFaultCharacterStringListOfFaultValues) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetFaultParameterFaultCharacterStringListOfFaultValues) IsBACnetFaultParameterFaultCharacterStringListOfFaultValues() {
 }
 
@@ -374,7 +354,6 @@ func (m *_BACnetFaultParameterFaultCharacterStringListOfFaultValues) deepCopy()
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetApplicationTagCharacterString, BACnetApplicationTagCharacterString](m.ListOfFaultValues),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetFaultParameterFaultCharacterStringListOfFaultValuesCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParameters.go
index 789de7471c9..24552f655cd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParameters.go
@@ -57,22 +57,19 @@ type _BACnetFaultParameterFaultExtendedParameters struct {
 	OpeningTag BACnetOpeningTag
 	Parameters []BACnetFaultParameterFaultExtendedParametersEntry
 	ClosingTag BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetFaultParameterFaultExtendedParameters = (*_BACnetFaultParameterFaultExtendedParameters)(nil)
 
 // NewBACnetFaultParameterFaultExtendedParameters factory function for _BACnetFaultParameterFaultExtendedParameters
-func NewBACnetFaultParameterFaultExtendedParameters(openingTag BACnetOpeningTag, parameters []BACnetFaultParameterFaultExtendedParametersEntry, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetFaultParameterFaultExtendedParameters {
+func NewBACnetFaultParameterFaultExtendedParameters(openingTag BACnetOpeningTag, parameters []BACnetFaultParameterFaultExtendedParametersEntry, closingTag BACnetClosingTag) *_BACnetFaultParameterFaultExtendedParameters {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetFaultParameterFaultExtendedParameters must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetFaultParameterFaultExtendedParameters must not be nil")
 	}
-	return &_BACnetFaultParameterFaultExtendedParameters{OpeningTag: openingTag, Parameters: parameters, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetFaultParameterFaultExtendedParameters{OpeningTag: openingTag, Parameters: parameters, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetFaultParameterFaultExtendedParametersBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetFaultParameterFaultExtendedParametersBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetFaultParameterFaultExtendedParametersBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetFaultParameterFaultExtendedParametersBuilder
 	// Build builds the BACnetFaultParameterFaultExtendedParameters or returns an error if something is wrong
 	Build() (BACnetFaultParameterFaultExtendedParameters, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetFaultParameterFaultExtendedParametersBuilder) WithClosingTagBuil
 	return b
 }
 
-func (b *_BACnetFaultParameterFaultExtendedParametersBuilder) WithArgTagNumber(tagNumber uint8) BACnetFaultParameterFaultExtendedParametersBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetFaultParameterFaultExtendedParametersBuilder) Build() (BACnetFaultParameterFaultExtendedParameters, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetFaultParameterFaultExtendedParametersParseWithBufferProducer(tagNumbe
 }
 
 func BACnetFaultParameterFaultExtendedParametersParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetFaultParameterFaultExtendedParameters, error) {
-	v, err := (&_BACnetFaultParameterFaultExtendedParameters{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetFaultParameterFaultExtendedParameters)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetFaultParameterFaultExtendedParameters) SerializeWithWriteBuffer(
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetFaultParameterFaultExtendedParameters) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetFaultParameterFaultExtendedParameters) IsBACnetFaultParameterFaultExtendedParameters() {
 }
 
@@ -374,7 +354,6 @@ func (m *_BACnetFaultParameterFaultExtendedParameters) deepCopy() *_BACnetFaultP
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetFaultParameterFaultExtendedParametersEntry, BACnetFaultParameterFaultExtendedParametersEntry](m.Parameters),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetFaultParameterFaultExtendedParametersCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntry.go
index 3629a493af3..ce8c5d95488 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntry.go
@@ -470,7 +470,7 @@ func BACnetFaultParameterFaultExtendedParametersEntryParseWithBufferProducer[T B
 }
 
 func BACnetFaultParameterFaultExtendedParametersEntryParseWithBuffer[T BACnetFaultParameterFaultExtendedParametersEntry](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetFaultParameterFaultExtendedParametersEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetFaultParameterFaultExtendedParametersEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultLifeSafetyListOfFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultLifeSafetyListOfFaultValues.go
index ce5bc650d02..13d1b7175a6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultLifeSafetyListOfFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultLifeSafetyListOfFaultValues.go
@@ -57,22 +57,19 @@ type _BACnetFaultParameterFaultLifeSafetyListOfFaultValues struct {
 	OpeningTag        BACnetOpeningTag
 	ListIfFaultValues []BACnetLifeSafetyStateTagged
 	ClosingTag        BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetFaultParameterFaultLifeSafetyListOfFaultValues = (*_BACnetFaultParameterFaultLifeSafetyListOfFaultValues)(nil)
 
 // NewBACnetFaultParameterFaultLifeSafetyListOfFaultValues factory function for _BACnetFaultParameterFaultLifeSafetyListOfFaultValues
-func NewBACnetFaultParameterFaultLifeSafetyListOfFaultValues(openingTag BACnetOpeningTag, listIfFaultValues []BACnetLifeSafetyStateTagged, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetFaultParameterFaultLifeSafetyListOfFaultValues {
+func NewBACnetFaultParameterFaultLifeSafetyListOfFaultValues(openingTag BACnetOpeningTag, listIfFaultValues []BACnetLifeSafetyStateTagged, closingTag BACnetClosingTag) *_BACnetFaultParameterFaultLifeSafetyListOfFaultValues {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetFaultParameterFaultLifeSafetyListOfFaultValues must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetFaultParameterFaultLifeSafetyListOfFaultValues must not be nil")
 	}
-	return &_BACnetFaultParameterFaultLifeSafetyListOfFaultValues{OpeningTag: openingTag, ListIfFaultValues: listIfFaultValues, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetFaultParameterFaultLifeSafetyListOfFaultValues{OpeningTag: openingTag, ListIfFaultValues: listIfFaultValues, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetFaultParameterFaultLifeSafetyListOfFaultValuesBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetFaultParameterFaultLifeSafetyListOfFaultValuesBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetFaultParameterFaultLifeSafetyListOfFaultValuesBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetFaultParameterFaultLifeSafetyListOfFaultValuesBuilder
 	// Build builds the BACnetFaultParameterFaultLifeSafetyListOfFaultValues or returns an error if something is wrong
 	Build() (BACnetFaultParameterFaultLifeSafetyListOfFaultValues, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetFaultParameterFaultLifeSafetyListOfFaultValuesBuilder) WithClosi
 	return b
 }
 
-func (b *_BACnetFaultParameterFaultLifeSafetyListOfFaultValuesBuilder) WithArgTagNumber(tagNumber uint8) BACnetFaultParameterFaultLifeSafetyListOfFaultValuesBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetFaultParameterFaultLifeSafetyListOfFaultValuesBuilder) Build() (BACnetFaultParameterFaultLifeSafetyListOfFaultValues, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetFaultParameterFaultLifeSafetyListOfFaultValuesParseWithBufferProducer
 }
 
 func BACnetFaultParameterFaultLifeSafetyListOfFaultValuesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetFaultParameterFaultLifeSafetyListOfFaultValues, error) {
-	v, err := (&_BACnetFaultParameterFaultLifeSafetyListOfFaultValues{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetFaultParameterFaultLifeSafetyListOfFaultValues)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetFaultParameterFaultLifeSafetyListOfFaultValues) SerializeWithWri
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetFaultParameterFaultLifeSafetyListOfFaultValues) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetFaultParameterFaultLifeSafetyListOfFaultValues) IsBACnetFaultParameterFaultLifeSafetyListOfFaultValues() {
 }
 
@@ -374,7 +354,6 @@ func (m *_BACnetFaultParameterFaultLifeSafetyListOfFaultValues) deepCopy() *_BAC
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetLifeSafetyStateTagged, BACnetLifeSafetyStateTagged](m.ListIfFaultValues),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetFaultParameterFaultLifeSafetyListOfFaultValuesCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.go
index 39af421bb77..98b6d622d66 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.go
@@ -58,8 +58,6 @@ type BACnetFaultParameterFaultOutOfRangeMaxNormalValueContract interface {
 	GetClosingTag() BACnetClosingTag
 	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
-	// GetTagNumber() returns a parser argument
-	GetTagNumber() uint8
 	// IsBACnetFaultParameterFaultOutOfRangeMaxNormalValue is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetFaultParameterFaultOutOfRangeMaxNormalValue()
 	// CreateBuilder creates a BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder
@@ -83,15 +81,12 @@ type _BACnetFaultParameterFaultOutOfRangeMaxNormalValue struct {
 	OpeningTag      BACnetOpeningTag
 	PeekedTagHeader BACnetTagHeader
 	ClosingTag      BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetFaultParameterFaultOutOfRangeMaxNormalValueContract = (*_BACnetFaultParameterFaultOutOfRangeMaxNormalValue)(nil)
 
 // NewBACnetFaultParameterFaultOutOfRangeMaxNormalValue factory function for _BACnetFaultParameterFaultOutOfRangeMaxNormalValue
-func NewBACnetFaultParameterFaultOutOfRangeMaxNormalValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetFaultParameterFaultOutOfRangeMaxNormalValue {
+func NewBACnetFaultParameterFaultOutOfRangeMaxNormalValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetFaultParameterFaultOutOfRangeMaxNormalValue {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetFaultParameterFaultOutOfRangeMaxNormalValue must not be nil")
 	}
@@ -101,7 +96,7 @@ func NewBACnetFaultParameterFaultOutOfRangeMaxNormalValue(openingTag BACnetOpeni
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetFaultParameterFaultOutOfRangeMaxNormalValue must not be nil")
 	}
-	return &_BACnetFaultParameterFaultOutOfRangeMaxNormalValue{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetFaultParameterFaultOutOfRangeMaxNormalValue{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -126,8 +121,6 @@ type BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder
 	// AsBACnetFaultParameterFaultOutOfRangeMaxNormalValueReal converts this build to a subType of BACnetFaultParameterFaultOutOfRangeMaxNormalValue. It is always possible to return to current builder using Done()
 	AsBACnetFaultParameterFaultOutOfRangeMaxNormalValueReal() BACnetFaultParameterFaultOutOfRangeMaxNormalValueRealBuilder
 	// AsBACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned converts this build to a subType of BACnetFaultParameterFaultOutOfRangeMaxNormalValue. It is always possible to return to current builder using Done()
@@ -216,11 +209,6 @@ func (b *_BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder) WithClosingT
 	return b
 }
 
-func (b *_BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder) WithArgTagNumber(tagNumber uint8) BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder) PartialBuild() (BACnetFaultParameterFaultOutOfRangeMaxNormalValueContract, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -419,7 +407,7 @@ func BACnetFaultParameterFaultOutOfRangeMaxNormalValueParseWithBufferProducer[T
 }
 
 func BACnetFaultParameterFaultOutOfRangeMaxNormalValueParseWithBuffer[T BACnetFaultParameterFaultOutOfRangeMaxNormalValue](ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (T, error) {
-	v, err := (&_BACnetFaultParameterFaultOutOfRangeMaxNormalValue{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetFaultParameterFaultOutOfRangeMaxNormalValue)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -537,16 +525,6 @@ func (pm *_BACnetFaultParameterFaultOutOfRangeMaxNormalValue) serializeParent(ct
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetFaultParameterFaultOutOfRangeMaxNormalValue) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetFaultParameterFaultOutOfRangeMaxNormalValue) IsBACnetFaultParameterFaultOutOfRangeMaxNormalValue() {
 }
 
@@ -563,7 +541,6 @@ func (m *_BACnetFaultParameterFaultOutOfRangeMaxNormalValue) deepCopy() *_BACnet
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetTagHeader](m.PeekedTagHeader),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetFaultParameterFaultOutOfRangeMaxNormalValueCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble.go
index c9bcb50ff62..503d988f096 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble.go
@@ -59,12 +59,12 @@ var _ BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble = (*_BACnetFaultPa
 var _ BACnetFaultParameterFaultOutOfRangeMaxNormalValueRequirements = (*_BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble)(nil)
 
 // NewBACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble factory function for _BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble
-func NewBACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doubleValue BACnetApplicationTagDouble, tagNumber uint8) *_BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble {
+func NewBACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doubleValue BACnetApplicationTagDouble) *_BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble {
 	if doubleValue == nil {
 		panic("doubleValue of type BACnetApplicationTagDouble for BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble must not be nil")
 	}
 	_result := &_BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble{
-		BACnetFaultParameterFaultOutOfRangeMaxNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMaxNormalValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetFaultParameterFaultOutOfRangeMaxNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMaxNormalValue(openingTag, peekedTagHeader, closingTag),
 		DoubleValue: doubleValue,
 	}
 	_result.BACnetFaultParameterFaultOutOfRangeMaxNormalValueContract.(*_BACnetFaultParameterFaultOutOfRangeMaxNormalValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger.go
index 2cfabc0b1b8..ec560eb1af0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger.go
@@ -59,12 +59,12 @@ var _ BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger = (*_BACnetFaultP
 var _ BACnetFaultParameterFaultOutOfRangeMaxNormalValueRequirements = (*_BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger)(nil)
 
 // NewBACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger factory function for _BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger
-func NewBACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, integerValue BACnetApplicationTagSignedInteger, tagNumber uint8) *_BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger {
+func NewBACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, integerValue BACnetApplicationTagSignedInteger) *_BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger {
 	if integerValue == nil {
 		panic("integerValue of type BACnetApplicationTagSignedInteger for BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger must not be nil")
 	}
 	_result := &_BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger{
-		BACnetFaultParameterFaultOutOfRangeMaxNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMaxNormalValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetFaultParameterFaultOutOfRangeMaxNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMaxNormalValue(openingTag, peekedTagHeader, closingTag),
 		IntegerValue: integerValue,
 	}
 	_result.BACnetFaultParameterFaultOutOfRangeMaxNormalValueContract.(*_BACnetFaultParameterFaultOutOfRangeMaxNormalValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal.go
index c0cefe4068b..935ecd8f517 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal.go
@@ -59,12 +59,12 @@ var _ BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal = (*_BACnetFaultPara
 var _ BACnetFaultParameterFaultOutOfRangeMaxNormalValueRequirements = (*_BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal)(nil)
 
 // NewBACnetFaultParameterFaultOutOfRangeMaxNormalValueReal factory function for _BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal
-func NewBACnetFaultParameterFaultOutOfRangeMaxNormalValueReal(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, realValue BACnetApplicationTagReal, tagNumber uint8) *_BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal {
+func NewBACnetFaultParameterFaultOutOfRangeMaxNormalValueReal(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, realValue BACnetApplicationTagReal) *_BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal {
 	if realValue == nil {
 		panic("realValue of type BACnetApplicationTagReal for BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal must not be nil")
 	}
 	_result := &_BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal{
-		BACnetFaultParameterFaultOutOfRangeMaxNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMaxNormalValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetFaultParameterFaultOutOfRangeMaxNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMaxNormalValue(openingTag, peekedTagHeader, closingTag),
 		RealValue: realValue,
 	}
 	_result.BACnetFaultParameterFaultOutOfRangeMaxNormalValueContract.(*_BACnetFaultParameterFaultOutOfRangeMaxNormalValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned.go
index 6dacf160749..9b257ecaf18 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned.go
@@ -59,12 +59,12 @@ var _ BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned = (*_BACnetFault
 var _ BACnetFaultParameterFaultOutOfRangeMaxNormalValueRequirements = (*_BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned)(nil)
 
 // NewBACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned factory function for _BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned
-func NewBACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, unsignedValue BACnetApplicationTagUnsignedInteger, tagNumber uint8) *_BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned {
+func NewBACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, unsignedValue BACnetApplicationTagUnsignedInteger) *_BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned {
 	if unsignedValue == nil {
 		panic("unsignedValue of type BACnetApplicationTagUnsignedInteger for BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned must not be nil")
 	}
 	_result := &_BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned{
-		BACnetFaultParameterFaultOutOfRangeMaxNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMaxNormalValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetFaultParameterFaultOutOfRangeMaxNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMaxNormalValue(openingTag, peekedTagHeader, closingTag),
 		UnsignedValue: unsignedValue,
 	}
 	_result.BACnetFaultParameterFaultOutOfRangeMaxNormalValueContract.(*_BACnetFaultParameterFaultOutOfRangeMaxNormalValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValue.go
index 6f3a7d19be3..fc2a23e49c6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValue.go
@@ -58,8 +58,6 @@ type BACnetFaultParameterFaultOutOfRangeMinNormalValueContract interface {
 	GetClosingTag() BACnetClosingTag
 	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
-	// GetTagNumber() returns a parser argument
-	GetTagNumber() uint8
 	// IsBACnetFaultParameterFaultOutOfRangeMinNormalValue is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetFaultParameterFaultOutOfRangeMinNormalValue()
 	// CreateBuilder creates a BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder
@@ -83,15 +81,12 @@ type _BACnetFaultParameterFaultOutOfRangeMinNormalValue struct {
 	OpeningTag      BACnetOpeningTag
 	PeekedTagHeader BACnetTagHeader
 	ClosingTag      BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetFaultParameterFaultOutOfRangeMinNormalValueContract = (*_BACnetFaultParameterFaultOutOfRangeMinNormalValue)(nil)
 
 // NewBACnetFaultParameterFaultOutOfRangeMinNormalValue factory function for _BACnetFaultParameterFaultOutOfRangeMinNormalValue
-func NewBACnetFaultParameterFaultOutOfRangeMinNormalValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetFaultParameterFaultOutOfRangeMinNormalValue {
+func NewBACnetFaultParameterFaultOutOfRangeMinNormalValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetFaultParameterFaultOutOfRangeMinNormalValue {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetFaultParameterFaultOutOfRangeMinNormalValue must not be nil")
 	}
@@ -101,7 +96,7 @@ func NewBACnetFaultParameterFaultOutOfRangeMinNormalValue(openingTag BACnetOpeni
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetFaultParameterFaultOutOfRangeMinNormalValue must not be nil")
 	}
-	return &_BACnetFaultParameterFaultOutOfRangeMinNormalValue{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetFaultParameterFaultOutOfRangeMinNormalValue{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -126,8 +121,6 @@ type BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder
 	// AsBACnetFaultParameterFaultOutOfRangeMinNormalValueReal converts this build to a subType of BACnetFaultParameterFaultOutOfRangeMinNormalValue. It is always possible to return to current builder using Done()
 	AsBACnetFaultParameterFaultOutOfRangeMinNormalValueReal() BACnetFaultParameterFaultOutOfRangeMinNormalValueRealBuilder
 	// AsBACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned converts this build to a subType of BACnetFaultParameterFaultOutOfRangeMinNormalValue. It is always possible to return to current builder using Done()
@@ -216,11 +209,6 @@ func (b *_BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder) WithClosingT
 	return b
 }
 
-func (b *_BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder) WithArgTagNumber(tagNumber uint8) BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder) PartialBuild() (BACnetFaultParameterFaultOutOfRangeMinNormalValueContract, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -419,7 +407,7 @@ func BACnetFaultParameterFaultOutOfRangeMinNormalValueParseWithBufferProducer[T
 }
 
 func BACnetFaultParameterFaultOutOfRangeMinNormalValueParseWithBuffer[T BACnetFaultParameterFaultOutOfRangeMinNormalValue](ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (T, error) {
-	v, err := (&_BACnetFaultParameterFaultOutOfRangeMinNormalValue{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetFaultParameterFaultOutOfRangeMinNormalValue)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -537,16 +525,6 @@ func (pm *_BACnetFaultParameterFaultOutOfRangeMinNormalValue) serializeParent(ct
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetFaultParameterFaultOutOfRangeMinNormalValue) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetFaultParameterFaultOutOfRangeMinNormalValue) IsBACnetFaultParameterFaultOutOfRangeMinNormalValue() {
 }
 
@@ -563,7 +541,6 @@ func (m *_BACnetFaultParameterFaultOutOfRangeMinNormalValue) deepCopy() *_BACnet
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetTagHeader](m.PeekedTagHeader),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetFaultParameterFaultOutOfRangeMinNormalValueCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble.go
index 60a0dcb475a..11dc2e914b7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble.go
@@ -59,12 +59,12 @@ var _ BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble = (*_BACnetFaultPa
 var _ BACnetFaultParameterFaultOutOfRangeMinNormalValueRequirements = (*_BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble)(nil)
 
 // NewBACnetFaultParameterFaultOutOfRangeMinNormalValueDouble factory function for _BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble
-func NewBACnetFaultParameterFaultOutOfRangeMinNormalValueDouble(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doubleValue BACnetApplicationTagDouble, tagNumber uint8) *_BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble {
+func NewBACnetFaultParameterFaultOutOfRangeMinNormalValueDouble(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, doubleValue BACnetApplicationTagDouble) *_BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble {
 	if doubleValue == nil {
 		panic("doubleValue of type BACnetApplicationTagDouble for BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble must not be nil")
 	}
 	_result := &_BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble{
-		BACnetFaultParameterFaultOutOfRangeMinNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMinNormalValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetFaultParameterFaultOutOfRangeMinNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMinNormalValue(openingTag, peekedTagHeader, closingTag),
 		DoubleValue: doubleValue,
 	}
 	_result.BACnetFaultParameterFaultOutOfRangeMinNormalValueContract.(*_BACnetFaultParameterFaultOutOfRangeMinNormalValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger.go
index ebb1057456d..a580f2fdabb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger.go
@@ -59,12 +59,12 @@ var _ BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger = (*_BACnetFaultP
 var _ BACnetFaultParameterFaultOutOfRangeMinNormalValueRequirements = (*_BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger)(nil)
 
 // NewBACnetFaultParameterFaultOutOfRangeMinNormalValueInteger factory function for _BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger
-func NewBACnetFaultParameterFaultOutOfRangeMinNormalValueInteger(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, integerValue BACnetApplicationTagSignedInteger, tagNumber uint8) *_BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger {
+func NewBACnetFaultParameterFaultOutOfRangeMinNormalValueInteger(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, integerValue BACnetApplicationTagSignedInteger) *_BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger {
 	if integerValue == nil {
 		panic("integerValue of type BACnetApplicationTagSignedInteger for BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger must not be nil")
 	}
 	_result := &_BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger{
-		BACnetFaultParameterFaultOutOfRangeMinNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMinNormalValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetFaultParameterFaultOutOfRangeMinNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMinNormalValue(openingTag, peekedTagHeader, closingTag),
 		IntegerValue: integerValue,
 	}
 	_result.BACnetFaultParameterFaultOutOfRangeMinNormalValueContract.(*_BACnetFaultParameterFaultOutOfRangeMinNormalValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueReal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueReal.go
index 03789d62254..826dd34e9ea 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueReal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueReal.go
@@ -59,12 +59,12 @@ var _ BACnetFaultParameterFaultOutOfRangeMinNormalValueReal = (*_BACnetFaultPara
 var _ BACnetFaultParameterFaultOutOfRangeMinNormalValueRequirements = (*_BACnetFaultParameterFaultOutOfRangeMinNormalValueReal)(nil)
 
 // NewBACnetFaultParameterFaultOutOfRangeMinNormalValueReal factory function for _BACnetFaultParameterFaultOutOfRangeMinNormalValueReal
-func NewBACnetFaultParameterFaultOutOfRangeMinNormalValueReal(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, realValue BACnetApplicationTagReal, tagNumber uint8) *_BACnetFaultParameterFaultOutOfRangeMinNormalValueReal {
+func NewBACnetFaultParameterFaultOutOfRangeMinNormalValueReal(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, realValue BACnetApplicationTagReal) *_BACnetFaultParameterFaultOutOfRangeMinNormalValueReal {
 	if realValue == nil {
 		panic("realValue of type BACnetApplicationTagReal for BACnetFaultParameterFaultOutOfRangeMinNormalValueReal must not be nil")
 	}
 	_result := &_BACnetFaultParameterFaultOutOfRangeMinNormalValueReal{
-		BACnetFaultParameterFaultOutOfRangeMinNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMinNormalValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetFaultParameterFaultOutOfRangeMinNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMinNormalValue(openingTag, peekedTagHeader, closingTag),
 		RealValue: realValue,
 	}
 	_result.BACnetFaultParameterFaultOutOfRangeMinNormalValueContract.(*_BACnetFaultParameterFaultOutOfRangeMinNormalValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned.go
index 78d52970f41..3260aa6cedf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned.go
@@ -59,12 +59,12 @@ var _ BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned = (*_BACnetFault
 var _ BACnetFaultParameterFaultOutOfRangeMinNormalValueRequirements = (*_BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned)(nil)
 
 // NewBACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned factory function for _BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned
-func NewBACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, unsignedValue BACnetApplicationTagUnsignedInteger, tagNumber uint8) *_BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned {
+func NewBACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, unsignedValue BACnetApplicationTagUnsignedInteger) *_BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned {
 	if unsignedValue == nil {
 		panic("unsignedValue of type BACnetApplicationTagUnsignedInteger for BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned must not be nil")
 	}
 	_result := &_BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned{
-		BACnetFaultParameterFaultOutOfRangeMinNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMinNormalValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetFaultParameterFaultOutOfRangeMinNormalValueContract: NewBACnetFaultParameterFaultOutOfRangeMinNormalValue(openingTag, peekedTagHeader, closingTag),
 		UnsignedValue: unsignedValue,
 	}
 	_result.BACnetFaultParameterFaultOutOfRangeMinNormalValueContract.(*_BACnetFaultParameterFaultOutOfRangeMinNormalValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultStateListOfFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultStateListOfFaultValues.go
index 8f539eb6714..a6c2d00ac35 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultStateListOfFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultStateListOfFaultValues.go
@@ -57,22 +57,19 @@ type _BACnetFaultParameterFaultStateListOfFaultValues struct {
 	OpeningTag        BACnetOpeningTag
 	ListIfFaultValues []BACnetPropertyStates
 	ClosingTag        BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetFaultParameterFaultStateListOfFaultValues = (*_BACnetFaultParameterFaultStateListOfFaultValues)(nil)
 
 // NewBACnetFaultParameterFaultStateListOfFaultValues factory function for _BACnetFaultParameterFaultStateListOfFaultValues
-func NewBACnetFaultParameterFaultStateListOfFaultValues(openingTag BACnetOpeningTag, listIfFaultValues []BACnetPropertyStates, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetFaultParameterFaultStateListOfFaultValues {
+func NewBACnetFaultParameterFaultStateListOfFaultValues(openingTag BACnetOpeningTag, listIfFaultValues []BACnetPropertyStates, closingTag BACnetClosingTag) *_BACnetFaultParameterFaultStateListOfFaultValues {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetFaultParameterFaultStateListOfFaultValues must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetFaultParameterFaultStateListOfFaultValues must not be nil")
 	}
-	return &_BACnetFaultParameterFaultStateListOfFaultValues{OpeningTag: openingTag, ListIfFaultValues: listIfFaultValues, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetFaultParameterFaultStateListOfFaultValues{OpeningTag: openingTag, ListIfFaultValues: listIfFaultValues, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetFaultParameterFaultStateListOfFaultValuesBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetFaultParameterFaultStateListOfFaultValuesBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetFaultParameterFaultStateListOfFaultValuesBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetFaultParameterFaultStateListOfFaultValuesBuilder
 	// Build builds the BACnetFaultParameterFaultStateListOfFaultValues or returns an error if something is wrong
 	Build() (BACnetFaultParameterFaultStateListOfFaultValues, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetFaultParameterFaultStateListOfFaultValuesBuilder) WithClosingTag
 	return b
 }
 
-func (b *_BACnetFaultParameterFaultStateListOfFaultValuesBuilder) WithArgTagNumber(tagNumber uint8) BACnetFaultParameterFaultStateListOfFaultValuesBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetFaultParameterFaultStateListOfFaultValuesBuilder) Build() (BACnetFaultParameterFaultStateListOfFaultValues, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetFaultParameterFaultStateListOfFaultValuesParseWithBufferProducer(tagN
 }
 
 func BACnetFaultParameterFaultStateListOfFaultValuesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetFaultParameterFaultStateListOfFaultValues, error) {
-	v, err := (&_BACnetFaultParameterFaultStateListOfFaultValues{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetFaultParameterFaultStateListOfFaultValues)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetFaultParameterFaultStateListOfFaultValues) SerializeWithWriteBuf
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetFaultParameterFaultStateListOfFaultValues) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetFaultParameterFaultStateListOfFaultValues) IsBACnetFaultParameterFaultStateListOfFaultValues() {
 }
 
@@ -374,7 +354,6 @@ func (m *_BACnetFaultParameterFaultStateListOfFaultValues) deepCopy() *_BACnetFa
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetPropertyStates, BACnetPropertyStates](m.ListIfFaultValues),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetFaultParameterFaultStateListOfFaultValuesCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultTypeTagged.go
index 067a0ba9dd5..c13dc56ae19 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultTypeTagged.go
@@ -54,20 +54,16 @@ type BACnetFaultTypeTagged interface {
 type _BACnetFaultTypeTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetFaultType
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetFaultTypeTagged = (*_BACnetFaultTypeTagged)(nil)
 
 // NewBACnetFaultTypeTagged factory function for _BACnetFaultTypeTagged
-func NewBACnetFaultTypeTagged(header BACnetTagHeader, value BACnetFaultType, tagNumber uint8, tagClass TagClass) *_BACnetFaultTypeTagged {
+func NewBACnetFaultTypeTagged(header BACnetTagHeader, value BACnetFaultType) *_BACnetFaultTypeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetFaultTypeTagged must not be nil")
 	}
-	return &_BACnetFaultTypeTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetFaultTypeTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetFaultTypeTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetFaultTypeTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetFaultType) BACnetFaultTypeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetFaultTypeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetFaultTypeTaggedBuilder
 	// Build builds the BACnetFaultTypeTagged or returns an error if something is wrong
 	Build() (BACnetFaultTypeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetFaultTypeTaggedBuilder) WithValue(value BACnetFaultType) BACnetF
 	return b
 }
 
-func (b *_BACnetFaultTypeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetFaultTypeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetFaultTypeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetFaultTypeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetFaultTypeTaggedBuilder) Build() (BACnetFaultTypeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetFaultTypeTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagC
 }
 
 func BACnetFaultTypeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetFaultTypeTagged, error) {
-	v, err := (&_BACnetFaultTypeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetFaultTypeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetFaultTypeTagged) SerializeWithWriteBuffer(ctx context.Context, w
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetFaultTypeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetFaultTypeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetFaultTypeTagged) IsBACnetFaultTypeTagged() {}
 
 func (m *_BACnetFaultTypeTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetFaultTypeTagged) deepCopy() *_BACnetFaultTypeTagged {
 	_BACnetFaultTypeTaggedCopy := &_BACnetFaultTypeTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetFaultTypeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethodTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethodTagged.go
index 7657e9c3ff7..a69920490b7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethodTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethodTagged.go
@@ -54,20 +54,16 @@ type BACnetFileAccessMethodTagged interface {
 type _BACnetFileAccessMethodTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetFileAccessMethod
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetFileAccessMethodTagged = (*_BACnetFileAccessMethodTagged)(nil)
 
 // NewBACnetFileAccessMethodTagged factory function for _BACnetFileAccessMethodTagged
-func NewBACnetFileAccessMethodTagged(header BACnetTagHeader, value BACnetFileAccessMethod, tagNumber uint8, tagClass TagClass) *_BACnetFileAccessMethodTagged {
+func NewBACnetFileAccessMethodTagged(header BACnetTagHeader, value BACnetFileAccessMethod) *_BACnetFileAccessMethodTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetFileAccessMethodTagged must not be nil")
 	}
-	return &_BACnetFileAccessMethodTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetFileAccessMethodTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetFileAccessMethodTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetFileAccessMethodTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetFileAccessMethod) BACnetFileAccessMethodTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetFileAccessMethodTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetFileAccessMethodTaggedBuilder
 	// Build builds the BACnetFileAccessMethodTagged or returns an error if something is wrong
 	Build() (BACnetFileAccessMethodTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetFileAccessMethodTaggedBuilder) WithValue(value BACnetFileAccessM
 	return b
 }
 
-func (b *_BACnetFileAccessMethodTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetFileAccessMethodTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetFileAccessMethodTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetFileAccessMethodTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetFileAccessMethodTaggedBuilder) Build() (BACnetFileAccessMethodTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetFileAccessMethodTaggedParseWithBufferProducer(tagNumber uint8, tagCla
 }
 
 func BACnetFileAccessMethodTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetFileAccessMethodTagged, error) {
-	v, err := (&_BACnetFileAccessMethodTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetFileAccessMethodTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetFileAccessMethodTagged) SerializeWithWriteBuffer(ctx context.Con
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetFileAccessMethodTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetFileAccessMethodTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetFileAccessMethodTagged) IsBACnetFileAccessMethodTagged() {}
 
 func (m *_BACnetFileAccessMethodTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetFileAccessMethodTagged) deepCopy() *_BACnetFileAccessMethodTagge
 	_BACnetFileAccessMethodTaggedCopy := &_BACnetFileAccessMethodTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetFileAccessMethodTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValue.go
index e5bd8692e1c..49d793aa827 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValue.go
@@ -273,7 +273,7 @@ func BACnetGroupChannelValueParseWithBufferProducer() func(ctx context.Context,
 }
 
 func BACnetGroupChannelValueParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetGroupChannelValue, error) {
-	v, err := (&_BACnetGroupChannelValue{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetGroupChannelValue)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValueList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValueList.go
index 8ff5fd552c2..76ad4728fa3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValueList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValueList.go
@@ -57,22 +57,19 @@ type _BACnetGroupChannelValueList struct {
 	OpeningTag           BACnetOpeningTag
 	ListOfEventSummaries []BACnetEventSummary
 	ClosingTag           BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetGroupChannelValueList = (*_BACnetGroupChannelValueList)(nil)
 
 // NewBACnetGroupChannelValueList factory function for _BACnetGroupChannelValueList
-func NewBACnetGroupChannelValueList(openingTag BACnetOpeningTag, listOfEventSummaries []BACnetEventSummary, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetGroupChannelValueList {
+func NewBACnetGroupChannelValueList(openingTag BACnetOpeningTag, listOfEventSummaries []BACnetEventSummary, closingTag BACnetClosingTag) *_BACnetGroupChannelValueList {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetGroupChannelValueList must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetGroupChannelValueList must not be nil")
 	}
-	return &_BACnetGroupChannelValueList{OpeningTag: openingTag, ListOfEventSummaries: listOfEventSummaries, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetGroupChannelValueList{OpeningTag: openingTag, ListOfEventSummaries: listOfEventSummaries, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetGroupChannelValueListBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetGroupChannelValueListBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetGroupChannelValueListBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetGroupChannelValueListBuilder
 	// Build builds the BACnetGroupChannelValueList or returns an error if something is wrong
 	Build() (BACnetGroupChannelValueList, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetGroupChannelValueListBuilder) WithClosingTagBuilder(builderSuppl
 	return b
 }
 
-func (b *_BACnetGroupChannelValueListBuilder) WithArgTagNumber(tagNumber uint8) BACnetGroupChannelValueListBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetGroupChannelValueListBuilder) Build() (BACnetGroupChannelValueList, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetGroupChannelValueListParseWithBufferProducer(tagNumber uint8) func(ct
 }
 
 func BACnetGroupChannelValueListParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetGroupChannelValueList, error) {
-	v, err := (&_BACnetGroupChannelValueList{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetGroupChannelValueList)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetGroupChannelValueList) SerializeWithWriteBuffer(ctx context.Cont
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetGroupChannelValueList) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetGroupChannelValueList) IsBACnetGroupChannelValueList() {}
 
 func (m *_BACnetGroupChannelValueList) DeepCopy() any {
@@ -373,7 +353,6 @@ func (m *_BACnetGroupChannelValueList) deepCopy() *_BACnetGroupChannelValueList
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetEventSummary, BACnetEventSummary](m.ListOfEventSummaries),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetGroupChannelValueListCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddress.go
index 110b215a9df..4b25c5686fa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddress.go
@@ -325,7 +325,7 @@ func BACnetHostAddressParseWithBufferProducer[T BACnetHostAddress]() func(ctx co
 }
 
 func BACnetHostAddressParseWithBuffer[T BACnetHostAddress](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetHostAddress{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetHostAddress)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressEnclosed.go
index c0ab8a4a8d7..a2251bf6dfd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetHostAddressEnclosed struct {
 	OpeningTag  BACnetOpeningTag
 	HostAddress BACnetHostAddress
 	ClosingTag  BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetHostAddressEnclosed = (*_BACnetHostAddressEnclosed)(nil)
 
 // NewBACnetHostAddressEnclosed factory function for _BACnetHostAddressEnclosed
-func NewBACnetHostAddressEnclosed(openingTag BACnetOpeningTag, hostAddress BACnetHostAddress, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetHostAddressEnclosed {
+func NewBACnetHostAddressEnclosed(openingTag BACnetOpeningTag, hostAddress BACnetHostAddress, closingTag BACnetClosingTag) *_BACnetHostAddressEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetHostAddressEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetHostAddressEnclosed(openingTag BACnetOpeningTag, hostAddress BACne
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetHostAddressEnclosed must not be nil")
 	}
-	return &_BACnetHostAddressEnclosed{OpeningTag: openingTag, HostAddress: hostAddress, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetHostAddressEnclosed{OpeningTag: openingTag, HostAddress: hostAddress, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetHostAddressEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetHostAddressEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetHostAddressEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetHostAddressEnclosedBuilder
 	// Build builds the BACnetHostAddressEnclosed or returns an error if something is wrong
 	Build() (BACnetHostAddressEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetHostAddressEnclosedBuilder) WithClosingTagBuilder(builderSupplie
 	return b
 }
 
-func (b *_BACnetHostAddressEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetHostAddressEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetHostAddressEnclosedBuilder) Build() (BACnetHostAddressEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetHostAddressEnclosedParseWithBufferProducer(tagNumber uint8) func(ctx
 }
 
 func BACnetHostAddressEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetHostAddressEnclosed, error) {
-	v, err := (&_BACnetHostAddressEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetHostAddressEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetHostAddressEnclosed) SerializeWithWriteBuffer(ctx context.Contex
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetHostAddressEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetHostAddressEnclosed) IsBACnetHostAddressEnclosed() {}
 
 func (m *_BACnetHostAddressEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetHostAddressEnclosed) deepCopy() *_BACnetHostAddressEnclosed {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetHostAddress](m.HostAddress),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetHostAddressEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPort.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPort.go
index 8f0dd374cc0..18f7a54868b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPort.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPort.go
@@ -242,7 +242,7 @@ func BACnetHostNPortParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func BACnetHostNPortParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetHostNPort, error) {
-	v, err := (&_BACnetHostNPort{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetHostNPort)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPortEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPortEnclosed.go
index 5844597969d..62860f5f214 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPortEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPortEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetHostNPortEnclosed struct {
 	OpeningTag      BACnetOpeningTag
 	BacnetHostNPort BACnetHostNPort
 	ClosingTag      BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetHostNPortEnclosed = (*_BACnetHostNPortEnclosed)(nil)
 
 // NewBACnetHostNPortEnclosed factory function for _BACnetHostNPortEnclosed
-func NewBACnetHostNPortEnclosed(openingTag BACnetOpeningTag, bacnetHostNPort BACnetHostNPort, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetHostNPortEnclosed {
+func NewBACnetHostNPortEnclosed(openingTag BACnetOpeningTag, bacnetHostNPort BACnetHostNPort, closingTag BACnetClosingTag) *_BACnetHostNPortEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetHostNPortEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetHostNPortEnclosed(openingTag BACnetOpeningTag, bacnetHostNPort BAC
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetHostNPortEnclosed must not be nil")
 	}
-	return &_BACnetHostNPortEnclosed{OpeningTag: openingTag, BacnetHostNPort: bacnetHostNPort, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetHostNPortEnclosed{OpeningTag: openingTag, BacnetHostNPort: bacnetHostNPort, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetHostNPortEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetHostNPortEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetHostNPortEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetHostNPortEnclosedBuilder
 	// Build builds the BACnetHostNPortEnclosed or returns an error if something is wrong
 	Build() (BACnetHostNPortEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetHostNPortEnclosedBuilder) WithClosingTagBuilder(builderSupplier
 	return b
 }
 
-func (b *_BACnetHostNPortEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetHostNPortEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetHostNPortEnclosedBuilder) Build() (BACnetHostNPortEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetHostNPortEnclosedParseWithBufferProducer(tagNumber uint8) func(ctx co
 }
 
 func BACnetHostNPortEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetHostNPortEnclosed, error) {
-	v, err := (&_BACnetHostNPortEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetHostNPortEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetHostNPortEnclosed) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetHostNPortEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetHostNPortEnclosed) IsBACnetHostNPortEnclosed() {}
 
 func (m *_BACnetHostNPortEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetHostNPortEnclosed) deepCopy() *_BACnetHostNPortEnclosed {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetHostNPort](m.BacnetHostNPort),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetHostNPortEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetIPModeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetIPModeTagged.go
index 8a38440d1f1..fc4e07cd1ba 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetIPModeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetIPModeTagged.go
@@ -54,20 +54,16 @@ type BACnetIPModeTagged interface {
 type _BACnetIPModeTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetIPMode
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetIPModeTagged = (*_BACnetIPModeTagged)(nil)
 
 // NewBACnetIPModeTagged factory function for _BACnetIPModeTagged
-func NewBACnetIPModeTagged(header BACnetTagHeader, value BACnetIPMode, tagNumber uint8, tagClass TagClass) *_BACnetIPModeTagged {
+func NewBACnetIPModeTagged(header BACnetTagHeader, value BACnetIPMode) *_BACnetIPModeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetIPModeTagged must not be nil")
 	}
-	return &_BACnetIPModeTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetIPModeTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetIPModeTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetIPModeTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetIPMode) BACnetIPModeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetIPModeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetIPModeTaggedBuilder
 	// Build builds the BACnetIPModeTagged or returns an error if something is wrong
 	Build() (BACnetIPModeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetIPModeTaggedBuilder) WithValue(value BACnetIPMode) BACnetIPModeT
 	return b
 }
 
-func (b *_BACnetIPModeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetIPModeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetIPModeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetIPModeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetIPModeTaggedBuilder) Build() (BACnetIPModeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetIPModeTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagClas
 }
 
 func BACnetIPModeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetIPModeTagged, error) {
-	v, err := (&_BACnetIPModeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetIPModeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetIPModeTagged) SerializeWithWriteBuffer(ctx context.Context, writ
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetIPModeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetIPModeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetIPModeTagged) IsBACnetIPModeTagged() {}
 
 func (m *_BACnetIPModeTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetIPModeTagged) deepCopy() *_BACnetIPModeTagged {
 	_BACnetIPModeTaggedCopy := &_BACnetIPModeTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetIPModeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetKeyIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetKeyIdentifier.go
index 5f9f11a5a70..d78f842c480 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetKeyIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetKeyIdentifier.go
@@ -242,7 +242,7 @@ func BACnetKeyIdentifierParseWithBufferProducer() func(ctx context.Context, read
 }
 
 func BACnetKeyIdentifierParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetKeyIdentifier, error) {
-	v, err := (&_BACnetKeyIdentifier{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetKeyIdentifier)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatus.go
index 57ed270f231..ca9495d9329 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatus.go
@@ -273,7 +273,7 @@ func BACnetLandingCallStatusParseWithBufferProducer() func(ctx context.Context,
 }
 
 func BACnetLandingCallStatusParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetLandingCallStatus, error) {
-	v, err := (&_BACnetLandingCallStatus{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetLandingCallStatus)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommand.go
index ff485681fa5..2d1744ada25 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommand.go
@@ -313,7 +313,7 @@ func BACnetLandingCallStatusCommandParseWithBufferProducer[T BACnetLandingCallSt
 }
 
 func BACnetLandingCallStatusCommandParseWithBuffer[T BACnetLandingCallStatusCommand](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetLandingCallStatusCommand{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetLandingCallStatusCommand)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatus.go
index f2a27ceca23..bf2ec770a2c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatus.go
@@ -207,7 +207,7 @@ func BACnetLandingDoorStatusParseWithBufferProducer() func(ctx context.Context,
 }
 
 func BACnetLandingDoorStatusParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetLandingDoorStatus, error) {
-	v, err := (&_BACnetLandingDoorStatus{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetLandingDoorStatus)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsList.go
index 38457ff4c18..4bba0f4f524 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsList.go
@@ -57,22 +57,19 @@ type _BACnetLandingDoorStatusLandingDoorsList struct {
 	OpeningTag   BACnetOpeningTag
 	LandingDoors []BACnetLandingDoorStatusLandingDoorsListEntry
 	ClosingTag   BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetLandingDoorStatusLandingDoorsList = (*_BACnetLandingDoorStatusLandingDoorsList)(nil)
 
 // NewBACnetLandingDoorStatusLandingDoorsList factory function for _BACnetLandingDoorStatusLandingDoorsList
-func NewBACnetLandingDoorStatusLandingDoorsList(openingTag BACnetOpeningTag, landingDoors []BACnetLandingDoorStatusLandingDoorsListEntry, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetLandingDoorStatusLandingDoorsList {
+func NewBACnetLandingDoorStatusLandingDoorsList(openingTag BACnetOpeningTag, landingDoors []BACnetLandingDoorStatusLandingDoorsListEntry, closingTag BACnetClosingTag) *_BACnetLandingDoorStatusLandingDoorsList {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetLandingDoorStatusLandingDoorsList must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetLandingDoorStatusLandingDoorsList must not be nil")
 	}
-	return &_BACnetLandingDoorStatusLandingDoorsList{OpeningTag: openingTag, LandingDoors: landingDoors, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetLandingDoorStatusLandingDoorsList{OpeningTag: openingTag, LandingDoors: landingDoors, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetLandingDoorStatusLandingDoorsListBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetLandingDoorStatusLandingDoorsListBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetLandingDoorStatusLandingDoorsListBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLandingDoorStatusLandingDoorsListBuilder
 	// Build builds the BACnetLandingDoorStatusLandingDoorsList or returns an error if something is wrong
 	Build() (BACnetLandingDoorStatusLandingDoorsList, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetLandingDoorStatusLandingDoorsListBuilder) WithClosingTagBuilder(
 	return b
 }
 
-func (b *_BACnetLandingDoorStatusLandingDoorsListBuilder) WithArgTagNumber(tagNumber uint8) BACnetLandingDoorStatusLandingDoorsListBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetLandingDoorStatusLandingDoorsListBuilder) Build() (BACnetLandingDoorStatusLandingDoorsList, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetLandingDoorStatusLandingDoorsListParseWithBufferProducer(tagNumber ui
 }
 
 func BACnetLandingDoorStatusLandingDoorsListParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetLandingDoorStatusLandingDoorsList, error) {
-	v, err := (&_BACnetLandingDoorStatusLandingDoorsList{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetLandingDoorStatusLandingDoorsList)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetLandingDoorStatusLandingDoorsList) SerializeWithWriteBuffer(ctx
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLandingDoorStatusLandingDoorsList) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetLandingDoorStatusLandingDoorsList) IsBACnetLandingDoorStatusLandingDoorsList() {}
 
 func (m *_BACnetLandingDoorStatusLandingDoorsList) DeepCopy() any {
@@ -373,7 +353,6 @@ func (m *_BACnetLandingDoorStatusLandingDoorsList) deepCopy() *_BACnetLandingDoo
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetLandingDoorStatusLandingDoorsListEntry, BACnetLandingDoorStatusLandingDoorsListEntry](m.LandingDoors),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetLandingDoorStatusLandingDoorsListCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsListEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsListEntry.go
index ae50d367713..98a45272c9d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsListEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsListEntry.go
@@ -242,7 +242,7 @@ func BACnetLandingDoorStatusLandingDoorsListEntryParseWithBufferProducer() func(
 }
 
 func BACnetLandingDoorStatusLandingDoorsListEntryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetLandingDoorStatusLandingDoorsListEntry, error) {
-	v, err := (&_BACnetLandingDoorStatusLandingDoorsListEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetLandingDoorStatusLandingDoorsListEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyModeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyModeTagged.go
index 3972043bfae..6544d608203 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyModeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyModeTagged.go
@@ -59,20 +59,16 @@ type _BACnetLifeSafetyModeTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetLifeSafetyMode
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLifeSafetyModeTagged = (*_BACnetLifeSafetyModeTagged)(nil)
 
 // NewBACnetLifeSafetyModeTagged factory function for _BACnetLifeSafetyModeTagged
-func NewBACnetLifeSafetyModeTagged(header BACnetTagHeader, value BACnetLifeSafetyMode, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetLifeSafetyModeTagged {
+func NewBACnetLifeSafetyModeTagged(header BACnetTagHeader, value BACnetLifeSafetyMode, proprietaryValue uint32) *_BACnetLifeSafetyModeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLifeSafetyModeTagged must not be nil")
 	}
-	return &_BACnetLifeSafetyModeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLifeSafetyModeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetLifeSafetyModeTaggedBuilder interface {
 	WithValue(BACnetLifeSafetyMode) BACnetLifeSafetyModeTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetLifeSafetyModeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLifeSafetyModeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLifeSafetyModeTaggedBuilder
 	// Build builds the BACnetLifeSafetyModeTagged or returns an error if something is wrong
 	Build() (BACnetLifeSafetyModeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetLifeSafetyModeTaggedBuilder) WithProprietaryValue(proprietaryVal
 	return b
 }
 
-func (b *_BACnetLifeSafetyModeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLifeSafetyModeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLifeSafetyModeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLifeSafetyModeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLifeSafetyModeTaggedBuilder) Build() (BACnetLifeSafetyModeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetLifeSafetyModeTaggedParseWithBufferProducer(tagNumber uint8, tagClass
 }
 
 func BACnetLifeSafetyModeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLifeSafetyModeTagged, error) {
-	v, err := (&_BACnetLifeSafetyModeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLifeSafetyModeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetLifeSafetyModeTagged) SerializeWithWriteBuffer(ctx context.Conte
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLifeSafetyModeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLifeSafetyModeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLifeSafetyModeTagged) IsBACnetLifeSafetyModeTagged() {}
 
 func (m *_BACnetLifeSafetyModeTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetLifeSafetyModeTagged) deepCopy() *_BACnetLifeSafetyModeTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLifeSafetyModeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperationTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperationTagged.go
index 0b2656c82fe..26649307514 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperationTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperationTagged.go
@@ -59,20 +59,16 @@ type _BACnetLifeSafetyOperationTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetLifeSafetyOperation
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLifeSafetyOperationTagged = (*_BACnetLifeSafetyOperationTagged)(nil)
 
 // NewBACnetLifeSafetyOperationTagged factory function for _BACnetLifeSafetyOperationTagged
-func NewBACnetLifeSafetyOperationTagged(header BACnetTagHeader, value BACnetLifeSafetyOperation, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetLifeSafetyOperationTagged {
+func NewBACnetLifeSafetyOperationTagged(header BACnetTagHeader, value BACnetLifeSafetyOperation, proprietaryValue uint32) *_BACnetLifeSafetyOperationTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLifeSafetyOperationTagged must not be nil")
 	}
-	return &_BACnetLifeSafetyOperationTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLifeSafetyOperationTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetLifeSafetyOperationTaggedBuilder interface {
 	WithValue(BACnetLifeSafetyOperation) BACnetLifeSafetyOperationTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetLifeSafetyOperationTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLifeSafetyOperationTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLifeSafetyOperationTaggedBuilder
 	// Build builds the BACnetLifeSafetyOperationTagged or returns an error if something is wrong
 	Build() (BACnetLifeSafetyOperationTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetLifeSafetyOperationTaggedBuilder) WithProprietaryValue(proprieta
 	return b
 }
 
-func (b *_BACnetLifeSafetyOperationTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLifeSafetyOperationTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLifeSafetyOperationTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLifeSafetyOperationTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLifeSafetyOperationTaggedBuilder) Build() (BACnetLifeSafetyOperationTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetLifeSafetyOperationTaggedParseWithBufferProducer(tagNumber uint8, tag
 }
 
 func BACnetLifeSafetyOperationTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLifeSafetyOperationTagged, error) {
-	v, err := (&_BACnetLifeSafetyOperationTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLifeSafetyOperationTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetLifeSafetyOperationTagged) SerializeWithWriteBuffer(ctx context.
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLifeSafetyOperationTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLifeSafetyOperationTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLifeSafetyOperationTagged) IsBACnetLifeSafetyOperationTagged() {}
 
 func (m *_BACnetLifeSafetyOperationTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetLifeSafetyOperationTagged) deepCopy() *_BACnetLifeSafetyOperatio
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLifeSafetyOperationTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyStateTagged.go
index 63e5a668ec2..fece871c2f8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyStateTagged.go
@@ -59,20 +59,16 @@ type _BACnetLifeSafetyStateTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetLifeSafetyState
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLifeSafetyStateTagged = (*_BACnetLifeSafetyStateTagged)(nil)
 
 // NewBACnetLifeSafetyStateTagged factory function for _BACnetLifeSafetyStateTagged
-func NewBACnetLifeSafetyStateTagged(header BACnetTagHeader, value BACnetLifeSafetyState, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetLifeSafetyStateTagged {
+func NewBACnetLifeSafetyStateTagged(header BACnetTagHeader, value BACnetLifeSafetyState, proprietaryValue uint32) *_BACnetLifeSafetyStateTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLifeSafetyStateTagged must not be nil")
 	}
-	return &_BACnetLifeSafetyStateTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLifeSafetyStateTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetLifeSafetyStateTaggedBuilder interface {
 	WithValue(BACnetLifeSafetyState) BACnetLifeSafetyStateTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetLifeSafetyStateTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLifeSafetyStateTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLifeSafetyStateTaggedBuilder
 	// Build builds the BACnetLifeSafetyStateTagged or returns an error if something is wrong
 	Build() (BACnetLifeSafetyStateTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetLifeSafetyStateTaggedBuilder) WithProprietaryValue(proprietaryVa
 	return b
 }
 
-func (b *_BACnetLifeSafetyStateTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLifeSafetyStateTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLifeSafetyStateTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLifeSafetyStateTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLifeSafetyStateTaggedBuilder) Build() (BACnetLifeSafetyStateTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetLifeSafetyStateTaggedParseWithBufferProducer(tagNumber uint8, tagClas
 }
 
 func BACnetLifeSafetyStateTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLifeSafetyStateTagged, error) {
-	v, err := (&_BACnetLifeSafetyStateTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLifeSafetyStateTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetLifeSafetyStateTagged) SerializeWithWriteBuffer(ctx context.Cont
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLifeSafetyStateTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLifeSafetyStateTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLifeSafetyStateTagged) IsBACnetLifeSafetyStateTagged() {}
 
 func (m *_BACnetLifeSafetyStateTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetLifeSafetyStateTagged) deepCopy() *_BACnetLifeSafetyStateTagged
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLifeSafetyStateTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallList.go
index 2ad1ded0e7d..fcd0278e057 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallList.go
@@ -207,7 +207,7 @@ func BACnetLiftCarCallListParseWithBufferProducer() func(ctx context.Context, re
 }
 
 func BACnetLiftCarCallListParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetLiftCarCallList, error) {
-	v, err := (&_BACnetLiftCarCallList{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetLiftCarCallList)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallListFloorList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallListFloorList.go
index f9eccebe6c1..83146db7ab4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallListFloorList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallListFloorList.go
@@ -57,22 +57,19 @@ type _BACnetLiftCarCallListFloorList struct {
 	OpeningTag   BACnetOpeningTag
 	FloorNumbers []BACnetApplicationTagUnsignedInteger
 	ClosingTag   BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetLiftCarCallListFloorList = (*_BACnetLiftCarCallListFloorList)(nil)
 
 // NewBACnetLiftCarCallListFloorList factory function for _BACnetLiftCarCallListFloorList
-func NewBACnetLiftCarCallListFloorList(openingTag BACnetOpeningTag, floorNumbers []BACnetApplicationTagUnsignedInteger, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetLiftCarCallListFloorList {
+func NewBACnetLiftCarCallListFloorList(openingTag BACnetOpeningTag, floorNumbers []BACnetApplicationTagUnsignedInteger, closingTag BACnetClosingTag) *_BACnetLiftCarCallListFloorList {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetLiftCarCallListFloorList must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetLiftCarCallListFloorList must not be nil")
 	}
-	return &_BACnetLiftCarCallListFloorList{OpeningTag: openingTag, FloorNumbers: floorNumbers, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetLiftCarCallListFloorList{OpeningTag: openingTag, FloorNumbers: floorNumbers, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetLiftCarCallListFloorListBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetLiftCarCallListFloorListBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetLiftCarCallListFloorListBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLiftCarCallListFloorListBuilder
 	// Build builds the BACnetLiftCarCallListFloorList or returns an error if something is wrong
 	Build() (BACnetLiftCarCallListFloorList, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetLiftCarCallListFloorListBuilder) WithClosingTagBuilder(builderSu
 	return b
 }
 
-func (b *_BACnetLiftCarCallListFloorListBuilder) WithArgTagNumber(tagNumber uint8) BACnetLiftCarCallListFloorListBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetLiftCarCallListFloorListBuilder) Build() (BACnetLiftCarCallListFloorList, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetLiftCarCallListFloorListParseWithBufferProducer(tagNumber uint8) func
 }
 
 func BACnetLiftCarCallListFloorListParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetLiftCarCallListFloorList, error) {
-	v, err := (&_BACnetLiftCarCallListFloorList{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetLiftCarCallListFloorList)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetLiftCarCallListFloorList) SerializeWithWriteBuffer(ctx context.C
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLiftCarCallListFloorList) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetLiftCarCallListFloorList) IsBACnetLiftCarCallListFloorList() {}
 
 func (m *_BACnetLiftCarCallListFloorList) DeepCopy() any {
@@ -373,7 +353,6 @@ func (m *_BACnetLiftCarCallListFloorList) deepCopy() *_BACnetLiftCarCallListFloo
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetApplicationTagUnsignedInteger, BACnetApplicationTagUnsignedInteger](m.FloorNumbers),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetLiftCarCallListFloorListCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirectionTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirectionTagged.go
index 8830f0df0be..7d1135542aa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirectionTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirectionTagged.go
@@ -59,20 +59,16 @@ type _BACnetLiftCarDirectionTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetLiftCarDirection
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLiftCarDirectionTagged = (*_BACnetLiftCarDirectionTagged)(nil)
 
 // NewBACnetLiftCarDirectionTagged factory function for _BACnetLiftCarDirectionTagged
-func NewBACnetLiftCarDirectionTagged(header BACnetTagHeader, value BACnetLiftCarDirection, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetLiftCarDirectionTagged {
+func NewBACnetLiftCarDirectionTagged(header BACnetTagHeader, value BACnetLiftCarDirection, proprietaryValue uint32) *_BACnetLiftCarDirectionTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLiftCarDirectionTagged must not be nil")
 	}
-	return &_BACnetLiftCarDirectionTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLiftCarDirectionTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetLiftCarDirectionTaggedBuilder interface {
 	WithValue(BACnetLiftCarDirection) BACnetLiftCarDirectionTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetLiftCarDirectionTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLiftCarDirectionTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLiftCarDirectionTaggedBuilder
 	// Build builds the BACnetLiftCarDirectionTagged or returns an error if something is wrong
 	Build() (BACnetLiftCarDirectionTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetLiftCarDirectionTaggedBuilder) WithProprietaryValue(proprietaryV
 	return b
 }
 
-func (b *_BACnetLiftCarDirectionTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLiftCarDirectionTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLiftCarDirectionTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLiftCarDirectionTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLiftCarDirectionTaggedBuilder) Build() (BACnetLiftCarDirectionTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetLiftCarDirectionTaggedParseWithBufferProducer(tagNumber uint8, tagCla
 }
 
 func BACnetLiftCarDirectionTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLiftCarDirectionTagged, error) {
-	v, err := (&_BACnetLiftCarDirectionTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLiftCarDirectionTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetLiftCarDirectionTagged) SerializeWithWriteBuffer(ctx context.Con
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLiftCarDirectionTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLiftCarDirectionTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLiftCarDirectionTagged) IsBACnetLiftCarDirectionTagged() {}
 
 func (m *_BACnetLiftCarDirectionTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetLiftCarDirectionTagged) deepCopy() *_BACnetLiftCarDirectionTagge
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLiftCarDirectionTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommandTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommandTagged.go
index 1c125e96053..d78302e0549 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommandTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommandTagged.go
@@ -54,20 +54,16 @@ type BACnetLiftCarDoorCommandTagged interface {
 type _BACnetLiftCarDoorCommandTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetLiftCarDoorCommand
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLiftCarDoorCommandTagged = (*_BACnetLiftCarDoorCommandTagged)(nil)
 
 // NewBACnetLiftCarDoorCommandTagged factory function for _BACnetLiftCarDoorCommandTagged
-func NewBACnetLiftCarDoorCommandTagged(header BACnetTagHeader, value BACnetLiftCarDoorCommand, tagNumber uint8, tagClass TagClass) *_BACnetLiftCarDoorCommandTagged {
+func NewBACnetLiftCarDoorCommandTagged(header BACnetTagHeader, value BACnetLiftCarDoorCommand) *_BACnetLiftCarDoorCommandTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLiftCarDoorCommandTagged must not be nil")
 	}
-	return &_BACnetLiftCarDoorCommandTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLiftCarDoorCommandTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetLiftCarDoorCommandTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetLiftCarDoorCommandTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetLiftCarDoorCommand) BACnetLiftCarDoorCommandTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLiftCarDoorCommandTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLiftCarDoorCommandTaggedBuilder
 	// Build builds the BACnetLiftCarDoorCommandTagged or returns an error if something is wrong
 	Build() (BACnetLiftCarDoorCommandTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetLiftCarDoorCommandTaggedBuilder) WithValue(value BACnetLiftCarDo
 	return b
 }
 
-func (b *_BACnetLiftCarDoorCommandTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLiftCarDoorCommandTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLiftCarDoorCommandTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLiftCarDoorCommandTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLiftCarDoorCommandTaggedBuilder) Build() (BACnetLiftCarDoorCommandTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetLiftCarDoorCommandTaggedParseWithBufferProducer(tagNumber uint8, tagC
 }
 
 func BACnetLiftCarDoorCommandTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLiftCarDoorCommandTagged, error) {
-	v, err := (&_BACnetLiftCarDoorCommandTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLiftCarDoorCommandTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetLiftCarDoorCommandTagged) SerializeWithWriteBuffer(ctx context.C
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLiftCarDoorCommandTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLiftCarDoorCommandTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLiftCarDoorCommandTagged) IsBACnetLiftCarDoorCommandTagged() {}
 
 func (m *_BACnetLiftCarDoorCommandTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetLiftCarDoorCommandTagged) deepCopy() *_BACnetLiftCarDoorCommandT
 	_BACnetLiftCarDoorCommandTaggedCopy := &_BACnetLiftCarDoorCommandTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLiftCarDoorCommandTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatusTagged.go
index 86c142dede5..e9e317e251e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatusTagged.go
@@ -59,20 +59,16 @@ type _BACnetLiftCarDriveStatusTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetLiftCarDriveStatus
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLiftCarDriveStatusTagged = (*_BACnetLiftCarDriveStatusTagged)(nil)
 
 // NewBACnetLiftCarDriveStatusTagged factory function for _BACnetLiftCarDriveStatusTagged
-func NewBACnetLiftCarDriveStatusTagged(header BACnetTagHeader, value BACnetLiftCarDriveStatus, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetLiftCarDriveStatusTagged {
+func NewBACnetLiftCarDriveStatusTagged(header BACnetTagHeader, value BACnetLiftCarDriveStatus, proprietaryValue uint32) *_BACnetLiftCarDriveStatusTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLiftCarDriveStatusTagged must not be nil")
 	}
-	return &_BACnetLiftCarDriveStatusTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLiftCarDriveStatusTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetLiftCarDriveStatusTaggedBuilder interface {
 	WithValue(BACnetLiftCarDriveStatus) BACnetLiftCarDriveStatusTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetLiftCarDriveStatusTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLiftCarDriveStatusTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLiftCarDriveStatusTaggedBuilder
 	// Build builds the BACnetLiftCarDriveStatusTagged or returns an error if something is wrong
 	Build() (BACnetLiftCarDriveStatusTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetLiftCarDriveStatusTaggedBuilder) WithProprietaryValue(proprietar
 	return b
 }
 
-func (b *_BACnetLiftCarDriveStatusTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLiftCarDriveStatusTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLiftCarDriveStatusTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLiftCarDriveStatusTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLiftCarDriveStatusTaggedBuilder) Build() (BACnetLiftCarDriveStatusTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetLiftCarDriveStatusTaggedParseWithBufferProducer(tagNumber uint8, tagC
 }
 
 func BACnetLiftCarDriveStatusTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLiftCarDriveStatusTagged, error) {
-	v, err := (&_BACnetLiftCarDriveStatusTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLiftCarDriveStatusTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetLiftCarDriveStatusTagged) SerializeWithWriteBuffer(ctx context.C
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLiftCarDriveStatusTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLiftCarDriveStatusTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLiftCarDriveStatusTagged) IsBACnetLiftCarDriveStatusTagged() {}
 
 func (m *_BACnetLiftCarDriveStatusTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetLiftCarDriveStatusTagged) deepCopy() *_BACnetLiftCarDriveStatusT
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLiftCarDriveStatusTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarModeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarModeTagged.go
index 6f1bd719690..edb1d44f8be 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarModeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarModeTagged.go
@@ -59,20 +59,16 @@ type _BACnetLiftCarModeTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetLiftCarMode
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLiftCarModeTagged = (*_BACnetLiftCarModeTagged)(nil)
 
 // NewBACnetLiftCarModeTagged factory function for _BACnetLiftCarModeTagged
-func NewBACnetLiftCarModeTagged(header BACnetTagHeader, value BACnetLiftCarMode, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetLiftCarModeTagged {
+func NewBACnetLiftCarModeTagged(header BACnetTagHeader, value BACnetLiftCarMode, proprietaryValue uint32) *_BACnetLiftCarModeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLiftCarModeTagged must not be nil")
 	}
-	return &_BACnetLiftCarModeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLiftCarModeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetLiftCarModeTaggedBuilder interface {
 	WithValue(BACnetLiftCarMode) BACnetLiftCarModeTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetLiftCarModeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLiftCarModeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLiftCarModeTaggedBuilder
 	// Build builds the BACnetLiftCarModeTagged or returns an error if something is wrong
 	Build() (BACnetLiftCarModeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetLiftCarModeTaggedBuilder) WithProprietaryValue(proprietaryValue
 	return b
 }
 
-func (b *_BACnetLiftCarModeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLiftCarModeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLiftCarModeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLiftCarModeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLiftCarModeTaggedBuilder) Build() (BACnetLiftCarModeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetLiftCarModeTaggedParseWithBufferProducer(tagNumber uint8, tagClass Ta
 }
 
 func BACnetLiftCarModeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLiftCarModeTagged, error) {
-	v, err := (&_BACnetLiftCarModeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLiftCarModeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetLiftCarModeTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLiftCarModeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLiftCarModeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLiftCarModeTagged) IsBACnetLiftCarModeTagged() {}
 
 func (m *_BACnetLiftCarModeTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetLiftCarModeTagged) deepCopy() *_BACnetLiftCarModeTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLiftCarModeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFaultTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFaultTagged.go
index e7ba7bd195a..e093b7fdcc5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFaultTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFaultTagged.go
@@ -59,20 +59,16 @@ type _BACnetLiftFaultTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetLiftFault
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLiftFaultTagged = (*_BACnetLiftFaultTagged)(nil)
 
 // NewBACnetLiftFaultTagged factory function for _BACnetLiftFaultTagged
-func NewBACnetLiftFaultTagged(header BACnetTagHeader, value BACnetLiftFault, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetLiftFaultTagged {
+func NewBACnetLiftFaultTagged(header BACnetTagHeader, value BACnetLiftFault, proprietaryValue uint32) *_BACnetLiftFaultTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLiftFaultTagged must not be nil")
 	}
-	return &_BACnetLiftFaultTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLiftFaultTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetLiftFaultTaggedBuilder interface {
 	WithValue(BACnetLiftFault) BACnetLiftFaultTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetLiftFaultTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLiftFaultTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLiftFaultTaggedBuilder
 	// Build builds the BACnetLiftFaultTagged or returns an error if something is wrong
 	Build() (BACnetLiftFaultTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetLiftFaultTaggedBuilder) WithProprietaryValue(proprietaryValue ui
 	return b
 }
 
-func (b *_BACnetLiftFaultTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLiftFaultTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLiftFaultTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLiftFaultTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLiftFaultTaggedBuilder) Build() (BACnetLiftFaultTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetLiftFaultTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagC
 }
 
 func BACnetLiftFaultTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLiftFaultTagged, error) {
-	v, err := (&_BACnetLiftFaultTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLiftFaultTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetLiftFaultTagged) SerializeWithWriteBuffer(ctx context.Context, w
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLiftFaultTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLiftFaultTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLiftFaultTagged) IsBACnetLiftFaultTagged() {}
 
 func (m *_BACnetLiftFaultTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetLiftFaultTagged) deepCopy() *_BACnetLiftFaultTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLiftFaultTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupModeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupModeTagged.go
index 92db87042bf..67944f493ff 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupModeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupModeTagged.go
@@ -54,20 +54,16 @@ type BACnetLiftGroupModeTagged interface {
 type _BACnetLiftGroupModeTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetLiftGroupMode
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLiftGroupModeTagged = (*_BACnetLiftGroupModeTagged)(nil)
 
 // NewBACnetLiftGroupModeTagged factory function for _BACnetLiftGroupModeTagged
-func NewBACnetLiftGroupModeTagged(header BACnetTagHeader, value BACnetLiftGroupMode, tagNumber uint8, tagClass TagClass) *_BACnetLiftGroupModeTagged {
+func NewBACnetLiftGroupModeTagged(header BACnetTagHeader, value BACnetLiftGroupMode) *_BACnetLiftGroupModeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLiftGroupModeTagged must not be nil")
 	}
-	return &_BACnetLiftGroupModeTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLiftGroupModeTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetLiftGroupModeTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetLiftGroupModeTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetLiftGroupMode) BACnetLiftGroupModeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLiftGroupModeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLiftGroupModeTaggedBuilder
 	// Build builds the BACnetLiftGroupModeTagged or returns an error if something is wrong
 	Build() (BACnetLiftGroupModeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetLiftGroupModeTaggedBuilder) WithValue(value BACnetLiftGroupMode)
 	return b
 }
 
-func (b *_BACnetLiftGroupModeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLiftGroupModeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLiftGroupModeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLiftGroupModeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLiftGroupModeTaggedBuilder) Build() (BACnetLiftGroupModeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetLiftGroupModeTaggedParseWithBufferProducer(tagNumber uint8, tagClass
 }
 
 func BACnetLiftGroupModeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLiftGroupModeTagged, error) {
-	v, err := (&_BACnetLiftGroupModeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLiftGroupModeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetLiftGroupModeTagged) SerializeWithWriteBuffer(ctx context.Contex
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLiftGroupModeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLiftGroupModeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLiftGroupModeTagged) IsBACnetLiftGroupModeTagged() {}
 
 func (m *_BACnetLiftGroupModeTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetLiftGroupModeTagged) deepCopy() *_BACnetLiftGroupModeTagged {
 	_BACnetLiftGroupModeTaggedCopy := &_BACnetLiftGroupModeTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLiftGroupModeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommand.go
index 418985d0c2f..c6f9c146fcf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommand.go
@@ -362,7 +362,7 @@ func BACnetLightingCommandParseWithBufferProducer() func(ctx context.Context, re
 }
 
 func BACnetLightingCommandParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetLightingCommand, error) {
-	v, err := (&_BACnetLightingCommand{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetLightingCommand)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommandEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommandEnclosed.go
index e2ad4b11eac..00bfad1f7dd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommandEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommandEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetLightingCommandEnclosed struct {
 	OpeningTag      BACnetOpeningTag
 	LightingCommand BACnetLightingCommand
 	ClosingTag      BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetLightingCommandEnclosed = (*_BACnetLightingCommandEnclosed)(nil)
 
 // NewBACnetLightingCommandEnclosed factory function for _BACnetLightingCommandEnclosed
-func NewBACnetLightingCommandEnclosed(openingTag BACnetOpeningTag, lightingCommand BACnetLightingCommand, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetLightingCommandEnclosed {
+func NewBACnetLightingCommandEnclosed(openingTag BACnetOpeningTag, lightingCommand BACnetLightingCommand, closingTag BACnetClosingTag) *_BACnetLightingCommandEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetLightingCommandEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetLightingCommandEnclosed(openingTag BACnetOpeningTag, lightingComma
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetLightingCommandEnclosed must not be nil")
 	}
-	return &_BACnetLightingCommandEnclosed{OpeningTag: openingTag, LightingCommand: lightingCommand, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetLightingCommandEnclosed{OpeningTag: openingTag, LightingCommand: lightingCommand, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetLightingCommandEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetLightingCommandEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetLightingCommandEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLightingCommandEnclosedBuilder
 	// Build builds the BACnetLightingCommandEnclosed or returns an error if something is wrong
 	Build() (BACnetLightingCommandEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetLightingCommandEnclosedBuilder) WithClosingTagBuilder(builderSup
 	return b
 }
 
-func (b *_BACnetLightingCommandEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLightingCommandEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetLightingCommandEnclosedBuilder) Build() (BACnetLightingCommandEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetLightingCommandEnclosedParseWithBufferProducer(tagNumber uint8) func(
 }
 
 func BACnetLightingCommandEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetLightingCommandEnclosed, error) {
-	v, err := (&_BACnetLightingCommandEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetLightingCommandEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetLightingCommandEnclosed) SerializeWithWriteBuffer(ctx context.Co
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLightingCommandEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetLightingCommandEnclosed) IsBACnetLightingCommandEnclosed() {}
 
 func (m *_BACnetLightingCommandEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetLightingCommandEnclosed) deepCopy() *_BACnetLightingCommandEnclo
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetLightingCommand](m.LightingCommand),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetLightingCommandEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgressTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgressTagged.go
index 3a05de03b7f..32eb00930ae 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgressTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgressTagged.go
@@ -54,20 +54,16 @@ type BACnetLightingInProgressTagged interface {
 type _BACnetLightingInProgressTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetLightingInProgress
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLightingInProgressTagged = (*_BACnetLightingInProgressTagged)(nil)
 
 // NewBACnetLightingInProgressTagged factory function for _BACnetLightingInProgressTagged
-func NewBACnetLightingInProgressTagged(header BACnetTagHeader, value BACnetLightingInProgress, tagNumber uint8, tagClass TagClass) *_BACnetLightingInProgressTagged {
+func NewBACnetLightingInProgressTagged(header BACnetTagHeader, value BACnetLightingInProgress) *_BACnetLightingInProgressTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLightingInProgressTagged must not be nil")
 	}
-	return &_BACnetLightingInProgressTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLightingInProgressTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetLightingInProgressTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetLightingInProgressTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetLightingInProgress) BACnetLightingInProgressTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLightingInProgressTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLightingInProgressTaggedBuilder
 	// Build builds the BACnetLightingInProgressTagged or returns an error if something is wrong
 	Build() (BACnetLightingInProgressTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetLightingInProgressTaggedBuilder) WithValue(value BACnetLightingI
 	return b
 }
 
-func (b *_BACnetLightingInProgressTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLightingInProgressTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLightingInProgressTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLightingInProgressTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLightingInProgressTaggedBuilder) Build() (BACnetLightingInProgressTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetLightingInProgressTaggedParseWithBufferProducer(tagNumber uint8, tagC
 }
 
 func BACnetLightingInProgressTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLightingInProgressTagged, error) {
-	v, err := (&_BACnetLightingInProgressTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLightingInProgressTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetLightingInProgressTagged) SerializeWithWriteBuffer(ctx context.C
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLightingInProgressTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLightingInProgressTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLightingInProgressTagged) IsBACnetLightingInProgressTagged() {}
 
 func (m *_BACnetLightingInProgressTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetLightingInProgressTagged) deepCopy() *_BACnetLightingInProgressT
 	_BACnetLightingInProgressTaggedCopy := &_BACnetLightingInProgressTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLightingInProgressTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperationTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperationTagged.go
index 5781d5a4f8f..8bf707c36a5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperationTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperationTagged.go
@@ -59,20 +59,16 @@ type _BACnetLightingOperationTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetLightingOperation
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLightingOperationTagged = (*_BACnetLightingOperationTagged)(nil)
 
 // NewBACnetLightingOperationTagged factory function for _BACnetLightingOperationTagged
-func NewBACnetLightingOperationTagged(header BACnetTagHeader, value BACnetLightingOperation, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetLightingOperationTagged {
+func NewBACnetLightingOperationTagged(header BACnetTagHeader, value BACnetLightingOperation, proprietaryValue uint32) *_BACnetLightingOperationTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLightingOperationTagged must not be nil")
 	}
-	return &_BACnetLightingOperationTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLightingOperationTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetLightingOperationTaggedBuilder interface {
 	WithValue(BACnetLightingOperation) BACnetLightingOperationTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetLightingOperationTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLightingOperationTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLightingOperationTaggedBuilder
 	// Build builds the BACnetLightingOperationTagged or returns an error if something is wrong
 	Build() (BACnetLightingOperationTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetLightingOperationTaggedBuilder) WithProprietaryValue(proprietary
 	return b
 }
 
-func (b *_BACnetLightingOperationTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLightingOperationTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLightingOperationTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLightingOperationTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLightingOperationTaggedBuilder) Build() (BACnetLightingOperationTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetLightingOperationTaggedParseWithBufferProducer(tagNumber uint8, tagCl
 }
 
 func BACnetLightingOperationTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLightingOperationTagged, error) {
-	v, err := (&_BACnetLightingOperationTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLightingOperationTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetLightingOperationTagged) SerializeWithWriteBuffer(ctx context.Co
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLightingOperationTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLightingOperationTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLightingOperationTagged) IsBACnetLightingOperationTagged() {}
 
 func (m *_BACnetLightingOperationTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetLightingOperationTagged) deepCopy() *_BACnetLightingOperationTag
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLightingOperationTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransitionTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransitionTagged.go
index 929234c7eaf..4bb713caca6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransitionTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransitionTagged.go
@@ -59,20 +59,16 @@ type _BACnetLightingTransitionTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetLightingTransition
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLightingTransitionTagged = (*_BACnetLightingTransitionTagged)(nil)
 
 // NewBACnetLightingTransitionTagged factory function for _BACnetLightingTransitionTagged
-func NewBACnetLightingTransitionTagged(header BACnetTagHeader, value BACnetLightingTransition, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetLightingTransitionTagged {
+func NewBACnetLightingTransitionTagged(header BACnetTagHeader, value BACnetLightingTransition, proprietaryValue uint32) *_BACnetLightingTransitionTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLightingTransitionTagged must not be nil")
 	}
-	return &_BACnetLightingTransitionTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLightingTransitionTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetLightingTransitionTaggedBuilder interface {
 	WithValue(BACnetLightingTransition) BACnetLightingTransitionTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetLightingTransitionTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLightingTransitionTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLightingTransitionTaggedBuilder
 	// Build builds the BACnetLightingTransitionTagged or returns an error if something is wrong
 	Build() (BACnetLightingTransitionTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetLightingTransitionTaggedBuilder) WithProprietaryValue(proprietar
 	return b
 }
 
-func (b *_BACnetLightingTransitionTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLightingTransitionTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLightingTransitionTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLightingTransitionTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLightingTransitionTaggedBuilder) Build() (BACnetLightingTransitionTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetLightingTransitionTaggedParseWithBufferProducer(tagNumber uint8, tagC
 }
 
 func BACnetLightingTransitionTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLightingTransitionTagged, error) {
-	v, err := (&_BACnetLightingTransitionTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLightingTransitionTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetLightingTransitionTagged) SerializeWithWriteBuffer(ctx context.C
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLightingTransitionTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLightingTransitionTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLightingTransitionTagged) IsBACnetLightingTransitionTagged() {}
 
 func (m *_BACnetLightingTransitionTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetLightingTransitionTagged) deepCopy() *_BACnetLightingTransitionT
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLightingTransitionTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnableTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnableTagged.go
index fc31de62203..93be9f96e51 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnableTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnableTagged.go
@@ -58,23 +58,19 @@ type BACnetLimitEnableTagged interface {
 type _BACnetLimitEnableTagged struct {
 	Header  BACnetTagHeader
 	Payload BACnetTagPayloadBitString
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLimitEnableTagged = (*_BACnetLimitEnableTagged)(nil)
 
 // NewBACnetLimitEnableTagged factory function for _BACnetLimitEnableTagged
-func NewBACnetLimitEnableTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString, tagNumber uint8, tagClass TagClass) *_BACnetLimitEnableTagged {
+func NewBACnetLimitEnableTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString) *_BACnetLimitEnableTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLimitEnableTagged must not be nil")
 	}
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadBitString for BACnetLimitEnableTagged must not be nil")
 	}
-	return &_BACnetLimitEnableTagged{Header: header, Payload: payload, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLimitEnableTagged{Header: header, Payload: payload}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,10 +91,6 @@ type BACnetLimitEnableTaggedBuilder interface {
 	WithPayload(BACnetTagPayloadBitString) BACnetLimitEnableTaggedBuilder
 	// WithPayloadBuilder adds Payload (property field) which is build by the builder
 	WithPayloadBuilder(func(BACnetTagPayloadBitStringBuilder) BACnetTagPayloadBitStringBuilder) BACnetLimitEnableTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLimitEnableTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLimitEnableTaggedBuilder
 	// Build builds the BACnetLimitEnableTagged or returns an error if something is wrong
 	Build() (BACnetLimitEnableTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -152,15 +144,6 @@ func (b *_BACnetLimitEnableTaggedBuilder) WithPayloadBuilder(builderSupplier fun
 	return b
 }
 
-func (b *_BACnetLimitEnableTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLimitEnableTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLimitEnableTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLimitEnableTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLimitEnableTaggedBuilder) Build() (BACnetLimitEnableTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -288,7 +271,7 @@ func BACnetLimitEnableTaggedParseWithBufferProducer(tagNumber uint8, tagClass Ta
 }
 
 func BACnetLimitEnableTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLimitEnableTagged, error) {
-	v, err := (&_BACnetLimitEnableTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLimitEnableTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -388,19 +371,6 @@ func (m *_BACnetLimitEnableTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLimitEnableTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLimitEnableTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLimitEnableTagged) IsBACnetLimitEnableTagged() {}
 
 func (m *_BACnetLimitEnableTagged) DeepCopy() any {
@@ -414,8 +384,6 @@ func (m *_BACnetLimitEnableTagged) deepCopy() *_BACnetLimitEnableTagged {
 	_BACnetLimitEnableTaggedCopy := &_BACnetLimitEnableTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		utils.DeepCopy[BACnetTagPayloadBitString](m.Payload),
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLimitEnableTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatusTagged.go
index 15b331ba8c6..0f28506fe41 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatusTagged.go
@@ -54,20 +54,16 @@ type BACnetLockStatusTagged interface {
 type _BACnetLockStatusTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetLockStatus
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLockStatusTagged = (*_BACnetLockStatusTagged)(nil)
 
 // NewBACnetLockStatusTagged factory function for _BACnetLockStatusTagged
-func NewBACnetLockStatusTagged(header BACnetTagHeader, value BACnetLockStatus, tagNumber uint8, tagClass TagClass) *_BACnetLockStatusTagged {
+func NewBACnetLockStatusTagged(header BACnetTagHeader, value BACnetLockStatus) *_BACnetLockStatusTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLockStatusTagged must not be nil")
 	}
-	return &_BACnetLockStatusTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLockStatusTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetLockStatusTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetLockStatusTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetLockStatus) BACnetLockStatusTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLockStatusTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLockStatusTaggedBuilder
 	// Build builds the BACnetLockStatusTagged or returns an error if something is wrong
 	Build() (BACnetLockStatusTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetLockStatusTaggedBuilder) WithValue(value BACnetLockStatus) BACne
 	return b
 }
 
-func (b *_BACnetLockStatusTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLockStatusTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLockStatusTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLockStatusTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLockStatusTaggedBuilder) Build() (BACnetLockStatusTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetLockStatusTaggedParseWithBufferProducer(tagNumber uint8, tagClass Tag
 }
 
 func BACnetLockStatusTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLockStatusTagged, error) {
-	v, err := (&_BACnetLockStatusTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLockStatusTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetLockStatusTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLockStatusTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLockStatusTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLockStatusTagged) IsBACnetLockStatusTagged() {}
 
 func (m *_BACnetLockStatusTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetLockStatusTagged) deepCopy() *_BACnetLockStatusTagged {
 	_BACnetLockStatusTaggedCopy := &_BACnetLockStatusTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLockStatusTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogData.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogData.go
index d6e47733512..a64b60ebb2b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogData.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogData.go
@@ -58,8 +58,6 @@ type BACnetLogDataContract interface {
 	GetClosingTag() BACnetClosingTag
 	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
-	// GetTagNumber() returns a parser argument
-	GetTagNumber() uint8
 	// IsBACnetLogData is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetLogData()
 	// CreateBuilder creates a BACnetLogDataBuilder
@@ -83,15 +81,12 @@ type _BACnetLogData struct {
 	OpeningTag      BACnetOpeningTag
 	PeekedTagHeader BACnetTagHeader
 	ClosingTag      BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetLogDataContract = (*_BACnetLogData)(nil)
 
 // NewBACnetLogData factory function for _BACnetLogData
-func NewBACnetLogData(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetLogData {
+func NewBACnetLogData(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetLogData {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetLogData must not be nil")
 	}
@@ -101,7 +96,7 @@ func NewBACnetLogData(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHead
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetLogData must not be nil")
 	}
-	return &_BACnetLogData{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetLogData{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -126,8 +121,6 @@ type BACnetLogDataBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetLogDataBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetLogDataBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLogDataBuilder
 	// AsBACnetLogDataLogStatus converts this build to a subType of BACnetLogData. It is always possible to return to current builder using Done()
 	AsBACnetLogDataLogStatus() BACnetLogDataLogStatusBuilder
 	// AsBACnetLogDataLogData converts this build to a subType of BACnetLogData. It is always possible to return to current builder using Done()
@@ -214,11 +207,6 @@ func (b *_BACnetLogDataBuilder) WithClosingTagBuilder(builderSupplier func(BACne
 	return b
 }
 
-func (b *_BACnetLogDataBuilder) WithArgTagNumber(tagNumber uint8) BACnetLogDataBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetLogDataBuilder) PartialBuild() (BACnetLogDataContract, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -407,7 +395,7 @@ func BACnetLogDataParseWithBufferProducer[T BACnetLogData](tagNumber uint8) func
 }
 
 func BACnetLogDataParseWithBuffer[T BACnetLogData](ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (T, error) {
-	v, err := (&_BACnetLogData{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetLogData)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -516,16 +504,6 @@ func (pm *_BACnetLogData) serializeParent(ctx context.Context, writeBuffer utils
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLogData) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetLogData) IsBACnetLogData() {}
 
 func (m *_BACnetLogData) DeepCopy() any {
@@ -541,7 +519,6 @@ func (m *_BACnetLogData) deepCopy() *_BACnetLogData {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetTagHeader](m.PeekedTagHeader),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetLogDataCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogData.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogData.go
index 779058d88c2..99bd9545db3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogData.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogData.go
@@ -65,7 +65,7 @@ var _ BACnetLogDataLogData = (*_BACnetLogDataLogData)(nil)
 var _ BACnetLogDataRequirements = (*_BACnetLogDataLogData)(nil)
 
 // NewBACnetLogDataLogData factory function for _BACnetLogDataLogData
-func NewBACnetLogDataLogData(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, logData []BACnetLogDataLogDataEntry, innerClosingTag BACnetClosingTag, tagNumber uint8) *_BACnetLogDataLogData {
+func NewBACnetLogDataLogData(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, logData []BACnetLogDataLogDataEntry, innerClosingTag BACnetClosingTag) *_BACnetLogDataLogData {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetLogDataLogData must not be nil")
 	}
@@ -73,7 +73,7 @@ func NewBACnetLogDataLogData(openingTag BACnetOpeningTag, peekedTagHeader BACnet
 		panic("innerClosingTag of type BACnetClosingTag for BACnetLogDataLogData must not be nil")
 	}
 	_result := &_BACnetLogDataLogData{
-		BACnetLogDataContract: NewBACnetLogData(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetLogDataContract: NewBACnetLogData(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:       innerOpeningTag,
 		LogData:               logData,
 		InnerClosingTag:       innerClosingTag,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntry.go
index ea2e1131568..eda0e4382f8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntry.go
@@ -397,7 +397,7 @@ func BACnetLogDataLogDataEntryParseWithBufferProducer[T BACnetLogDataLogDataEntr
 }
 
 func BACnetLogDataLogDataEntryParseWithBuffer[T BACnetLogDataLogDataEntry](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetLogDataLogDataEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetLogDataLogDataEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataTimeChange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataTimeChange.go
index 0cbf7235244..952754e6a54 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataTimeChange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataTimeChange.go
@@ -59,12 +59,12 @@ var _ BACnetLogDataLogDataTimeChange = (*_BACnetLogDataLogDataTimeChange)(nil)
 var _ BACnetLogDataRequirements = (*_BACnetLogDataLogDataTimeChange)(nil)
 
 // NewBACnetLogDataLogDataTimeChange factory function for _BACnetLogDataLogDataTimeChange
-func NewBACnetLogDataLogDataTimeChange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeChange BACnetContextTagReal, tagNumber uint8) *_BACnetLogDataLogDataTimeChange {
+func NewBACnetLogDataLogDataTimeChange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeChange BACnetContextTagReal) *_BACnetLogDataLogDataTimeChange {
 	if timeChange == nil {
 		panic("timeChange of type BACnetContextTagReal for BACnetLogDataLogDataTimeChange must not be nil")
 	}
 	_result := &_BACnetLogDataLogDataTimeChange{
-		BACnetLogDataContract: NewBACnetLogData(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetLogDataContract: NewBACnetLogData(openingTag, peekedTagHeader, closingTag),
 		TimeChange:            timeChange,
 	}
 	_result.BACnetLogDataContract.(*_BACnetLogData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogStatus.go
index 336179956d1..85232dcbc21 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogStatus.go
@@ -59,12 +59,12 @@ var _ BACnetLogDataLogStatus = (*_BACnetLogDataLogStatus)(nil)
 var _ BACnetLogDataRequirements = (*_BACnetLogDataLogStatus)(nil)
 
 // NewBACnetLogDataLogStatus factory function for _BACnetLogDataLogStatus
-func NewBACnetLogDataLogStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, logStatus BACnetLogStatusTagged, tagNumber uint8) *_BACnetLogDataLogStatus {
+func NewBACnetLogDataLogStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, logStatus BACnetLogStatusTagged) *_BACnetLogDataLogStatus {
 	if logStatus == nil {
 		panic("logStatus of type BACnetLogStatusTagged for BACnetLogDataLogStatus must not be nil")
 	}
 	_result := &_BACnetLogDataLogStatus{
-		BACnetLogDataContract: NewBACnetLogData(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetLogDataContract: NewBACnetLogData(openingTag, peekedTagHeader, closingTag),
 		LogStatus:             logStatus,
 	}
 	_result.BACnetLogDataContract.(*_BACnetLogData)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogMultipleRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogMultipleRecord.go
index 0add9e6809a..81dd3e0bbe7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogMultipleRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogMultipleRecord.go
@@ -242,7 +242,7 @@ func BACnetLogMultipleRecordParseWithBufferProducer() func(ctx context.Context,
 }
 
 func BACnetLogMultipleRecordParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetLogMultipleRecord, error) {
-	v, err := (&_BACnetLogMultipleRecord{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetLogMultipleRecord)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecord.go
index 1f5b20d4b46..59d112bb456 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecord.go
@@ -273,7 +273,7 @@ func BACnetLogRecordParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func BACnetLogRecordParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetLogRecord, error) {
-	v, err := (&_BACnetLogRecord{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetLogRecord)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatum.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatum.go
index ffeeb97ad9e..4ffcc9566ae 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatum.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatum.go
@@ -58,8 +58,6 @@ type BACnetLogRecordLogDatumContract interface {
 	GetClosingTag() BACnetClosingTag
 	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
-	// GetTagNumber() returns a parser argument
-	GetTagNumber() uint8
 	// IsBACnetLogRecordLogDatum is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetLogRecordLogDatum()
 	// CreateBuilder creates a BACnetLogRecordLogDatumBuilder
@@ -83,15 +81,12 @@ type _BACnetLogRecordLogDatum struct {
 	OpeningTag      BACnetOpeningTag
 	PeekedTagHeader BACnetTagHeader
 	ClosingTag      BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetLogRecordLogDatumContract = (*_BACnetLogRecordLogDatum)(nil)
 
 // NewBACnetLogRecordLogDatum factory function for _BACnetLogRecordLogDatum
-func NewBACnetLogRecordLogDatum(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetLogRecordLogDatum {
+func NewBACnetLogRecordLogDatum(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetLogRecordLogDatum {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetLogRecordLogDatum must not be nil")
 	}
@@ -101,7 +96,7 @@ func NewBACnetLogRecordLogDatum(openingTag BACnetOpeningTag, peekedTagHeader BAC
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetLogRecordLogDatum must not be nil")
 	}
-	return &_BACnetLogRecordLogDatum{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetLogRecordLogDatum{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -126,8 +121,6 @@ type BACnetLogRecordLogDatumBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetLogRecordLogDatumBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetLogRecordLogDatumBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLogRecordLogDatumBuilder
 	// AsBACnetLogRecordLogDatumLogStatus converts this build to a subType of BACnetLogRecordLogDatum. It is always possible to return to current builder using Done()
 	AsBACnetLogRecordLogDatumLogStatus() BACnetLogRecordLogDatumLogStatusBuilder
 	// AsBACnetLogRecordLogDatumBooleanValue converts this build to a subType of BACnetLogRecordLogDatum. It is always possible to return to current builder using Done()
@@ -230,11 +223,6 @@ func (b *_BACnetLogRecordLogDatumBuilder) WithClosingTagBuilder(builderSupplier
 	return b
 }
 
-func (b *_BACnetLogRecordLogDatumBuilder) WithArgTagNumber(tagNumber uint8) BACnetLogRecordLogDatumBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetLogRecordLogDatumBuilder) PartialBuild() (BACnetLogRecordLogDatumContract, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -503,7 +491,7 @@ func BACnetLogRecordLogDatumParseWithBufferProducer[T BACnetLogRecordLogDatum](t
 }
 
 func BACnetLogRecordLogDatumParseWithBuffer[T BACnetLogRecordLogDatum](ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (T, error) {
-	v, err := (&_BACnetLogRecordLogDatum{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetLogRecordLogDatum)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -644,16 +632,6 @@ func (pm *_BACnetLogRecordLogDatum) serializeParent(ctx context.Context, writeBu
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLogRecordLogDatum) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetLogRecordLogDatum) IsBACnetLogRecordLogDatum() {}
 
 func (m *_BACnetLogRecordLogDatum) DeepCopy() any {
@@ -669,7 +647,6 @@ func (m *_BACnetLogRecordLogDatum) deepCopy() *_BACnetLogRecordLogDatum {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetTagHeader](m.PeekedTagHeader),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetLogRecordLogDatumCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumAnyValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumAnyValue.go
index 4d0608cdc7f..b7fc9b4a006 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumAnyValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumAnyValue.go
@@ -59,9 +59,9 @@ var _ BACnetLogRecordLogDatumAnyValue = (*_BACnetLogRecordLogDatumAnyValue)(nil)
 var _ BACnetLogRecordLogDatumRequirements = (*_BACnetLogRecordLogDatumAnyValue)(nil)
 
 // NewBACnetLogRecordLogDatumAnyValue factory function for _BACnetLogRecordLogDatumAnyValue
-func NewBACnetLogRecordLogDatumAnyValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, anyValue BACnetConstructedData, tagNumber uint8) *_BACnetLogRecordLogDatumAnyValue {
+func NewBACnetLogRecordLogDatumAnyValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, anyValue BACnetConstructedData) *_BACnetLogRecordLogDatumAnyValue {
 	_result := &_BACnetLogRecordLogDatumAnyValue{
-		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag),
 		AnyValue:                        anyValue,
 	}
 	_result.BACnetLogRecordLogDatumContract.(*_BACnetLogRecordLogDatum)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBitStringValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBitStringValue.go
index 09e3b567b51..80e5629a4bf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBitStringValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBitStringValue.go
@@ -59,12 +59,12 @@ var _ BACnetLogRecordLogDatumBitStringValue = (*_BACnetLogRecordLogDatumBitStrin
 var _ BACnetLogRecordLogDatumRequirements = (*_BACnetLogRecordLogDatumBitStringValue)(nil)
 
 // NewBACnetLogRecordLogDatumBitStringValue factory function for _BACnetLogRecordLogDatumBitStringValue
-func NewBACnetLogRecordLogDatumBitStringValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bitStringValue BACnetContextTagBitString, tagNumber uint8) *_BACnetLogRecordLogDatumBitStringValue {
+func NewBACnetLogRecordLogDatumBitStringValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, bitStringValue BACnetContextTagBitString) *_BACnetLogRecordLogDatumBitStringValue {
 	if bitStringValue == nil {
 		panic("bitStringValue of type BACnetContextTagBitString for BACnetLogRecordLogDatumBitStringValue must not be nil")
 	}
 	_result := &_BACnetLogRecordLogDatumBitStringValue{
-		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag),
 		BitStringValue:                  bitStringValue,
 	}
 	_result.BACnetLogRecordLogDatumContract.(*_BACnetLogRecordLogDatum)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBooleanValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBooleanValue.go
index c249e2b2088..456ee093d54 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBooleanValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBooleanValue.go
@@ -59,12 +59,12 @@ var _ BACnetLogRecordLogDatumBooleanValue = (*_BACnetLogRecordLogDatumBooleanVal
 var _ BACnetLogRecordLogDatumRequirements = (*_BACnetLogRecordLogDatumBooleanValue)(nil)
 
 // NewBACnetLogRecordLogDatumBooleanValue factory function for _BACnetLogRecordLogDatumBooleanValue
-func NewBACnetLogRecordLogDatumBooleanValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, booleanValue BACnetContextTagBoolean, tagNumber uint8) *_BACnetLogRecordLogDatumBooleanValue {
+func NewBACnetLogRecordLogDatumBooleanValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, booleanValue BACnetContextTagBoolean) *_BACnetLogRecordLogDatumBooleanValue {
 	if booleanValue == nil {
 		panic("booleanValue of type BACnetContextTagBoolean for BACnetLogRecordLogDatumBooleanValue must not be nil")
 	}
 	_result := &_BACnetLogRecordLogDatumBooleanValue{
-		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag),
 		BooleanValue:                    booleanValue,
 	}
 	_result.BACnetLogRecordLogDatumContract.(*_BACnetLogRecordLogDatum)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumEnumeratedValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumEnumeratedValue.go
index e6eaa6688d4..083d1d36b3c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumEnumeratedValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumEnumeratedValue.go
@@ -59,12 +59,12 @@ var _ BACnetLogRecordLogDatumEnumeratedValue = (*_BACnetLogRecordLogDatumEnumera
 var _ BACnetLogRecordLogDatumRequirements = (*_BACnetLogRecordLogDatumEnumeratedValue)(nil)
 
 // NewBACnetLogRecordLogDatumEnumeratedValue factory function for _BACnetLogRecordLogDatumEnumeratedValue
-func NewBACnetLogRecordLogDatumEnumeratedValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, enumeratedValue BACnetContextTagEnumerated, tagNumber uint8) *_BACnetLogRecordLogDatumEnumeratedValue {
+func NewBACnetLogRecordLogDatumEnumeratedValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, enumeratedValue BACnetContextTagEnumerated) *_BACnetLogRecordLogDatumEnumeratedValue {
 	if enumeratedValue == nil {
 		panic("enumeratedValue of type BACnetContextTagEnumerated for BACnetLogRecordLogDatumEnumeratedValue must not be nil")
 	}
 	_result := &_BACnetLogRecordLogDatumEnumeratedValue{
-		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag),
 		EnumeratedValue:                 enumeratedValue,
 	}
 	_result.BACnetLogRecordLogDatumContract.(*_BACnetLogRecordLogDatum)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumFailure.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumFailure.go
index db4a33bec9b..ec3f2ba1ce4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumFailure.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumFailure.go
@@ -59,12 +59,12 @@ var _ BACnetLogRecordLogDatumFailure = (*_BACnetLogRecordLogDatumFailure)(nil)
 var _ BACnetLogRecordLogDatumRequirements = (*_BACnetLogRecordLogDatumFailure)(nil)
 
 // NewBACnetLogRecordLogDatumFailure factory function for _BACnetLogRecordLogDatumFailure
-func NewBACnetLogRecordLogDatumFailure(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, failure ErrorEnclosed, tagNumber uint8) *_BACnetLogRecordLogDatumFailure {
+func NewBACnetLogRecordLogDatumFailure(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, failure ErrorEnclosed) *_BACnetLogRecordLogDatumFailure {
 	if failure == nil {
 		panic("failure of type ErrorEnclosed for BACnetLogRecordLogDatumFailure must not be nil")
 	}
 	_result := &_BACnetLogRecordLogDatumFailure{
-		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag),
 		Failure:                         failure,
 	}
 	_result.BACnetLogRecordLogDatumContract.(*_BACnetLogRecordLogDatum)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumIntegerValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumIntegerValue.go
index 529ee52fbaf..89adbff7ca0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumIntegerValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumIntegerValue.go
@@ -59,12 +59,12 @@ var _ BACnetLogRecordLogDatumIntegerValue = (*_BACnetLogRecordLogDatumIntegerVal
 var _ BACnetLogRecordLogDatumRequirements = (*_BACnetLogRecordLogDatumIntegerValue)(nil)
 
 // NewBACnetLogRecordLogDatumIntegerValue factory function for _BACnetLogRecordLogDatumIntegerValue
-func NewBACnetLogRecordLogDatumIntegerValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, integerValue BACnetContextTagSignedInteger, tagNumber uint8) *_BACnetLogRecordLogDatumIntegerValue {
+func NewBACnetLogRecordLogDatumIntegerValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, integerValue BACnetContextTagSignedInteger) *_BACnetLogRecordLogDatumIntegerValue {
 	if integerValue == nil {
 		panic("integerValue of type BACnetContextTagSignedInteger for BACnetLogRecordLogDatumIntegerValue must not be nil")
 	}
 	_result := &_BACnetLogRecordLogDatumIntegerValue{
-		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag),
 		IntegerValue:                    integerValue,
 	}
 	_result.BACnetLogRecordLogDatumContract.(*_BACnetLogRecordLogDatum)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumLogStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumLogStatus.go
index 33db7e20b01..a6370ced637 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumLogStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumLogStatus.go
@@ -59,12 +59,12 @@ var _ BACnetLogRecordLogDatumLogStatus = (*_BACnetLogRecordLogDatumLogStatus)(ni
 var _ BACnetLogRecordLogDatumRequirements = (*_BACnetLogRecordLogDatumLogStatus)(nil)
 
 // NewBACnetLogRecordLogDatumLogStatus factory function for _BACnetLogRecordLogDatumLogStatus
-func NewBACnetLogRecordLogDatumLogStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, logStatus BACnetLogStatusTagged, tagNumber uint8) *_BACnetLogRecordLogDatumLogStatus {
+func NewBACnetLogRecordLogDatumLogStatus(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, logStatus BACnetLogStatusTagged) *_BACnetLogRecordLogDatumLogStatus {
 	if logStatus == nil {
 		panic("logStatus of type BACnetLogStatusTagged for BACnetLogRecordLogDatumLogStatus must not be nil")
 	}
 	_result := &_BACnetLogRecordLogDatumLogStatus{
-		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag),
 		LogStatus:                       logStatus,
 	}
 	_result.BACnetLogRecordLogDatumContract.(*_BACnetLogRecordLogDatum)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumNullValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumNullValue.go
index 8e8b2f2d044..770e0e5a8c6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumNullValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumNullValue.go
@@ -59,12 +59,12 @@ var _ BACnetLogRecordLogDatumNullValue = (*_BACnetLogRecordLogDatumNullValue)(ni
 var _ BACnetLogRecordLogDatumRequirements = (*_BACnetLogRecordLogDatumNullValue)(nil)
 
 // NewBACnetLogRecordLogDatumNullValue factory function for _BACnetLogRecordLogDatumNullValue
-func NewBACnetLogRecordLogDatumNullValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, nullValue BACnetContextTagNull, tagNumber uint8) *_BACnetLogRecordLogDatumNullValue {
+func NewBACnetLogRecordLogDatumNullValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, nullValue BACnetContextTagNull) *_BACnetLogRecordLogDatumNullValue {
 	if nullValue == nil {
 		panic("nullValue of type BACnetContextTagNull for BACnetLogRecordLogDatumNullValue must not be nil")
 	}
 	_result := &_BACnetLogRecordLogDatumNullValue{
-		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag),
 		NullValue:                       nullValue,
 	}
 	_result.BACnetLogRecordLogDatumContract.(*_BACnetLogRecordLogDatum)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumRealValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumRealValue.go
index 49963a481ca..94a00044dd3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumRealValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumRealValue.go
@@ -59,12 +59,12 @@ var _ BACnetLogRecordLogDatumRealValue = (*_BACnetLogRecordLogDatumRealValue)(ni
 var _ BACnetLogRecordLogDatumRequirements = (*_BACnetLogRecordLogDatumRealValue)(nil)
 
 // NewBACnetLogRecordLogDatumRealValue factory function for _BACnetLogRecordLogDatumRealValue
-func NewBACnetLogRecordLogDatumRealValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, realValue BACnetContextTagReal, tagNumber uint8) *_BACnetLogRecordLogDatumRealValue {
+func NewBACnetLogRecordLogDatumRealValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, realValue BACnetContextTagReal) *_BACnetLogRecordLogDatumRealValue {
 	if realValue == nil {
 		panic("realValue of type BACnetContextTagReal for BACnetLogRecordLogDatumRealValue must not be nil")
 	}
 	_result := &_BACnetLogRecordLogDatumRealValue{
-		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag),
 		RealValue:                       realValue,
 	}
 	_result.BACnetLogRecordLogDatumContract.(*_BACnetLogRecordLogDatum)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumTimeChange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumTimeChange.go
index 6c7a90543b7..7d1f4d72f30 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumTimeChange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumTimeChange.go
@@ -59,12 +59,12 @@ var _ BACnetLogRecordLogDatumTimeChange = (*_BACnetLogRecordLogDatumTimeChange)(
 var _ BACnetLogRecordLogDatumRequirements = (*_BACnetLogRecordLogDatumTimeChange)(nil)
 
 // NewBACnetLogRecordLogDatumTimeChange factory function for _BACnetLogRecordLogDatumTimeChange
-func NewBACnetLogRecordLogDatumTimeChange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeChange BACnetContextTagReal, tagNumber uint8) *_BACnetLogRecordLogDatumTimeChange {
+func NewBACnetLogRecordLogDatumTimeChange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeChange BACnetContextTagReal) *_BACnetLogRecordLogDatumTimeChange {
 	if timeChange == nil {
 		panic("timeChange of type BACnetContextTagReal for BACnetLogRecordLogDatumTimeChange must not be nil")
 	}
 	_result := &_BACnetLogRecordLogDatumTimeChange{
-		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag),
 		TimeChange:                      timeChange,
 	}
 	_result.BACnetLogRecordLogDatumContract.(*_BACnetLogRecordLogDatum)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumUnsignedValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumUnsignedValue.go
index 778bc39ceee..043158b30f1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumUnsignedValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumUnsignedValue.go
@@ -59,12 +59,12 @@ var _ BACnetLogRecordLogDatumUnsignedValue = (*_BACnetLogRecordLogDatumUnsignedV
 var _ BACnetLogRecordLogDatumRequirements = (*_BACnetLogRecordLogDatumUnsignedValue)(nil)
 
 // NewBACnetLogRecordLogDatumUnsignedValue factory function for _BACnetLogRecordLogDatumUnsignedValue
-func NewBACnetLogRecordLogDatumUnsignedValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, unsignedValue BACnetContextTagUnsignedInteger, tagNumber uint8) *_BACnetLogRecordLogDatumUnsignedValue {
+func NewBACnetLogRecordLogDatumUnsignedValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, unsignedValue BACnetContextTagUnsignedInteger) *_BACnetLogRecordLogDatumUnsignedValue {
 	if unsignedValue == nil {
 		panic("unsignedValue of type BACnetContextTagUnsignedInteger for BACnetLogRecordLogDatumUnsignedValue must not be nil")
 	}
 	_result := &_BACnetLogRecordLogDatumUnsignedValue{
-		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetLogRecordLogDatumContract: NewBACnetLogRecordLogDatum(openingTag, peekedTagHeader, closingTag),
 		UnsignedValue:                   unsignedValue,
 	}
 	_result.BACnetLogRecordLogDatumContract.(*_BACnetLogRecordLogDatum)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatusTagged.go
index 916bf78c0c5..dbd08900634 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatusTagged.go
@@ -60,23 +60,19 @@ type BACnetLogStatusTagged interface {
 type _BACnetLogStatusTagged struct {
 	Header  BACnetTagHeader
 	Payload BACnetTagPayloadBitString
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLogStatusTagged = (*_BACnetLogStatusTagged)(nil)
 
 // NewBACnetLogStatusTagged factory function for _BACnetLogStatusTagged
-func NewBACnetLogStatusTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString, tagNumber uint8, tagClass TagClass) *_BACnetLogStatusTagged {
+func NewBACnetLogStatusTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString) *_BACnetLogStatusTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLogStatusTagged must not be nil")
 	}
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadBitString for BACnetLogStatusTagged must not be nil")
 	}
-	return &_BACnetLogStatusTagged{Header: header, Payload: payload, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLogStatusTagged{Header: header, Payload: payload}
 }
 
 ///////////////////////////////////////////////////////////
@@ -97,10 +93,6 @@ type BACnetLogStatusTaggedBuilder interface {
 	WithPayload(BACnetTagPayloadBitString) BACnetLogStatusTaggedBuilder
 	// WithPayloadBuilder adds Payload (property field) which is build by the builder
 	WithPayloadBuilder(func(BACnetTagPayloadBitStringBuilder) BACnetTagPayloadBitStringBuilder) BACnetLogStatusTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLogStatusTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLogStatusTaggedBuilder
 	// Build builds the BACnetLogStatusTagged or returns an error if something is wrong
 	Build() (BACnetLogStatusTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -154,15 +146,6 @@ func (b *_BACnetLogStatusTaggedBuilder) WithPayloadBuilder(builderSupplier func(
 	return b
 }
 
-func (b *_BACnetLogStatusTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLogStatusTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLogStatusTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLogStatusTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLogStatusTaggedBuilder) Build() (BACnetLogStatusTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -298,7 +281,7 @@ func BACnetLogStatusTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagC
 }
 
 func BACnetLogStatusTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLogStatusTagged, error) {
-	v, err := (&_BACnetLogStatusTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLogStatusTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -410,19 +393,6 @@ func (m *_BACnetLogStatusTagged) SerializeWithWriteBuffer(ctx context.Context, w
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLogStatusTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLogStatusTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLogStatusTagged) IsBACnetLogStatusTagged() {}
 
 func (m *_BACnetLogStatusTagged) DeepCopy() any {
@@ -436,8 +406,6 @@ func (m *_BACnetLogStatusTagged) deepCopy() *_BACnetLogStatusTagged {
 	_BACnetLogStatusTaggedCopy := &_BACnetLogStatusTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		utils.DeepCopy[BACnetTagPayloadBitString](m.Payload),
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLogStatusTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingTypeTagged.go
index 96632d398cf..f97d727e27b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingTypeTagged.go
@@ -59,20 +59,16 @@ type _BACnetLoggingTypeTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetLoggingType
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetLoggingTypeTagged = (*_BACnetLoggingTypeTagged)(nil)
 
 // NewBACnetLoggingTypeTagged factory function for _BACnetLoggingTypeTagged
-func NewBACnetLoggingTypeTagged(header BACnetTagHeader, value BACnetLoggingType, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetLoggingTypeTagged {
+func NewBACnetLoggingTypeTagged(header BACnetTagHeader, value BACnetLoggingType, proprietaryValue uint32) *_BACnetLoggingTypeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetLoggingTypeTagged must not be nil")
 	}
-	return &_BACnetLoggingTypeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetLoggingTypeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetLoggingTypeTaggedBuilder interface {
 	WithValue(BACnetLoggingType) BACnetLoggingTypeTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetLoggingTypeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetLoggingTypeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetLoggingTypeTaggedBuilder
 	// Build builds the BACnetLoggingTypeTagged or returns an error if something is wrong
 	Build() (BACnetLoggingTypeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetLoggingTypeTaggedBuilder) WithProprietaryValue(proprietaryValue
 	return b
 }
 
-func (b *_BACnetLoggingTypeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetLoggingTypeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetLoggingTypeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetLoggingTypeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetLoggingTypeTaggedBuilder) Build() (BACnetLoggingTypeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetLoggingTypeTaggedParseWithBufferProducer(tagNumber uint8, tagClass Ta
 }
 
 func BACnetLoggingTypeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetLoggingTypeTagged, error) {
-	v, err := (&_BACnetLoggingTypeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetLoggingTypeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetLoggingTypeTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetLoggingTypeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetLoggingTypeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetLoggingTypeTagged) IsBACnetLoggingTypeTagged() {}
 
 func (m *_BACnetLoggingTypeTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetLoggingTypeTagged) deepCopy() *_BACnetLoggingTypeTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetLoggingTypeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenanceTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenanceTagged.go
index 8d49dc39445..e756a4af983 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenanceTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenanceTagged.go
@@ -59,20 +59,16 @@ type _BACnetMaintenanceTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetMaintenance
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetMaintenanceTagged = (*_BACnetMaintenanceTagged)(nil)
 
 // NewBACnetMaintenanceTagged factory function for _BACnetMaintenanceTagged
-func NewBACnetMaintenanceTagged(header BACnetTagHeader, value BACnetMaintenance, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetMaintenanceTagged {
+func NewBACnetMaintenanceTagged(header BACnetTagHeader, value BACnetMaintenance, proprietaryValue uint32) *_BACnetMaintenanceTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetMaintenanceTagged must not be nil")
 	}
-	return &_BACnetMaintenanceTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetMaintenanceTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetMaintenanceTaggedBuilder interface {
 	WithValue(BACnetMaintenance) BACnetMaintenanceTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetMaintenanceTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetMaintenanceTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetMaintenanceTaggedBuilder
 	// Build builds the BACnetMaintenanceTagged or returns an error if something is wrong
 	Build() (BACnetMaintenanceTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetMaintenanceTaggedBuilder) WithProprietaryValue(proprietaryValue
 	return b
 }
 
-func (b *_BACnetMaintenanceTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetMaintenanceTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetMaintenanceTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetMaintenanceTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetMaintenanceTaggedBuilder) Build() (BACnetMaintenanceTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetMaintenanceTaggedParseWithBufferProducer(tagNumber uint8, tagClass Ta
 }
 
 func BACnetMaintenanceTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetMaintenanceTagged, error) {
-	v, err := (&_BACnetMaintenanceTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetMaintenanceTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetMaintenanceTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetMaintenanceTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetMaintenanceTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetMaintenanceTagged) IsBACnetMaintenanceTagged() {}
 
 func (m *_BACnetMaintenanceTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetMaintenanceTagged) deepCopy() *_BACnetMaintenanceTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetMaintenanceTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValue.go
index 2c53e289cc5..19036dba2ec 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValue.go
@@ -238,7 +238,7 @@ func BACnetNameValueParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func BACnetNameValueParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetNameValue, error) {
-	v, err := (&_BACnetNameValue{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetNameValue)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValueCollection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValueCollection.go
index 7037497093d..098e609d4b8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValueCollection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValueCollection.go
@@ -57,22 +57,19 @@ type _BACnetNameValueCollection struct {
 	OpeningTag BACnetOpeningTag
 	Members    []BACnetNameValue
 	ClosingTag BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetNameValueCollection = (*_BACnetNameValueCollection)(nil)
 
 // NewBACnetNameValueCollection factory function for _BACnetNameValueCollection
-func NewBACnetNameValueCollection(openingTag BACnetOpeningTag, members []BACnetNameValue, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetNameValueCollection {
+func NewBACnetNameValueCollection(openingTag BACnetOpeningTag, members []BACnetNameValue, closingTag BACnetClosingTag) *_BACnetNameValueCollection {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetNameValueCollection must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetNameValueCollection must not be nil")
 	}
-	return &_BACnetNameValueCollection{OpeningTag: openingTag, Members: members, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetNameValueCollection{OpeningTag: openingTag, Members: members, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetNameValueCollectionBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetNameValueCollectionBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetNameValueCollectionBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetNameValueCollectionBuilder
 	// Build builds the BACnetNameValueCollection or returns an error if something is wrong
 	Build() (BACnetNameValueCollection, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetNameValueCollectionBuilder) WithClosingTagBuilder(builderSupplie
 	return b
 }
 
-func (b *_BACnetNameValueCollectionBuilder) WithArgTagNumber(tagNumber uint8) BACnetNameValueCollectionBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetNameValueCollectionBuilder) Build() (BACnetNameValueCollection, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetNameValueCollectionParseWithBufferProducer(tagNumber uint8) func(ctx
 }
 
 func BACnetNameValueCollectionParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetNameValueCollection, error) {
-	v, err := (&_BACnetNameValueCollection{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetNameValueCollection)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetNameValueCollection) SerializeWithWriteBuffer(ctx context.Contex
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetNameValueCollection) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetNameValueCollection) IsBACnetNameValueCollection() {}
 
 func (m *_BACnetNameValueCollection) DeepCopy() any {
@@ -373,7 +353,6 @@ func (m *_BACnetNameValueCollection) deepCopy() *_BACnetNameValueCollection {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetNameValue, BACnetNameValue](m.Members),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetNameValueCollectionCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQualityTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQualityTagged.go
index 0dd77b83bae..aa4c0d80940 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQualityTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQualityTagged.go
@@ -54,20 +54,16 @@ type BACnetNetworkNumberQualityTagged interface {
 type _BACnetNetworkNumberQualityTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetNetworkNumberQuality
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetNetworkNumberQualityTagged = (*_BACnetNetworkNumberQualityTagged)(nil)
 
 // NewBACnetNetworkNumberQualityTagged factory function for _BACnetNetworkNumberQualityTagged
-func NewBACnetNetworkNumberQualityTagged(header BACnetTagHeader, value BACnetNetworkNumberQuality, tagNumber uint8, tagClass TagClass) *_BACnetNetworkNumberQualityTagged {
+func NewBACnetNetworkNumberQualityTagged(header BACnetTagHeader, value BACnetNetworkNumberQuality) *_BACnetNetworkNumberQualityTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetNetworkNumberQualityTagged must not be nil")
 	}
-	return &_BACnetNetworkNumberQualityTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetNetworkNumberQualityTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetNetworkNumberQualityTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetNetworkNumberQualityTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetNetworkNumberQuality) BACnetNetworkNumberQualityTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetNetworkNumberQualityTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetNetworkNumberQualityTaggedBuilder
 	// Build builds the BACnetNetworkNumberQualityTagged or returns an error if something is wrong
 	Build() (BACnetNetworkNumberQualityTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetNetworkNumberQualityTaggedBuilder) WithValue(value BACnetNetwork
 	return b
 }
 
-func (b *_BACnetNetworkNumberQualityTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetNetworkNumberQualityTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetNetworkNumberQualityTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetNetworkNumberQualityTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetNetworkNumberQualityTaggedBuilder) Build() (BACnetNetworkNumberQualityTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetNetworkNumberQualityTaggedParseWithBufferProducer(tagNumber uint8, ta
 }
 
 func BACnetNetworkNumberQualityTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetNetworkNumberQualityTagged, error) {
-	v, err := (&_BACnetNetworkNumberQualityTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetNetworkNumberQualityTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetNetworkNumberQualityTagged) SerializeWithWriteBuffer(ctx context
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetNetworkNumberQualityTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetNetworkNumberQualityTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetNetworkNumberQualityTagged) IsBACnetNetworkNumberQualityTagged() {}
 
 func (m *_BACnetNetworkNumberQualityTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetNetworkNumberQualityTagged) deepCopy() *_BACnetNetworkNumberQual
 	_BACnetNetworkNumberQualityTaggedCopy := &_BACnetNetworkNumberQualityTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetNetworkNumberQualityTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommandTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommandTagged.go
index dad0a24dd0f..c77351bbf44 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommandTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommandTagged.go
@@ -59,20 +59,16 @@ type _BACnetNetworkPortCommandTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetNetworkPortCommand
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetNetworkPortCommandTagged = (*_BACnetNetworkPortCommandTagged)(nil)
 
 // NewBACnetNetworkPortCommandTagged factory function for _BACnetNetworkPortCommandTagged
-func NewBACnetNetworkPortCommandTagged(header BACnetTagHeader, value BACnetNetworkPortCommand, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetNetworkPortCommandTagged {
+func NewBACnetNetworkPortCommandTagged(header BACnetTagHeader, value BACnetNetworkPortCommand, proprietaryValue uint32) *_BACnetNetworkPortCommandTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetNetworkPortCommandTagged must not be nil")
 	}
-	return &_BACnetNetworkPortCommandTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetNetworkPortCommandTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetNetworkPortCommandTaggedBuilder interface {
 	WithValue(BACnetNetworkPortCommand) BACnetNetworkPortCommandTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetNetworkPortCommandTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetNetworkPortCommandTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetNetworkPortCommandTaggedBuilder
 	// Build builds the BACnetNetworkPortCommandTagged or returns an error if something is wrong
 	Build() (BACnetNetworkPortCommandTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetNetworkPortCommandTaggedBuilder) WithProprietaryValue(proprietar
 	return b
 }
 
-func (b *_BACnetNetworkPortCommandTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetNetworkPortCommandTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetNetworkPortCommandTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetNetworkPortCommandTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetNetworkPortCommandTaggedBuilder) Build() (BACnetNetworkPortCommandTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetNetworkPortCommandTaggedParseWithBufferProducer(tagNumber uint8, tagC
 }
 
 func BACnetNetworkPortCommandTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetNetworkPortCommandTagged, error) {
-	v, err := (&_BACnetNetworkPortCommandTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetNetworkPortCommandTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetNetworkPortCommandTagged) SerializeWithWriteBuffer(ctx context.C
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetNetworkPortCommandTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetNetworkPortCommandTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetNetworkPortCommandTagged) IsBACnetNetworkPortCommandTagged() {}
 
 func (m *_BACnetNetworkPortCommandTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetNetworkPortCommandTagged) deepCopy() *_BACnetNetworkPortCommandT
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetNetworkPortCommandTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkSecurityPolicy.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkSecurityPolicy.go
index c32683a95eb..0a604503b82 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkSecurityPolicy.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkSecurityPolicy.go
@@ -242,7 +242,7 @@ func BACnetNetworkSecurityPolicyParseWithBufferProducer() func(ctx context.Conte
 }
 
 func BACnetNetworkSecurityPolicyParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetNetworkSecurityPolicy, error) {
-	v, err := (&_BACnetNetworkSecurityPolicy{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetNetworkSecurityPolicy)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkTypeTagged.go
index 811f3c54f3c..94cc8270e6e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkTypeTagged.go
@@ -59,20 +59,16 @@ type _BACnetNetworkTypeTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetNetworkType
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetNetworkTypeTagged = (*_BACnetNetworkTypeTagged)(nil)
 
 // NewBACnetNetworkTypeTagged factory function for _BACnetNetworkTypeTagged
-func NewBACnetNetworkTypeTagged(header BACnetTagHeader, value BACnetNetworkType, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetNetworkTypeTagged {
+func NewBACnetNetworkTypeTagged(header BACnetTagHeader, value BACnetNetworkType, proprietaryValue uint32) *_BACnetNetworkTypeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetNetworkTypeTagged must not be nil")
 	}
-	return &_BACnetNetworkTypeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetNetworkTypeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetNetworkTypeTaggedBuilder interface {
 	WithValue(BACnetNetworkType) BACnetNetworkTypeTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetNetworkTypeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetNetworkTypeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetNetworkTypeTaggedBuilder
 	// Build builds the BACnetNetworkTypeTagged or returns an error if something is wrong
 	Build() (BACnetNetworkTypeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetNetworkTypeTaggedBuilder) WithProprietaryValue(proprietaryValue
 	return b
 }
 
-func (b *_BACnetNetworkTypeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetNetworkTypeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetNetworkTypeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetNetworkTypeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetNetworkTypeTaggedBuilder) Build() (BACnetNetworkTypeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetNetworkTypeTaggedParseWithBufferProducer(tagNumber uint8, tagClass Ta
 }
 
 func BACnetNetworkTypeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetNetworkTypeTagged, error) {
-	v, err := (&_BACnetNetworkTypeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetNetworkTypeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetNetworkTypeTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetNetworkTypeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetNetworkTypeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetNetworkTypeTagged) IsBACnetNetworkTypeTagged() {}
 
 func (m *_BACnetNetworkTypeTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetNetworkTypeTagged) deepCopy() *_BACnetNetworkTypeTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetNetworkTypeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeTypeTagged.go
index 9a63ef5020a..e4a0e41d242 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeTypeTagged.go
@@ -54,20 +54,16 @@ type BACnetNodeTypeTagged interface {
 type _BACnetNodeTypeTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetNodeType
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetNodeTypeTagged = (*_BACnetNodeTypeTagged)(nil)
 
 // NewBACnetNodeTypeTagged factory function for _BACnetNodeTypeTagged
-func NewBACnetNodeTypeTagged(header BACnetTagHeader, value BACnetNodeType, tagNumber uint8, tagClass TagClass) *_BACnetNodeTypeTagged {
+func NewBACnetNodeTypeTagged(header BACnetTagHeader, value BACnetNodeType) *_BACnetNodeTypeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetNodeTypeTagged must not be nil")
 	}
-	return &_BACnetNodeTypeTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetNodeTypeTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetNodeTypeTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetNodeTypeTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetNodeType) BACnetNodeTypeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetNodeTypeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetNodeTypeTaggedBuilder
 	// Build builds the BACnetNodeTypeTagged or returns an error if something is wrong
 	Build() (BACnetNodeTypeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetNodeTypeTaggedBuilder) WithValue(value BACnetNodeType) BACnetNod
 	return b
 }
 
-func (b *_BACnetNodeTypeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetNodeTypeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetNodeTypeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetNodeTypeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetNodeTypeTaggedBuilder) Build() (BACnetNodeTypeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetNodeTypeTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagCl
 }
 
 func BACnetNodeTypeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetNodeTypeTagged, error) {
-	v, err := (&_BACnetNodeTypeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetNodeTypeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetNodeTypeTagged) SerializeWithWriteBuffer(ctx context.Context, wr
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetNodeTypeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetNodeTypeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetNodeTypeTagged) IsBACnetNodeTypeTagged() {}
 
 func (m *_BACnetNodeTypeTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetNodeTypeTagged) deepCopy() *_BACnetNodeTypeTagged {
 	_BACnetNodeTypeTaggedCopy := &_BACnetNodeTypeTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetNodeTypeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go
index aef264ce93d..5bb617e8353 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go
@@ -58,10 +58,6 @@ type BACnetNotificationParametersContract interface {
 	GetClosingTag() BACnetClosingTag
 	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
-	// GetTagNumber() returns a parser argument
-	GetTagNumber() uint8
-	// GetObjectTypeArgument() returns a parser argument
-	GetObjectTypeArgument() BACnetObjectType
 	// IsBACnetNotificationParameters is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetNotificationParameters()
 	// CreateBuilder creates a BACnetNotificationParametersBuilder
@@ -85,16 +81,12 @@ type _BACnetNotificationParameters struct {
 	OpeningTag      BACnetOpeningTag
 	PeekedTagHeader BACnetTagHeader
 	ClosingTag      BACnetClosingTag
-
-	// Arguments.
-	TagNumber          uint8
-	ObjectTypeArgument BACnetObjectType
 }
 
 var _ BACnetNotificationParametersContract = (*_BACnetNotificationParameters)(nil)
 
 // NewBACnetNotificationParameters factory function for _BACnetNotificationParameters
-func NewBACnetNotificationParameters(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParameters {
+func NewBACnetNotificationParameters(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetNotificationParameters {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetNotificationParameters must not be nil")
 	}
@@ -104,7 +96,7 @@ func NewBACnetNotificationParameters(openingTag BACnetOpeningTag, peekedTagHeade
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetNotificationParameters must not be nil")
 	}
-	return &_BACnetNotificationParameters{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, TagNumber: tagNumber, ObjectTypeArgument: objectTypeArgument}
+	return &_BACnetNotificationParameters{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -129,10 +121,6 @@ type BACnetNotificationParametersBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetNotificationParametersBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetNotificationParametersBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetNotificationParametersBuilder
-	// WithArgObjectTypeArgument sets a parser argument
-	WithArgObjectTypeArgument(BACnetObjectType) BACnetNotificationParametersBuilder
 	// AsBACnetNotificationParametersChangeOfBitString converts this build to a subType of BACnetNotificationParameters. It is always possible to return to current builder using Done()
 	AsBACnetNotificationParametersChangeOfBitString() BACnetNotificationParametersChangeOfBitStringBuilder
 	// AsBACnetNotificationParametersChangeOfState converts this build to a subType of BACnetNotificationParameters. It is always possible to return to current builder using Done()
@@ -253,15 +241,6 @@ func (b *_BACnetNotificationParametersBuilder) WithClosingTagBuilder(builderSupp
 	return b
 }
 
-func (b *_BACnetNotificationParametersBuilder) WithArgTagNumber(tagNumber uint8) BACnetNotificationParametersBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetNotificationParametersBuilder) WithArgObjectTypeArgument(objectTypeArgument BACnetObjectType) BACnetNotificationParametersBuilder {
-	b.ObjectTypeArgument = objectTypeArgument
-	return b
-}
-
 func (b *_BACnetNotificationParametersBuilder) PartialBuild() (BACnetNotificationParametersContract, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -620,7 +599,7 @@ func BACnetNotificationParametersParseWithBufferProducer[T BACnetNotificationPar
 }
 
 func BACnetNotificationParametersParseWithBuffer[T BACnetNotificationParameters](ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType) (T, error) {
-	v, err := (&_BACnetNotificationParameters{TagNumber: tagNumber, ObjectTypeArgument: objectTypeArgument}).parse(ctx, readBuffer, tagNumber, objectTypeArgument)
+	v, err := (new(_BACnetNotificationParameters)).parse(ctx, readBuffer, tagNumber, objectTypeArgument)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -797,19 +776,6 @@ func (pm *_BACnetNotificationParameters) serializeParent(ctx context.Context, wr
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetNotificationParameters) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetNotificationParameters) GetObjectTypeArgument() BACnetObjectType {
-	return m.ObjectTypeArgument
-}
-
-//
-////
-
 func (m *_BACnetNotificationParameters) IsBACnetNotificationParameters() {}
 
 func (m *_BACnetNotificationParameters) DeepCopy() any {
@@ -825,8 +791,6 @@ func (m *_BACnetNotificationParameters) deepCopy() *_BACnetNotificationParameter
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetTagHeader](m.PeekedTagHeader),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
-		m.ObjectTypeArgument,
 	}
 	return _BACnetNotificationParametersCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go
index 7a42785c61a..39dc5fbe1ee 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go
@@ -80,7 +80,7 @@ var _ BACnetNotificationParametersAccessEvent = (*_BACnetNotificationParametersA
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersAccessEvent)(nil)
 
 // NewBACnetNotificationParametersAccessEvent factory function for _BACnetNotificationParametersAccessEvent
-func NewBACnetNotificationParametersAccessEvent(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, accessEvent BACnetAccessEventTagged, statusFlags BACnetStatusFlagsTagged, accessEventTag BACnetContextTagUnsignedInteger, accessEventTime BACnetTimeStampEnclosed, accessCredential BACnetDeviceObjectReferenceEnclosed, authenticationFactor BACnetAuthenticationFactorTypeTagged, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersAccessEvent {
+func NewBACnetNotificationParametersAccessEvent(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, accessEvent BACnetAccessEventTagged, statusFlags BACnetStatusFlagsTagged, accessEventTag BACnetContextTagUnsignedInteger, accessEventTime BACnetTimeStampEnclosed, accessCredential BACnetDeviceObjectReferenceEnclosed, authenticationFactor BACnetAuthenticationFactorTypeTagged, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersAccessEvent {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersAccessEvent must not be nil")
 	}
@@ -103,7 +103,7 @@ func NewBACnetNotificationParametersAccessEvent(openingTag BACnetOpeningTag, pee
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersAccessEvent must not be nil")
 	}
 	_result := &_BACnetNotificationParametersAccessEvent{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		AccessEvent:                          accessEvent,
 		StatusFlags:                          statusFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go
index b4fae5ade42..db7d437113a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go
@@ -71,7 +71,7 @@ var _ BACnetNotificationParametersBufferReady = (*_BACnetNotificationParametersB
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersBufferReady)(nil)
 
 // NewBACnetNotificationParametersBufferReady factory function for _BACnetNotificationParametersBufferReady
-func NewBACnetNotificationParametersBufferReady(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, bufferProperty BACnetDeviceObjectPropertyReferenceEnclosed, previousNotification BACnetContextTagUnsignedInteger, currentNotification BACnetContextTagUnsignedInteger, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersBufferReady {
+func NewBACnetNotificationParametersBufferReady(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, bufferProperty BACnetDeviceObjectPropertyReferenceEnclosed, previousNotification BACnetContextTagUnsignedInteger, currentNotification BACnetContextTagUnsignedInteger, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersBufferReady {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersBufferReady must not be nil")
 	}
@@ -88,7 +88,7 @@ func NewBACnetNotificationParametersBufferReady(openingTag BACnetOpeningTag, pee
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersBufferReady must not be nil")
 	}
 	_result := &_BACnetNotificationParametersBufferReady{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		BufferProperty:                       bufferProperty,
 		PreviousNotification:                 previousNotification,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go
index 00358fa3fc4..c6d71f25d85 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go
@@ -68,7 +68,7 @@ var _ BACnetNotificationParametersChangeOfBitString = (*_BACnetNotificationParam
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersChangeOfBitString)(nil)
 
 // NewBACnetNotificationParametersChangeOfBitString factory function for _BACnetNotificationParametersChangeOfBitString
-func NewBACnetNotificationParametersChangeOfBitString(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, changeOfBitString BACnetContextTagBitString, statusFlags BACnetStatusFlagsTagged, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersChangeOfBitString {
+func NewBACnetNotificationParametersChangeOfBitString(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, changeOfBitString BACnetContextTagBitString, statusFlags BACnetStatusFlagsTagged, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersChangeOfBitString {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersChangeOfBitString must not be nil")
 	}
@@ -82,7 +82,7 @@ func NewBACnetNotificationParametersChangeOfBitString(openingTag BACnetOpeningTa
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersChangeOfBitString must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfBitString{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		ChangeOfBitString:                    changeOfBitString,
 		StatusFlags:                          statusFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfCharacterString.go
index 51f352112de..60100ee4cec 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfCharacterString.go
@@ -71,7 +71,7 @@ var _ BACnetNotificationParametersChangeOfCharacterString = (*_BACnetNotificatio
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersChangeOfCharacterString)(nil)
 
 // NewBACnetNotificationParametersChangeOfCharacterString factory function for _BACnetNotificationParametersChangeOfCharacterString
-func NewBACnetNotificationParametersChangeOfCharacterString(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, changedValue BACnetContextTagCharacterString, statusFlags BACnetStatusFlagsTagged, alarmValue BACnetContextTagCharacterString, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersChangeOfCharacterString {
+func NewBACnetNotificationParametersChangeOfCharacterString(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, changedValue BACnetContextTagCharacterString, statusFlags BACnetStatusFlagsTagged, alarmValue BACnetContextTagCharacterString, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersChangeOfCharacterString {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersChangeOfCharacterString must not be nil")
 	}
@@ -88,7 +88,7 @@ func NewBACnetNotificationParametersChangeOfCharacterString(openingTag BACnetOpe
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersChangeOfCharacterString must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfCharacterString{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		ChangedValue:                         changedValue,
 		StatusFlags:                          statusFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValue.go
index 7bd53f8a657..2b237cb4599 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValue.go
@@ -68,7 +68,7 @@ var _ BACnetNotificationParametersChangeOfDiscreteValue = (*_BACnetNotificationP
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersChangeOfDiscreteValue)(nil)
 
 // NewBACnetNotificationParametersChangeOfDiscreteValue factory function for _BACnetNotificationParametersChangeOfDiscreteValue
-func NewBACnetNotificationParametersChangeOfDiscreteValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, newValue BACnetNotificationParametersChangeOfDiscreteValueNewValue, statusFlags BACnetStatusFlagsTagged, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersChangeOfDiscreteValue {
+func NewBACnetNotificationParametersChangeOfDiscreteValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, newValue BACnetNotificationParametersChangeOfDiscreteValueNewValue, statusFlags BACnetStatusFlagsTagged, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersChangeOfDiscreteValue {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersChangeOfDiscreteValue must not be nil")
 	}
@@ -82,7 +82,7 @@ func NewBACnetNotificationParametersChangeOfDiscreteValue(openingTag BACnetOpeni
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersChangeOfDiscreteValue must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfDiscreteValue{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		NewValue:                             newValue,
 		StatusFlags:                          statusFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValue.go
index 5bf7283c344..f9ac347c8cc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValue.go
@@ -60,8 +60,6 @@ type BACnetNotificationParametersChangeOfDiscreteValueNewValueContract interface
 	GetPeekedTagNumber() uint8
 	// GetPeekedIsContextTag returns PeekedIsContextTag (virtual field)
 	GetPeekedIsContextTag() bool
-	// GetTagNumber() returns a parser argument
-	GetTagNumber() uint8
 	// IsBACnetNotificationParametersChangeOfDiscreteValueNewValue is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetNotificationParametersChangeOfDiscreteValueNewValue()
 	// CreateBuilder creates a BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder
@@ -87,15 +85,12 @@ type _BACnetNotificationParametersChangeOfDiscreteValueNewValue struct {
 	OpeningTag      BACnetOpeningTag
 	PeekedTagHeader BACnetTagHeader
 	ClosingTag      BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueContract = (*_BACnetNotificationParametersChangeOfDiscreteValueNewValue)(nil)
 
 // NewBACnetNotificationParametersChangeOfDiscreteValueNewValue factory function for _BACnetNotificationParametersChangeOfDiscreteValueNewValue
-func NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetNotificationParametersChangeOfDiscreteValueNewValue {
+func NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetNotificationParametersChangeOfDiscreteValueNewValue {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetNotificationParametersChangeOfDiscreteValueNewValue must not be nil")
 	}
@@ -105,7 +100,7 @@ func NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag BAC
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetNotificationParametersChangeOfDiscreteValueNewValue must not be nil")
 	}
-	return &_BACnetNotificationParametersChangeOfDiscreteValueNewValue{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetNotificationParametersChangeOfDiscreteValueNewValue{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -130,8 +125,6 @@ type BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder interface
 	WithClosingTag(BACnetClosingTag) BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder
 	// AsBACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean converts this build to a subType of BACnetNotificationParametersChangeOfDiscreteValueNewValue. It is always possible to return to current builder using Done()
 	AsBACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean() BACnetNotificationParametersChangeOfDiscreteValueNewValueBooleanBuilder
 	// AsBACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned converts this build to a subType of BACnetNotificationParametersChangeOfDiscreteValueNewValue. It is always possible to return to current builder using Done()
@@ -232,11 +225,6 @@ func (b *_BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder) With
 	return b
 }
 
-func (b *_BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder) WithArgTagNumber(tagNumber uint8) BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder) PartialBuild() (BACnetNotificationParametersChangeOfDiscreteValueNewValueContract, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -504,7 +492,7 @@ func BACnetNotificationParametersChangeOfDiscreteValueNewValueParseWithBufferPro
 }
 
 func BACnetNotificationParametersChangeOfDiscreteValueNewValueParseWithBuffer[T BACnetNotificationParametersChangeOfDiscreteValueNewValue](ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (T, error) {
-	v, err := (&_BACnetNotificationParametersChangeOfDiscreteValueNewValue{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetNotificationParametersChangeOfDiscreteValueNewValue)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -658,16 +646,6 @@ func (pm *_BACnetNotificationParametersChangeOfDiscreteValueNewValue) serializeP
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetNotificationParametersChangeOfDiscreteValueNewValue) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetNotificationParametersChangeOfDiscreteValueNewValue) IsBACnetNotificationParametersChangeOfDiscreteValueNewValue() {
 }
 
@@ -684,7 +662,6 @@ func (m *_BACnetNotificationParametersChangeOfDiscreteValueNewValue) deepCopy()
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetTagHeader](m.PeekedTagHeader),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetNotificationParametersChangeOfDiscreteValueNewValueCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean.go
index 2c11f9c42d7..4df35100ae4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean.go
@@ -59,12 +59,12 @@ var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean = (*_BACn
 var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueRequirements = (*_BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean)(nil)
 
 // NewBACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean factory function for _BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean
-func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, booleanValue BACnetApplicationTagBoolean, tagNumber uint8) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean {
+func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, booleanValue BACnetApplicationTagBoolean) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean {
 	if booleanValue == nil {
 		panic("booleanValue of type BACnetApplicationTagBoolean for BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean{
-		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag),
 		BooleanValue: booleanValue,
 	}
 	_result.BACnetNotificationParametersChangeOfDiscreteValueNewValueContract.(*_BACnetNotificationParametersChangeOfDiscreteValueNewValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString.go
index b88f49c43e5..48e3ee9a187 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString.go
@@ -59,12 +59,12 @@ var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString =
 var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueRequirements = (*_BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString)(nil)
 
 // NewBACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString factory function for _BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString
-func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, characterStringValue BACnetApplicationTagCharacterString, tagNumber uint8) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString {
+func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, characterStringValue BACnetApplicationTagCharacterString) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString {
 	if characterStringValue == nil {
 		panic("characterStringValue of type BACnetApplicationTagCharacterString for BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString{
-		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag),
 		CharacterStringValue: characterStringValue,
 	}
 	_result.BACnetNotificationParametersChangeOfDiscreteValueNewValueContract.(*_BACnetNotificationParametersChangeOfDiscreteValueNewValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime.go
index 30cf1ef351a..7df8bfba483 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime.go
@@ -59,12 +59,12 @@ var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime = (*_BAC
 var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueRequirements = (*_BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime)(nil)
 
 // NewBACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime factory function for _BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime
-func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, dateTimeValue BACnetDateTimeEnclosed, tagNumber uint8) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime {
+func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, dateTimeValue BACnetDateTimeEnclosed) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime {
 	if dateTimeValue == nil {
 		panic("dateTimeValue of type BACnetDateTimeEnclosed for BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime{
-		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag),
 		DateTimeValue: dateTimeValue,
 	}
 	_result.BACnetNotificationParametersChangeOfDiscreteValueNewValueContract.(*_BACnetNotificationParametersChangeOfDiscreteValueNewValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated.go
index 62d1f8d8d0a..1c80cd42535 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated.go
@@ -59,12 +59,12 @@ var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated = (*_B
 var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueRequirements = (*_BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated)(nil)
 
 // NewBACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated factory function for _BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated
-func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, enumeratedValue BACnetApplicationTagEnumerated, tagNumber uint8) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated {
+func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, enumeratedValue BACnetApplicationTagEnumerated) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated {
 	if enumeratedValue == nil {
 		panic("enumeratedValue of type BACnetApplicationTagEnumerated for BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated{
-		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag),
 		EnumeratedValue: enumeratedValue,
 	}
 	_result.BACnetNotificationParametersChangeOfDiscreteValueNewValueContract.(*_BACnetNotificationParametersChangeOfDiscreteValueNewValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger.go
index ca8b2f4ccec..84852174cb8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger.go
@@ -59,12 +59,12 @@ var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger = (*_BACn
 var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueRequirements = (*_BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger)(nil)
 
 // NewBACnetNotificationParametersChangeOfDiscreteValueNewValueInteger factory function for _BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger
-func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueInteger(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, integerValue BACnetApplicationTagSignedInteger, tagNumber uint8) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger {
+func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueInteger(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, integerValue BACnetApplicationTagSignedInteger) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger {
 	if integerValue == nil {
 		panic("integerValue of type BACnetApplicationTagSignedInteger for BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger{
-		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag),
 		IntegerValue: integerValue,
 	}
 	_result.BACnetNotificationParametersChangeOfDiscreteValueNewValueContract.(*_BACnetNotificationParametersChangeOfDiscreteValueNewValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier.go
index ec1221cc95e..ee4ac61d99d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier.go
@@ -59,12 +59,12 @@ var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier
 var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueRequirements = (*_BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier)(nil)
 
 // NewBACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier factory function for _BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier
-func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, objectidentifierValue BACnetApplicationTagObjectIdentifier, tagNumber uint8) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier {
+func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, objectidentifierValue BACnetApplicationTagObjectIdentifier) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier {
 	if objectidentifierValue == nil {
 		panic("objectidentifierValue of type BACnetApplicationTagObjectIdentifier for BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier{
-		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag),
 		ObjectidentifierValue: objectidentifierValue,
 	}
 	_result.BACnetNotificationParametersChangeOfDiscreteValueNewValueContract.(*_BACnetNotificationParametersChangeOfDiscreteValueNewValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate.go
index 1ac245d70fd..ecb78e42233 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate.go
@@ -59,12 +59,12 @@ var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate = (*_BA
 var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueRequirements = (*_BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate)(nil)
 
 // NewBACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate factory function for _BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate
-func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, dateValue BACnetApplicationTagDate, tagNumber uint8) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate {
+func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, dateValue BACnetApplicationTagDate) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate {
 	if dateValue == nil {
 		panic("dateValue of type BACnetApplicationTagDate for BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate{
-		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag),
 		DateValue: dateValue,
 	}
 	_result.BACnetNotificationParametersChangeOfDiscreteValueNewValueContract.(*_BACnetNotificationParametersChangeOfDiscreteValueNewValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString.go
index 956b874240c..3dc988f46f0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString.go
@@ -59,12 +59,12 @@ var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString = (*_
 var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueRequirements = (*_BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString)(nil)
 
 // NewBACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString factory function for _BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString
-func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, octetStringValue BACnetApplicationTagOctetString, tagNumber uint8) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString {
+func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, octetStringValue BACnetApplicationTagOctetString) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString {
 	if octetStringValue == nil {
 		panic("octetStringValue of type BACnetApplicationTagOctetString for BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString{
-		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag),
 		OctetStringValue: octetStringValue,
 	}
 	_result.BACnetNotificationParametersChangeOfDiscreteValueNewValueContract.(*_BACnetNotificationParametersChangeOfDiscreteValueNewValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime.go
index 3f3f28dee5e..86ac4d8e2a7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime.go
@@ -59,12 +59,12 @@ var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime = (*_BA
 var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueRequirements = (*_BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime)(nil)
 
 // NewBACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime factory function for _BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime
-func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeValue BACnetApplicationTagTime, tagNumber uint8) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime {
+func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, timeValue BACnetApplicationTagTime) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime {
 	if timeValue == nil {
 		panic("timeValue of type BACnetApplicationTagTime for BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime{
-		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag),
 		TimeValue: timeValue,
 	}
 	_result.BACnetNotificationParametersChangeOfDiscreteValueNewValueContract.(*_BACnetNotificationParametersChangeOfDiscreteValueNewValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned.go
index ede95f338f4..45dbafad55a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned.go
@@ -59,12 +59,12 @@ var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned = (*_BAC
 var _ BACnetNotificationParametersChangeOfDiscreteValueNewValueRequirements = (*_BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned)(nil)
 
 // NewBACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned factory function for _BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned
-func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, unsignedValue BACnetApplicationTagUnsignedInteger, tagNumber uint8) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned {
+func NewBACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, unsignedValue BACnetApplicationTagUnsignedInteger) *_BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned {
 	if unsignedValue == nil {
 		panic("unsignedValue of type BACnetApplicationTagUnsignedInteger for BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned{
-		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetNotificationParametersChangeOfDiscreteValueNewValueContract: NewBACnetNotificationParametersChangeOfDiscreteValueNewValue(openingTag, peekedTagHeader, closingTag),
 		UnsignedValue: unsignedValue,
 	}
 	_result.BACnetNotificationParametersChangeOfDiscreteValueNewValueContract.(*_BACnetNotificationParametersChangeOfDiscreteValueNewValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfLifeSafety.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfLifeSafety.go
index d7aa1ae81ec..8e162977d99 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfLifeSafety.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfLifeSafety.go
@@ -74,7 +74,7 @@ var _ BACnetNotificationParametersChangeOfLifeSafety = (*_BACnetNotificationPara
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersChangeOfLifeSafety)(nil)
 
 // NewBACnetNotificationParametersChangeOfLifeSafety factory function for _BACnetNotificationParametersChangeOfLifeSafety
-func NewBACnetNotificationParametersChangeOfLifeSafety(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, newState BACnetLifeSafetyStateTagged, newMode BACnetLifeSafetyModeTagged, statusFlags BACnetStatusFlagsTagged, operationExpected BACnetLifeSafetyOperationTagged, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersChangeOfLifeSafety {
+func NewBACnetNotificationParametersChangeOfLifeSafety(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, newState BACnetLifeSafetyStateTagged, newMode BACnetLifeSafetyModeTagged, statusFlags BACnetStatusFlagsTagged, operationExpected BACnetLifeSafetyOperationTagged, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersChangeOfLifeSafety {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersChangeOfLifeSafety must not be nil")
 	}
@@ -94,7 +94,7 @@ func NewBACnetNotificationParametersChangeOfLifeSafety(openingTag BACnetOpeningT
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersChangeOfLifeSafety must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfLifeSafety{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		NewState:                             newState,
 		NewMode:                              newMode,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfReliability.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfReliability.go
index 81bf5b0b63b..10248f85c5f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfReliability.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfReliability.go
@@ -71,7 +71,7 @@ var _ BACnetNotificationParametersChangeOfReliability = (*_BACnetNotificationPar
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersChangeOfReliability)(nil)
 
 // NewBACnetNotificationParametersChangeOfReliability factory function for _BACnetNotificationParametersChangeOfReliability
-func NewBACnetNotificationParametersChangeOfReliability(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, reliability BACnetReliabilityTagged, statusFlags BACnetStatusFlagsTagged, propertyValues BACnetPropertyValues, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersChangeOfReliability {
+func NewBACnetNotificationParametersChangeOfReliability(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, reliability BACnetReliabilityTagged, statusFlags BACnetStatusFlagsTagged, propertyValues BACnetPropertyValues, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersChangeOfReliability {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersChangeOfReliability must not be nil")
 	}
@@ -88,7 +88,7 @@ func NewBACnetNotificationParametersChangeOfReliability(openingTag BACnetOpening
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersChangeOfReliability must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfReliability{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		Reliability:                          reliability,
 		StatusFlags:                          statusFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go
index e7c5c069535..2bc1985c495 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go
@@ -68,7 +68,7 @@ var _ BACnetNotificationParametersChangeOfState = (*_BACnetNotificationParameter
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersChangeOfState)(nil)
 
 // NewBACnetNotificationParametersChangeOfState factory function for _BACnetNotificationParametersChangeOfState
-func NewBACnetNotificationParametersChangeOfState(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, changeOfState BACnetPropertyStatesEnclosed, statusFlags BACnetStatusFlagsTagged, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersChangeOfState {
+func NewBACnetNotificationParametersChangeOfState(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, changeOfState BACnetPropertyStatesEnclosed, statusFlags BACnetStatusFlagsTagged, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersChangeOfState {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersChangeOfState must not be nil")
 	}
@@ -82,7 +82,7 @@ func NewBACnetNotificationParametersChangeOfState(openingTag BACnetOpeningTag, p
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersChangeOfState must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfState{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		ChangeOfState:                        changeOfState,
 		StatusFlags:                          statusFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfStatusFlags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfStatusFlags.go
index 59d6d280e50..fed04085239 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfStatusFlags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfStatusFlags.go
@@ -68,7 +68,7 @@ var _ BACnetNotificationParametersChangeOfStatusFlags = (*_BACnetNotificationPar
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersChangeOfStatusFlags)(nil)
 
 // NewBACnetNotificationParametersChangeOfStatusFlags factory function for _BACnetNotificationParametersChangeOfStatusFlags
-func NewBACnetNotificationParametersChangeOfStatusFlags(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, presentValue BACnetConstructedData, referencedFlags BACnetStatusFlagsTagged, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersChangeOfStatusFlags {
+func NewBACnetNotificationParametersChangeOfStatusFlags(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, presentValue BACnetConstructedData, referencedFlags BACnetStatusFlagsTagged, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersChangeOfStatusFlags {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersChangeOfStatusFlags must not be nil")
 	}
@@ -82,7 +82,7 @@ func NewBACnetNotificationParametersChangeOfStatusFlags(openingTag BACnetOpening
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersChangeOfStatusFlags must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfStatusFlags{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		PresentValue:                         presentValue,
 		ReferencedFlags:                      referencedFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go
index bff1a3845b8..171d84449d5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go
@@ -80,7 +80,7 @@ var _ BACnetNotificationParametersChangeOfTimer = (*_BACnetNotificationParameter
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersChangeOfTimer)(nil)
 
 // NewBACnetNotificationParametersChangeOfTimer factory function for _BACnetNotificationParametersChangeOfTimer
-func NewBACnetNotificationParametersChangeOfTimer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, newValue BACnetTimerStateTagged, statusFlags BACnetStatusFlagsTagged, updateTime BACnetDateTimeEnclosed, lastStateChange BACnetTimerTransitionTagged, initialTimeout BACnetContextTagUnsignedInteger, expirationTime BACnetDateTimeEnclosed, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersChangeOfTimer {
+func NewBACnetNotificationParametersChangeOfTimer(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, newValue BACnetTimerStateTagged, statusFlags BACnetStatusFlagsTagged, updateTime BACnetDateTimeEnclosed, lastStateChange BACnetTimerTransitionTagged, initialTimeout BACnetContextTagUnsignedInteger, expirationTime BACnetDateTimeEnclosed, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersChangeOfTimer {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersChangeOfTimer must not be nil")
 	}
@@ -97,7 +97,7 @@ func NewBACnetNotificationParametersChangeOfTimer(openingTag BACnetOpeningTag, p
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersChangeOfTimer must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfTimer{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		NewValue:                             newValue,
 		StatusFlags:                          statusFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go
index b722177dc4e..a66498923d1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go
@@ -68,7 +68,7 @@ var _ BACnetNotificationParametersChangeOfValue = (*_BACnetNotificationParameter
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersChangeOfValue)(nil)
 
 // NewBACnetNotificationParametersChangeOfValue factory function for _BACnetNotificationParametersChangeOfValue
-func NewBACnetNotificationParametersChangeOfValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, newValue BACnetNotificationParametersChangeOfValueNewValue, statusFlags BACnetStatusFlagsTagged, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersChangeOfValue {
+func NewBACnetNotificationParametersChangeOfValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, newValue BACnetNotificationParametersChangeOfValueNewValue, statusFlags BACnetStatusFlagsTagged, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersChangeOfValue {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersChangeOfValue must not be nil")
 	}
@@ -82,7 +82,7 @@ func NewBACnetNotificationParametersChangeOfValue(openingTag BACnetOpeningTag, p
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersChangeOfValue must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfValue{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		NewValue:                             newValue,
 		StatusFlags:                          statusFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
index beeb83448ef..5f0bdf2cecf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
@@ -58,8 +58,6 @@ type BACnetNotificationParametersChangeOfValueNewValueContract interface {
 	GetClosingTag() BACnetClosingTag
 	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
-	// GetTagNumber() returns a parser argument
-	GetTagNumber() uint8
 	// IsBACnetNotificationParametersChangeOfValueNewValue is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetNotificationParametersChangeOfValueNewValue()
 	// CreateBuilder creates a BACnetNotificationParametersChangeOfValueNewValueBuilder
@@ -83,15 +81,12 @@ type _BACnetNotificationParametersChangeOfValueNewValue struct {
 	OpeningTag      BACnetOpeningTag
 	PeekedTagHeader BACnetTagHeader
 	ClosingTag      BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetNotificationParametersChangeOfValueNewValueContract = (*_BACnetNotificationParametersChangeOfValueNewValue)(nil)
 
 // NewBACnetNotificationParametersChangeOfValueNewValue factory function for _BACnetNotificationParametersChangeOfValueNewValue
-func NewBACnetNotificationParametersChangeOfValueNewValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetNotificationParametersChangeOfValueNewValue {
+func NewBACnetNotificationParametersChangeOfValueNewValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag) *_BACnetNotificationParametersChangeOfValueNewValue {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetNotificationParametersChangeOfValueNewValue must not be nil")
 	}
@@ -101,7 +96,7 @@ func NewBACnetNotificationParametersChangeOfValueNewValue(openingTag BACnetOpeni
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetNotificationParametersChangeOfValueNewValue must not be nil")
 	}
-	return &_BACnetNotificationParametersChangeOfValueNewValue{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetNotificationParametersChangeOfValueNewValue{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -126,8 +121,6 @@ type BACnetNotificationParametersChangeOfValueNewValueBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetNotificationParametersChangeOfValueNewValueBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetNotificationParametersChangeOfValueNewValueBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetNotificationParametersChangeOfValueNewValueBuilder
 	// AsBACnetNotificationParametersChangeOfValueNewValueChangedBits converts this build to a subType of BACnetNotificationParametersChangeOfValueNewValue. It is always possible to return to current builder using Done()
 	AsBACnetNotificationParametersChangeOfValueNewValueChangedBits() BACnetNotificationParametersChangeOfValueNewValueChangedBitsBuilder
 	// AsBACnetNotificationParametersChangeOfValueNewValueChangedValue converts this build to a subType of BACnetNotificationParametersChangeOfValueNewValue. It is always possible to return to current builder using Done()
@@ -212,11 +205,6 @@ func (b *_BACnetNotificationParametersChangeOfValueNewValueBuilder) WithClosingT
 	return b
 }
 
-func (b *_BACnetNotificationParametersChangeOfValueNewValueBuilder) WithArgTagNumber(tagNumber uint8) BACnetNotificationParametersChangeOfValueNewValueBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetNotificationParametersChangeOfValueNewValueBuilder) PartialBuild() (BACnetNotificationParametersChangeOfValueNewValueContract, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -395,7 +383,7 @@ func BACnetNotificationParametersChangeOfValueNewValueParseWithBufferProducer[T
 }
 
 func BACnetNotificationParametersChangeOfValueNewValueParseWithBuffer[T BACnetNotificationParametersChangeOfValueNewValue](ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (T, error) {
-	v, err := (&_BACnetNotificationParametersChangeOfValueNewValue{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetNotificationParametersChangeOfValueNewValue)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -500,16 +488,6 @@ func (pm *_BACnetNotificationParametersChangeOfValueNewValue) serializeParent(ct
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetNotificationParametersChangeOfValueNewValue) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetNotificationParametersChangeOfValueNewValue) IsBACnetNotificationParametersChangeOfValueNewValue() {
 }
 
@@ -526,7 +504,6 @@ func (m *_BACnetNotificationParametersChangeOfValueNewValue) deepCopy() *_BACnet
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetTagHeader](m.PeekedTagHeader),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetNotificationParametersChangeOfValueNewValueCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go
index 8edb38feb58..ec81f57a897 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go
@@ -59,12 +59,12 @@ var _ BACnetNotificationParametersChangeOfValueNewValueChangedBits = (*_BACnetNo
 var _ BACnetNotificationParametersChangeOfValueNewValueRequirements = (*_BACnetNotificationParametersChangeOfValueNewValueChangedBits)(nil)
 
 // NewBACnetNotificationParametersChangeOfValueNewValueChangedBits factory function for _BACnetNotificationParametersChangeOfValueNewValueChangedBits
-func NewBACnetNotificationParametersChangeOfValueNewValueChangedBits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, changedBits BACnetContextTagBitString, tagNumber uint8) *_BACnetNotificationParametersChangeOfValueNewValueChangedBits {
+func NewBACnetNotificationParametersChangeOfValueNewValueChangedBits(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, changedBits BACnetContextTagBitString) *_BACnetNotificationParametersChangeOfValueNewValueChangedBits {
 	if changedBits == nil {
 		panic("changedBits of type BACnetContextTagBitString for BACnetNotificationParametersChangeOfValueNewValueChangedBits must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfValueNewValueChangedBits{
-		BACnetNotificationParametersChangeOfValueNewValueContract: NewBACnetNotificationParametersChangeOfValueNewValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetNotificationParametersChangeOfValueNewValueContract: NewBACnetNotificationParametersChangeOfValueNewValue(openingTag, peekedTagHeader, closingTag),
 		ChangedBits: changedBits,
 	}
 	_result.BACnetNotificationParametersChangeOfValueNewValueContract.(*_BACnetNotificationParametersChangeOfValueNewValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go
index 3f4e72f0d21..5e937b5f109 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go
@@ -59,12 +59,12 @@ var _ BACnetNotificationParametersChangeOfValueNewValueChangedValue = (*_BACnetN
 var _ BACnetNotificationParametersChangeOfValueNewValueRequirements = (*_BACnetNotificationParametersChangeOfValueNewValueChangedValue)(nil)
 
 // NewBACnetNotificationParametersChangeOfValueNewValueChangedValue factory function for _BACnetNotificationParametersChangeOfValueNewValueChangedValue
-func NewBACnetNotificationParametersChangeOfValueNewValueChangedValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, changedValue BACnetContextTagReal, tagNumber uint8) *_BACnetNotificationParametersChangeOfValueNewValueChangedValue {
+func NewBACnetNotificationParametersChangeOfValueNewValueChangedValue(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, changedValue BACnetContextTagReal) *_BACnetNotificationParametersChangeOfValueNewValueChangedValue {
 	if changedValue == nil {
 		panic("changedValue of type BACnetContextTagReal for BACnetNotificationParametersChangeOfValueNewValueChangedValue must not be nil")
 	}
 	_result := &_BACnetNotificationParametersChangeOfValueNewValueChangedValue{
-		BACnetNotificationParametersChangeOfValueNewValueContract: NewBACnetNotificationParametersChangeOfValueNewValue(openingTag, peekedTagHeader, closingTag, tagNumber),
+		BACnetNotificationParametersChangeOfValueNewValueContract: NewBACnetNotificationParametersChangeOfValueNewValue(openingTag, peekedTagHeader, closingTag),
 		ChangedValue: changedValue,
 	}
 	_result.BACnetNotificationParametersChangeOfValueNewValueContract.(*_BACnetNotificationParametersChangeOfValueNewValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersCommandFailure.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersCommandFailure.go
index cdad76828d6..a62bf240e82 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersCommandFailure.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersCommandFailure.go
@@ -71,7 +71,7 @@ var _ BACnetNotificationParametersCommandFailure = (*_BACnetNotificationParamete
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersCommandFailure)(nil)
 
 // NewBACnetNotificationParametersCommandFailure factory function for _BACnetNotificationParametersCommandFailure
-func NewBACnetNotificationParametersCommandFailure(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, commandValue BACnetConstructedData, statusFlags BACnetStatusFlagsTagged, feedbackValue BACnetConstructedData, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersCommandFailure {
+func NewBACnetNotificationParametersCommandFailure(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, commandValue BACnetConstructedData, statusFlags BACnetStatusFlagsTagged, feedbackValue BACnetConstructedData, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersCommandFailure {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersCommandFailure must not be nil")
 	}
@@ -88,7 +88,7 @@ func NewBACnetNotificationParametersCommandFailure(openingTag BACnetOpeningTag,
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersCommandFailure must not be nil")
 	}
 	_result := &_BACnetNotificationParametersCommandFailure{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		CommandValue:                         commandValue,
 		StatusFlags:                          statusFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go
index bc5494f0b40..0f061c782f5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go
@@ -59,12 +59,12 @@ var _ BACnetNotificationParametersComplexEventType = (*_BACnetNotificationParame
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersComplexEventType)(nil)
 
 // NewBACnetNotificationParametersComplexEventType factory function for _BACnetNotificationParametersComplexEventType
-func NewBACnetNotificationParametersComplexEventType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, listOfValues BACnetPropertyValues, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersComplexEventType {
+func NewBACnetNotificationParametersComplexEventType(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, listOfValues BACnetPropertyValues) *_BACnetNotificationParametersComplexEventType {
 	if listOfValues == nil {
 		panic("listOfValues of type BACnetPropertyValues for BACnetNotificationParametersComplexEventType must not be nil")
 	}
 	_result := &_BACnetNotificationParametersComplexEventType{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		ListOfValues:                         listOfValues,
 	}
 	_result.BACnetNotificationParametersContract.(*_BACnetNotificationParameters)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersDoubleOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersDoubleOutOfRange.go
index 70941f0937a..9739e5f4f8e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersDoubleOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersDoubleOutOfRange.go
@@ -74,7 +74,7 @@ var _ BACnetNotificationParametersDoubleOutOfRange = (*_BACnetNotificationParame
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersDoubleOutOfRange)(nil)
 
 // NewBACnetNotificationParametersDoubleOutOfRange factory function for _BACnetNotificationParametersDoubleOutOfRange
-func NewBACnetNotificationParametersDoubleOutOfRange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, exceedingValue BACnetContextTagDouble, statusFlags BACnetStatusFlagsTagged, deadband BACnetContextTagDouble, exceededLimit BACnetContextTagDouble, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersDoubleOutOfRange {
+func NewBACnetNotificationParametersDoubleOutOfRange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, exceedingValue BACnetContextTagDouble, statusFlags BACnetStatusFlagsTagged, deadband BACnetContextTagDouble, exceededLimit BACnetContextTagDouble, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersDoubleOutOfRange {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersDoubleOutOfRange must not be nil")
 	}
@@ -94,7 +94,7 @@ func NewBACnetNotificationParametersDoubleOutOfRange(openingTag BACnetOpeningTag
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersDoubleOutOfRange must not be nil")
 	}
 	_result := &_BACnetNotificationParametersDoubleOutOfRange{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		ExceedingValue:                       exceedingValue,
 		StatusFlags:                          statusFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go
index 2c1a77b2b6b..ba9604e972b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go
@@ -71,7 +71,7 @@ var _ BACnetNotificationParametersExtended = (*_BACnetNotificationParametersExte
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersExtended)(nil)
 
 // NewBACnetNotificationParametersExtended factory function for _BACnetNotificationParametersExtended
-func NewBACnetNotificationParametersExtended(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, vendorId BACnetVendorIdTagged, extendedEventType BACnetContextTagUnsignedInteger, parameters BACnetNotificationParametersExtendedParameters, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersExtended {
+func NewBACnetNotificationParametersExtended(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, vendorId BACnetVendorIdTagged, extendedEventType BACnetContextTagUnsignedInteger, parameters BACnetNotificationParametersExtendedParameters, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersExtended {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersExtended must not be nil")
 	}
@@ -88,7 +88,7 @@ func NewBACnetNotificationParametersExtended(openingTag BACnetOpeningTag, peeked
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersExtended must not be nil")
 	}
 	_result := &_BACnetNotificationParametersExtended{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		VendorId:                             vendorId,
 		ExtendedEventType:                    extendedEventType,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
index b559a3bd5af..8945041c9bf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
@@ -105,15 +105,12 @@ type _BACnetNotificationParametersExtendedParameters struct {
 	ObjectIdentifier     BACnetApplicationTagObjectIdentifier
 	Reference            BACnetDeviceObjectPropertyReferenceEnclosed
 	ClosingTag           BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetNotificationParametersExtendedParameters = (*_BACnetNotificationParametersExtendedParameters)(nil)
 
 // NewBACnetNotificationParametersExtendedParameters factory function for _BACnetNotificationParametersExtendedParameters
-func NewBACnetNotificationParametersExtendedParameters(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, nullValue BACnetApplicationTagNull, realValue BACnetApplicationTagReal, unsignedValue BACnetApplicationTagUnsignedInteger, booleanValue BACnetApplicationTagBoolean, integerValue BACnetApplicationTagSignedInteger, doubleValue BACnetApplicationTagDouble, octetStringValue BACnetApplicationTagOctetString, characterStringValue BACnetApplicationTagCharacterString, bitStringValue BACnetApplicationTagBitString, enumeratedValue BACnetApplicationTagEnumerated, dateValue BACnetApplicationTagDate, timeValue BACnetApplicationTagTime, objectIdentifier BACnetApplicationTagObjectIdentifier, reference BACnetDeviceObjectPropertyReferenceEnclosed, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetNotificationParametersExtendedParameters {
+func NewBACnetNotificationParametersExtendedParameters(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, nullValue BACnetApplicationTagNull, realValue BACnetApplicationTagReal, unsignedValue BACnetApplicationTagUnsignedInteger, booleanValue BACnetApplicationTagBoolean, integerValue BACnetApplicationTagSignedInteger, doubleValue BACnetApplicationTagDouble, octetStringValue BACnetApplicationTagOctetString, characterStringValue BACnetApplicationTagCharacterString, bitStringValue BACnetApplicationTagBitString, enumeratedValue BACnetApplicationTagEnumerated, dateValue BACnetApplicationTagDate, timeValue BACnetApplicationTagTime, objectIdentifier BACnetApplicationTagObjectIdentifier, reference BACnetDeviceObjectPropertyReferenceEnclosed, closingTag BACnetClosingTag) *_BACnetNotificationParametersExtendedParameters {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetNotificationParametersExtendedParameters must not be nil")
 	}
@@ -123,7 +120,7 @@ func NewBACnetNotificationParametersExtendedParameters(openingTag BACnetOpeningT
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetNotificationParametersExtendedParameters must not be nil")
 	}
-	return &_BACnetNotificationParametersExtendedParameters{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, NullValue: nullValue, RealValue: realValue, UnsignedValue: unsignedValue, BooleanValue: booleanValue, IntegerValue: integerValue, DoubleValue: doubleValue, OctetStringValue: octetStringValue, CharacterStringValue: characterStringValue, BitStringValue: bitStringValue, EnumeratedValue: enumeratedValue, DateValue: dateValue, TimeValue: timeValue, ObjectIdentifier: objectIdentifier, Reference: reference, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetNotificationParametersExtendedParameters{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, NullValue: nullValue, RealValue: realValue, UnsignedValue: unsignedValue, BooleanValue: booleanValue, IntegerValue: integerValue, DoubleValue: doubleValue, OctetStringValue: octetStringValue, CharacterStringValue: characterStringValue, BitStringValue: bitStringValue, EnumeratedValue: enumeratedValue, DateValue: dateValue, TimeValue: timeValue, ObjectIdentifier: objectIdentifier, Reference: reference, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -204,8 +201,6 @@ type BACnetNotificationParametersExtendedParametersBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetNotificationParametersExtendedParametersBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetNotificationParametersExtendedParametersBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetNotificationParametersExtendedParametersBuilder
 	// Build builds the BACnetNotificationParametersExtendedParameters or returns an error if something is wrong
 	Build() (BACnetNotificationParametersExtendedParameters, error)
 	// MustBuild does the same as Build but panics on error
@@ -484,11 +479,6 @@ func (b *_BACnetNotificationParametersExtendedParametersBuilder) WithClosingTagB
 	return b
 }
 
-func (b *_BACnetNotificationParametersExtendedParametersBuilder) WithArgTagNumber(tagNumber uint8) BACnetNotificationParametersExtendedParametersBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetNotificationParametersExtendedParametersBuilder) Build() (BACnetNotificationParametersExtendedParameters, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -841,7 +831,7 @@ func BACnetNotificationParametersExtendedParametersParseWithBufferProducer(tagNu
 }
 
 func BACnetNotificationParametersExtendedParametersParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetNotificationParametersExtendedParameters, error) {
-	v, err := (&_BACnetNotificationParametersExtendedParameters{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetNotificationParametersExtendedParameters)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -1145,16 +1135,6 @@ func (m *_BACnetNotificationParametersExtendedParameters) SerializeWithWriteBuff
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetNotificationParametersExtendedParameters) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetNotificationParametersExtendedParameters) IsBACnetNotificationParametersExtendedParameters() {
 }
 
@@ -1184,7 +1164,6 @@ func (m *_BACnetNotificationParametersExtendedParameters) deepCopy() *_BACnetNot
 		utils.DeepCopy[BACnetApplicationTagObjectIdentifier](m.ObjectIdentifier),
 		utils.DeepCopy[BACnetDeviceObjectPropertyReferenceEnclosed](m.Reference),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetNotificationParametersExtendedParametersCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go
index 8f996753ef2..af4e8d11965 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go
@@ -74,7 +74,7 @@ var _ BACnetNotificationParametersFloatingLimit = (*_BACnetNotificationParameter
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersFloatingLimit)(nil)
 
 // NewBACnetNotificationParametersFloatingLimit factory function for _BACnetNotificationParametersFloatingLimit
-func NewBACnetNotificationParametersFloatingLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, referenceValue BACnetContextTagReal, statusFlags BACnetStatusFlagsTagged, setPointValue BACnetContextTagReal, errorLimit BACnetContextTagReal, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersFloatingLimit {
+func NewBACnetNotificationParametersFloatingLimit(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, referenceValue BACnetContextTagReal, statusFlags BACnetStatusFlagsTagged, setPointValue BACnetContextTagReal, errorLimit BACnetContextTagReal, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersFloatingLimit {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersFloatingLimit must not be nil")
 	}
@@ -94,7 +94,7 @@ func NewBACnetNotificationParametersFloatingLimit(openingTag BACnetOpeningTag, p
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersFloatingLimit must not be nil")
 	}
 	_result := &_BACnetNotificationParametersFloatingLimit{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		ReferenceValue:                       referenceValue,
 		StatusFlags:                          statusFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go
index 0b722353243..fc866b7e46d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go
@@ -74,7 +74,7 @@ var _ BACnetNotificationParametersOutOfRange = (*_BACnetNotificationParametersOu
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersOutOfRange)(nil)
 
 // NewBACnetNotificationParametersOutOfRange factory function for _BACnetNotificationParametersOutOfRange
-func NewBACnetNotificationParametersOutOfRange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, exceedingValue BACnetContextTagReal, statusFlags BACnetStatusFlagsTagged, deadband BACnetContextTagReal, exceededLimit BACnetContextTagReal, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersOutOfRange {
+func NewBACnetNotificationParametersOutOfRange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, exceedingValue BACnetContextTagReal, statusFlags BACnetStatusFlagsTagged, deadband BACnetContextTagReal, exceededLimit BACnetContextTagReal, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersOutOfRange {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersOutOfRange must not be nil")
 	}
@@ -94,7 +94,7 @@ func NewBACnetNotificationParametersOutOfRange(openingTag BACnetOpeningTag, peek
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersOutOfRange must not be nil")
 	}
 	_result := &_BACnetNotificationParametersOutOfRange{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		ExceedingValue:                       exceedingValue,
 		StatusFlags:                          statusFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersSignedOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersSignedOutOfRange.go
index c126512c6b6..1f9a0c527d0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersSignedOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersSignedOutOfRange.go
@@ -74,7 +74,7 @@ var _ BACnetNotificationParametersSignedOutOfRange = (*_BACnetNotificationParame
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersSignedOutOfRange)(nil)
 
 // NewBACnetNotificationParametersSignedOutOfRange factory function for _BACnetNotificationParametersSignedOutOfRange
-func NewBACnetNotificationParametersSignedOutOfRange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, exceedingValue BACnetContextTagSignedInteger, statusFlags BACnetStatusFlagsTagged, deadband BACnetContextTagUnsignedInteger, exceededLimit BACnetContextTagSignedInteger, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersSignedOutOfRange {
+func NewBACnetNotificationParametersSignedOutOfRange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, exceedingValue BACnetContextTagSignedInteger, statusFlags BACnetStatusFlagsTagged, deadband BACnetContextTagUnsignedInteger, exceededLimit BACnetContextTagSignedInteger, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersSignedOutOfRange {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersSignedOutOfRange must not be nil")
 	}
@@ -94,7 +94,7 @@ func NewBACnetNotificationParametersSignedOutOfRange(openingTag BACnetOpeningTag
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersSignedOutOfRange must not be nil")
 	}
 	_result := &_BACnetNotificationParametersSignedOutOfRange{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		ExceedingValue:                       exceedingValue,
 		StatusFlags:                          statusFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedOutOfRange.go
index d3717531e87..0bcb145dd31 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedOutOfRange.go
@@ -74,7 +74,7 @@ var _ BACnetNotificationParametersUnsignedOutOfRange = (*_BACnetNotificationPara
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersUnsignedOutOfRange)(nil)
 
 // NewBACnetNotificationParametersUnsignedOutOfRange factory function for _BACnetNotificationParametersUnsignedOutOfRange
-func NewBACnetNotificationParametersUnsignedOutOfRange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, exceedingValue BACnetContextTagUnsignedInteger, statusFlags BACnetStatusFlagsTagged, deadband BACnetContextTagUnsignedInteger, exceededLimit BACnetContextTagUnsignedInteger, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersUnsignedOutOfRange {
+func NewBACnetNotificationParametersUnsignedOutOfRange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, exceedingValue BACnetContextTagUnsignedInteger, statusFlags BACnetStatusFlagsTagged, deadband BACnetContextTagUnsignedInteger, exceededLimit BACnetContextTagUnsignedInteger, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersUnsignedOutOfRange {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersUnsignedOutOfRange must not be nil")
 	}
@@ -94,7 +94,7 @@ func NewBACnetNotificationParametersUnsignedOutOfRange(openingTag BACnetOpeningT
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersUnsignedOutOfRange must not be nil")
 	}
 	_result := &_BACnetNotificationParametersUnsignedOutOfRange{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		ExceedingValue:                       exceedingValue,
 		StatusFlags:                          statusFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go
index 117f3207e44..6d7470de3ae 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go
@@ -71,7 +71,7 @@ var _ BACnetNotificationParametersUnsignedRange = (*_BACnetNotificationParameter
 var _ BACnetNotificationParametersRequirements = (*_BACnetNotificationParametersUnsignedRange)(nil)
 
 // NewBACnetNotificationParametersUnsignedRange factory function for _BACnetNotificationParametersUnsignedRange
-func NewBACnetNotificationParametersUnsignedRange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, sequenceNumber BACnetContextTagUnsignedInteger, statusFlags BACnetStatusFlagsTagged, exceededLimit BACnetContextTagUnsignedInteger, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetNotificationParametersUnsignedRange {
+func NewBACnetNotificationParametersUnsignedRange(openingTag BACnetOpeningTag, peekedTagHeader BACnetTagHeader, closingTag BACnetClosingTag, innerOpeningTag BACnetOpeningTag, sequenceNumber BACnetContextTagUnsignedInteger, statusFlags BACnetStatusFlagsTagged, exceededLimit BACnetContextTagUnsignedInteger, innerClosingTag BACnetClosingTag) *_BACnetNotificationParametersUnsignedRange {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetNotificationParametersUnsignedRange must not be nil")
 	}
@@ -88,7 +88,7 @@ func NewBACnetNotificationParametersUnsignedRange(openingTag BACnetOpeningTag, p
 		panic("innerClosingTag of type BACnetClosingTag for BACnetNotificationParametersUnsignedRange must not be nil")
 	}
 	_result := &_BACnetNotificationParametersUnsignedRange{
-		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument),
+		BACnetNotificationParametersContract: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag),
 		InnerOpeningTag:                      innerOpeningTag,
 		SequenceNumber:                       sequenceNumber,
 		StatusFlags:                          statusFlags,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyTypeTagged.go
index de110d7adc3..f746bfafa1d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyTypeTagged.go
@@ -54,20 +54,16 @@ type BACnetNotifyTypeTagged interface {
 type _BACnetNotifyTypeTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetNotifyType
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetNotifyTypeTagged = (*_BACnetNotifyTypeTagged)(nil)
 
 // NewBACnetNotifyTypeTagged factory function for _BACnetNotifyTypeTagged
-func NewBACnetNotifyTypeTagged(header BACnetTagHeader, value BACnetNotifyType, tagNumber uint8, tagClass TagClass) *_BACnetNotifyTypeTagged {
+func NewBACnetNotifyTypeTagged(header BACnetTagHeader, value BACnetNotifyType) *_BACnetNotifyTypeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetNotifyTypeTagged must not be nil")
 	}
-	return &_BACnetNotifyTypeTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetNotifyTypeTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetNotifyTypeTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetNotifyTypeTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetNotifyType) BACnetNotifyTypeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetNotifyTypeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetNotifyTypeTaggedBuilder
 	// Build builds the BACnetNotifyTypeTagged or returns an error if something is wrong
 	Build() (BACnetNotifyTypeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetNotifyTypeTaggedBuilder) WithValue(value BACnetNotifyType) BACne
 	return b
 }
 
-func (b *_BACnetNotifyTypeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetNotifyTypeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetNotifyTypeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetNotifyTypeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetNotifyTypeTaggedBuilder) Build() (BACnetNotifyTypeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetNotifyTypeTaggedParseWithBufferProducer(tagNumber uint8, tagClass Tag
 }
 
 func BACnetNotifyTypeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetNotifyTypeTagged, error) {
-	v, err := (&_BACnetNotifyTypeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetNotifyTypeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetNotifyTypeTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetNotifyTypeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetNotifyTypeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetNotifyTypeTagged) IsBACnetNotifyTypeTagged() {}
 
 func (m *_BACnetNotifyTypeTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetNotifyTypeTagged) deepCopy() *_BACnetNotifyTypeTagged {
 	_BACnetNotifyTypeTaggedCopy := &_BACnetNotifyTypeTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetNotifyTypeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReference.go
index d6227797d3c..b3c266abbde 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReference.go
@@ -273,7 +273,7 @@ func BACnetObjectPropertyReferenceParseWithBufferProducer() func(ctx context.Con
 }
 
 func BACnetObjectPropertyReferenceParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetObjectPropertyReference, error) {
-	v, err := (&_BACnetObjectPropertyReference{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetObjectPropertyReference)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReferenceEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReferenceEnclosed.go
index 29d74103823..dfc7ee587ee 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReferenceEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReferenceEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetObjectPropertyReferenceEnclosed struct {
 	OpeningTag              BACnetOpeningTag
 	ObjectPropertyReference BACnetObjectPropertyReference
 	ClosingTag              BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetObjectPropertyReferenceEnclosed = (*_BACnetObjectPropertyReferenceEnclosed)(nil)
 
 // NewBACnetObjectPropertyReferenceEnclosed factory function for _BACnetObjectPropertyReferenceEnclosed
-func NewBACnetObjectPropertyReferenceEnclosed(openingTag BACnetOpeningTag, objectPropertyReference BACnetObjectPropertyReference, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetObjectPropertyReferenceEnclosed {
+func NewBACnetObjectPropertyReferenceEnclosed(openingTag BACnetOpeningTag, objectPropertyReference BACnetObjectPropertyReference, closingTag BACnetClosingTag) *_BACnetObjectPropertyReferenceEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetObjectPropertyReferenceEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetObjectPropertyReferenceEnclosed(openingTag BACnetOpeningTag, objec
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetObjectPropertyReferenceEnclosed must not be nil")
 	}
-	return &_BACnetObjectPropertyReferenceEnclosed{OpeningTag: openingTag, ObjectPropertyReference: objectPropertyReference, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetObjectPropertyReferenceEnclosed{OpeningTag: openingTag, ObjectPropertyReference: objectPropertyReference, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetObjectPropertyReferenceEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetObjectPropertyReferenceEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetObjectPropertyReferenceEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetObjectPropertyReferenceEnclosedBuilder
 	// Build builds the BACnetObjectPropertyReferenceEnclosed or returns an error if something is wrong
 	Build() (BACnetObjectPropertyReferenceEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetObjectPropertyReferenceEnclosedBuilder) WithClosingTagBuilder(bu
 	return b
 }
 
-func (b *_BACnetObjectPropertyReferenceEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetObjectPropertyReferenceEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetObjectPropertyReferenceEnclosedBuilder) Build() (BACnetObjectPropertyReferenceEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetObjectPropertyReferenceEnclosedParseWithBufferProducer(tagNumber uint
 }
 
 func BACnetObjectPropertyReferenceEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetObjectPropertyReferenceEnclosed, error) {
-	v, err := (&_BACnetObjectPropertyReferenceEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetObjectPropertyReferenceEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetObjectPropertyReferenceEnclosed) SerializeWithWriteBuffer(ctx co
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetObjectPropertyReferenceEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetObjectPropertyReferenceEnclosed) IsBACnetObjectPropertyReferenceEnclosed() {}
 
 func (m *_BACnetObjectPropertyReferenceEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetObjectPropertyReferenceEnclosed) deepCopy() *_BACnetObjectProper
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetObjectPropertyReference](m.ObjectPropertyReference),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetObjectPropertyReferenceEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypeTagged.go
index 30639f46d0c..3dab18d7d2c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypeTagged.go
@@ -59,20 +59,16 @@ type _BACnetObjectTypeTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetObjectType
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetObjectTypeTagged = (*_BACnetObjectTypeTagged)(nil)
 
 // NewBACnetObjectTypeTagged factory function for _BACnetObjectTypeTagged
-func NewBACnetObjectTypeTagged(header BACnetTagHeader, value BACnetObjectType, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetObjectTypeTagged {
+func NewBACnetObjectTypeTagged(header BACnetTagHeader, value BACnetObjectType, proprietaryValue uint32) *_BACnetObjectTypeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetObjectTypeTagged must not be nil")
 	}
-	return &_BACnetObjectTypeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetObjectTypeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetObjectTypeTaggedBuilder interface {
 	WithValue(BACnetObjectType) BACnetObjectTypeTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetObjectTypeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetObjectTypeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetObjectTypeTaggedBuilder
 	// Build builds the BACnetObjectTypeTagged or returns an error if something is wrong
 	Build() (BACnetObjectTypeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetObjectTypeTaggedBuilder) WithProprietaryValue(proprietaryValue u
 	return b
 }
 
-func (b *_BACnetObjectTypeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetObjectTypeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetObjectTypeTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetObjectTypeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetObjectTypeTaggedBuilder) Build() (BACnetObjectTypeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetObjectTypeTaggedParseWithBufferProducer(tagNumber uint8, tagClass Tag
 }
 
 func BACnetObjectTypeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetObjectTypeTagged, error) {
-	v, err := (&_BACnetObjectTypeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetObjectTypeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetObjectTypeTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetObjectTypeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetObjectTypeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetObjectTypeTagged) IsBACnetObjectTypeTagged() {}
 
 func (m *_BACnetObjectTypeTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetObjectTypeTagged) deepCopy() *_BACnetObjectTypeTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetObjectTypeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupportedTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupportedTagged.go
index be633ca6e89..33a6a8173e0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupportedTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupportedTagged.go
@@ -74,23 +74,19 @@ type BACnetObjectTypesSupportedTagged interface {
 type _BACnetObjectTypesSupportedTagged struct {
 	Header  BACnetTagHeader
 	Payload BACnetTagPayloadBitString
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetObjectTypesSupportedTagged = (*_BACnetObjectTypesSupportedTagged)(nil)
 
 // NewBACnetObjectTypesSupportedTagged factory function for _BACnetObjectTypesSupportedTagged
-func NewBACnetObjectTypesSupportedTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString, tagNumber uint8, tagClass TagClass) *_BACnetObjectTypesSupportedTagged {
+func NewBACnetObjectTypesSupportedTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString) *_BACnetObjectTypesSupportedTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetObjectTypesSupportedTagged must not be nil")
 	}
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadBitString for BACnetObjectTypesSupportedTagged must not be nil")
 	}
-	return &_BACnetObjectTypesSupportedTagged{Header: header, Payload: payload, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetObjectTypesSupportedTagged{Header: header, Payload: payload}
 }
 
 ///////////////////////////////////////////////////////////
@@ -111,10 +107,6 @@ type BACnetObjectTypesSupportedTaggedBuilder interface {
 	WithPayload(BACnetTagPayloadBitString) BACnetObjectTypesSupportedTaggedBuilder
 	// WithPayloadBuilder adds Payload (property field) which is build by the builder
 	WithPayloadBuilder(func(BACnetTagPayloadBitStringBuilder) BACnetTagPayloadBitStringBuilder) BACnetObjectTypesSupportedTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetObjectTypesSupportedTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetObjectTypesSupportedTaggedBuilder
 	// Build builds the BACnetObjectTypesSupportedTagged or returns an error if something is wrong
 	Build() (BACnetObjectTypesSupportedTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -168,15 +160,6 @@ func (b *_BACnetObjectTypesSupportedTaggedBuilder) WithPayloadBuilder(builderSup
 	return b
 }
 
-func (b *_BACnetObjectTypesSupportedTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetObjectTypesSupportedTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetObjectTypesSupportedTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetObjectTypesSupportedTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetObjectTypesSupportedTaggedBuilder) Build() (BACnetObjectTypesSupportedTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -368,7 +351,7 @@ func BACnetObjectTypesSupportedTaggedParseWithBufferProducer(tagNumber uint8, ta
 }
 
 func BACnetObjectTypesSupportedTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetObjectTypesSupportedTagged, error) {
-	v, err := (&_BACnetObjectTypesSupportedTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetObjectTypesSupportedTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -564,19 +547,6 @@ func (m *_BACnetObjectTypesSupportedTagged) SerializeWithWriteBuffer(ctx context
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetObjectTypesSupportedTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetObjectTypesSupportedTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetObjectTypesSupportedTagged) IsBACnetObjectTypesSupportedTagged() {}
 
 func (m *_BACnetObjectTypesSupportedTagged) DeepCopy() any {
@@ -590,8 +560,6 @@ func (m *_BACnetObjectTypesSupportedTagged) deepCopy() *_BACnetObjectTypesSuppor
 	_BACnetObjectTypesSupportedTaggedCopy := &_BACnetObjectTypesSupportedTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		utils.DeepCopy[BACnetTagPayloadBitString](m.Payload),
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetObjectTypesSupportedTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOpeningTag.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOpeningTag.go
index 11e7a4a2cf2..c605b5499cf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOpeningTag.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOpeningTag.go
@@ -51,19 +51,16 @@ type BACnetOpeningTag interface {
 // _BACnetOpeningTag is the data-structure of this message
 type _BACnetOpeningTag struct {
 	Header BACnetTagHeader
-
-	// Arguments.
-	TagNumberArgument uint8
 }
 
 var _ BACnetOpeningTag = (*_BACnetOpeningTag)(nil)
 
 // NewBACnetOpeningTag factory function for _BACnetOpeningTag
-func NewBACnetOpeningTag(header BACnetTagHeader, tagNumberArgument uint8) *_BACnetOpeningTag {
+func NewBACnetOpeningTag(header BACnetTagHeader) *_BACnetOpeningTag {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetOpeningTag must not be nil")
 	}
-	return &_BACnetOpeningTag{Header: header, TagNumberArgument: tagNumberArgument}
+	return &_BACnetOpeningTag{Header: header}
 }
 
 ///////////////////////////////////////////////////////////
@@ -80,8 +77,6 @@ type BACnetOpeningTagBuilder interface {
 	WithHeader(BACnetTagHeader) BACnetOpeningTagBuilder
 	// WithHeaderBuilder adds Header (property field) which is build by the builder
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetOpeningTagBuilder
-	// WithArgTagNumberArgument sets a parser argument
-	WithArgTagNumberArgument(uint8) BACnetOpeningTagBuilder
 	// Build builds the BACnetOpeningTag or returns an error if something is wrong
 	Build() (BACnetOpeningTag, error)
 	// MustBuild does the same as Build but panics on error
@@ -120,11 +115,6 @@ func (b *_BACnetOpeningTagBuilder) WithHeaderBuilder(builderSupplier func(BACnet
 	return b
 }
 
-func (b *_BACnetOpeningTagBuilder) WithArgTagNumberArgument(tagNumberArgument uint8) BACnetOpeningTagBuilder {
-	b.TagNumberArgument = tagNumberArgument
-	return b
-}
-
 func (b *_BACnetOpeningTagBuilder) Build() (BACnetOpeningTag, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -217,7 +207,7 @@ func BACnetOpeningTagParseWithBufferProducer(tagNumberArgument uint8) func(ctx c
 }
 
 func BACnetOpeningTagParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumberArgument uint8) (BACnetOpeningTag, error) {
-	v, err := (&_BACnetOpeningTag{TagNumberArgument: tagNumberArgument}).parse(ctx, readBuffer, tagNumberArgument)
+	v, err := (new(_BACnetOpeningTag)).parse(ctx, readBuffer, tagNumberArgument)
 	if err != nil {
 		return nil, err
 	}
@@ -288,16 +278,6 @@ func (m *_BACnetOpeningTag) SerializeWithWriteBuffer(ctx context.Context, writeB
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetOpeningTag) GetTagNumberArgument() uint8 {
-	return m.TagNumberArgument
-}
-
-//
-////
-
 func (m *_BACnetOpeningTag) IsBACnetOpeningTag() {}
 
 func (m *_BACnetOpeningTag) DeepCopy() any {
@@ -310,7 +290,6 @@ func (m *_BACnetOpeningTag) deepCopy() *_BACnetOpeningTag {
 	}
 	_BACnetOpeningTagCopy := &_BACnetOpeningTag{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
-		m.TagNumberArgument,
 	}
 	return _BACnetOpeningTagCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPV.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPV.go
index bfa574184f3..f98412d600d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPV.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPV.go
@@ -313,7 +313,7 @@ func BACnetOptionalBinaryPVParseWithBufferProducer[T BACnetOptionalBinaryPV]() f
 }
 
 func BACnetOptionalBinaryPVParseWithBuffer[T BACnetOptionalBinaryPV](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetOptionalBinaryPV{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetOptionalBinaryPV)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterString.go
index 3405566debb..3f4b162104a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterString.go
@@ -313,7 +313,7 @@ func BACnetOptionalCharacterStringParseWithBufferProducer[T BACnetOptionalCharac
 }
 
 func BACnetOptionalCharacterStringParseWithBuffer[T BACnetOptionalCharacterString](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetOptionalCharacterString{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetOptionalCharacterString)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREAL.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREAL.go
index ad6d6d603db..3b58567821c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREAL.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREAL.go
@@ -313,7 +313,7 @@ func BACnetOptionalREALParseWithBufferProducer[T BACnetOptionalREAL]() func(ctx
 }
 
 func BACnetOptionalREALParseWithBuffer[T BACnetOptionalREAL](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetOptionalREAL{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetOptionalREAL)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsigned.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsigned.go
index 67a8f65b8b5..5313539a699 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsigned.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsigned.go
@@ -313,7 +313,7 @@ func BACnetOptionalUnsignedParseWithBufferProducer[T BACnetOptionalUnsigned]() f
 }
 
 func BACnetOptionalUnsignedParseWithBuffer[T BACnetOptionalUnsigned](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetOptionalUnsigned{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetOptionalUnsigned)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarityTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarityTagged.go
index 6478737006d..81c012238a3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarityTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarityTagged.go
@@ -54,20 +54,16 @@ type BACnetPolarityTagged interface {
 type _BACnetPolarityTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetPolarity
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetPolarityTagged = (*_BACnetPolarityTagged)(nil)
 
 // NewBACnetPolarityTagged factory function for _BACnetPolarityTagged
-func NewBACnetPolarityTagged(header BACnetTagHeader, value BACnetPolarity, tagNumber uint8, tagClass TagClass) *_BACnetPolarityTagged {
+func NewBACnetPolarityTagged(header BACnetTagHeader, value BACnetPolarity) *_BACnetPolarityTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetPolarityTagged must not be nil")
 	}
-	return &_BACnetPolarityTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetPolarityTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetPolarityTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetPolarityTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetPolarity) BACnetPolarityTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetPolarityTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetPolarityTaggedBuilder
 	// Build builds the BACnetPolarityTagged or returns an error if something is wrong
 	Build() (BACnetPolarityTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetPolarityTaggedBuilder) WithValue(value BACnetPolarity) BACnetPol
 	return b
 }
 
-func (b *_BACnetPolarityTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetPolarityTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetPolarityTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetPolarityTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetPolarityTaggedBuilder) Build() (BACnetPolarityTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetPolarityTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagCl
 }
 
 func BACnetPolarityTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetPolarityTagged, error) {
-	v, err := (&_BACnetPolarityTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetPolarityTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetPolarityTagged) SerializeWithWriteBuffer(ctx context.Context, wr
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetPolarityTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetPolarityTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetPolarityTagged) IsBACnetPolarityTagged() {}
 
 func (m *_BACnetPolarityTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetPolarityTagged) deepCopy() *_BACnetPolarityTagged {
 	_BACnetPolarityTaggedCopy := &_BACnetPolarityTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetPolarityTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPortPermission.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPortPermission.go
index 064492cdf9b..cd0044ece16 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPortPermission.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPortPermission.go
@@ -238,7 +238,7 @@ func BACnetPortPermissionParseWithBufferProducer() func(ctx context.Context, rea
 }
 
 func BACnetPortPermissionParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetPortPermission, error) {
-	v, err := (&_BACnetPortPermission{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetPortPermission)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPrescale.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPrescale.go
index ba32fb63d97..4002a8012ad 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPrescale.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPrescale.go
@@ -242,7 +242,7 @@ func BACnetPrescaleParseWithBufferProducer() func(ctx context.Context, readBuffe
 }
 
 func BACnetPrescaleParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetPrescale, error) {
-	v, err := (&_BACnetPrescale{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetPrescale)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityArray.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityArray.go
index f98742f95cc..65a74ca1065 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityArray.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityArray.go
@@ -92,18 +92,13 @@ type BACnetPriorityArray interface {
 type _BACnetPriorityArray struct {
 	NumberOfDataElements BACnetApplicationTagUnsignedInteger
 	Data                 []BACnetPriorityValue
-
-	// Arguments.
-	ObjectTypeArgument BACnetObjectType
-	TagNumber          uint8
-	ArrayIndexArgument BACnetTagPayloadUnsignedInteger
 }
 
 var _ BACnetPriorityArray = (*_BACnetPriorityArray)(nil)
 
 // NewBACnetPriorityArray factory function for _BACnetPriorityArray
-func NewBACnetPriorityArray(numberOfDataElements BACnetApplicationTagUnsignedInteger, data []BACnetPriorityValue, objectTypeArgument BACnetObjectType, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetPriorityArray {
-	return &_BACnetPriorityArray{NumberOfDataElements: numberOfDataElements, Data: data, ObjectTypeArgument: objectTypeArgument, TagNumber: tagNumber, ArrayIndexArgument: arrayIndexArgument}
+func NewBACnetPriorityArray(numberOfDataElements BACnetApplicationTagUnsignedInteger, data []BACnetPriorityValue) *_BACnetPriorityArray {
+	return &_BACnetPriorityArray{NumberOfDataElements: numberOfDataElements, Data: data}
 }
 
 ///////////////////////////////////////////////////////////
@@ -122,12 +117,6 @@ type BACnetPriorityArrayBuilder interface {
 	WithOptionalNumberOfDataElementsBuilder(func(BACnetApplicationTagUnsignedIntegerBuilder) BACnetApplicationTagUnsignedIntegerBuilder) BACnetPriorityArrayBuilder
 	// WithData adds Data (property field)
 	WithData(...BACnetPriorityValue) BACnetPriorityArrayBuilder
-	// WithArgObjectTypeArgument sets a parser argument
-	WithArgObjectTypeArgument(BACnetObjectType) BACnetPriorityArrayBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetPriorityArrayBuilder
-	// WithArgArrayIndexArgument sets a parser argument
-	WithArgArrayIndexArgument(BACnetTagPayloadUnsignedInteger) BACnetPriorityArrayBuilder
 	// Build builds the BACnetPriorityArray or returns an error if something is wrong
 	Build() (BACnetPriorityArray, error)
 	// MustBuild does the same as Build but panics on error
@@ -171,19 +160,6 @@ func (b *_BACnetPriorityArrayBuilder) WithData(data ...BACnetPriorityValue) BACn
 	return b
 }
 
-func (b *_BACnetPriorityArrayBuilder) WithArgObjectTypeArgument(objectTypeArgument BACnetObjectType) BACnetPriorityArrayBuilder {
-	b.ObjectTypeArgument = objectTypeArgument
-	return b
-}
-func (b *_BACnetPriorityArrayBuilder) WithArgTagNumber(tagNumber uint8) BACnetPriorityArrayBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetPriorityArrayBuilder) WithArgArrayIndexArgument(arrayIndexArgument BACnetTagPayloadUnsignedInteger) BACnetPriorityArrayBuilder {
-	b.ArrayIndexArgument = arrayIndexArgument
-	return b
-}
-
 func (b *_BACnetPriorityArrayBuilder) Build() (BACnetPriorityArray, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -485,7 +461,7 @@ func BACnetPriorityArrayParseWithBufferProducer(objectTypeArgument BACnetObjectT
 }
 
 func BACnetPriorityArrayParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, objectTypeArgument BACnetObjectType, tagNumber uint8, arrayIndexArgument BACnetTagPayloadUnsignedInteger) (BACnetPriorityArray, error) {
-	v, err := (&_BACnetPriorityArray{ObjectTypeArgument: objectTypeArgument, TagNumber: tagNumber, ArrayIndexArgument: arrayIndexArgument}).parse(ctx, readBuffer, objectTypeArgument, tagNumber, arrayIndexArgument)
+	v, err := (new(_BACnetPriorityArray)).parse(ctx, readBuffer, objectTypeArgument, tagNumber, arrayIndexArgument)
 	if err != nil {
 		return nil, err
 	}
@@ -788,22 +764,6 @@ func (m *_BACnetPriorityArray) SerializeWithWriteBuffer(ctx context.Context, wri
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetPriorityArray) GetObjectTypeArgument() BACnetObjectType {
-	return m.ObjectTypeArgument
-}
-func (m *_BACnetPriorityArray) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetPriorityArray) GetArrayIndexArgument() BACnetTagPayloadUnsignedInteger {
-	return m.ArrayIndexArgument
-}
-
-//
-////
-
 func (m *_BACnetPriorityArray) IsBACnetPriorityArray() {}
 
 func (m *_BACnetPriorityArray) DeepCopy() any {
@@ -817,9 +777,6 @@ func (m *_BACnetPriorityArray) deepCopy() *_BACnetPriorityArray {
 	_BACnetPriorityArrayCopy := &_BACnetPriorityArray{
 		utils.DeepCopy[BACnetApplicationTagUnsignedInteger](m.NumberOfDataElements),
 		utils.DeepCopySlice[BACnetPriorityValue, BACnetPriorityValue](m.Data),
-		m.ObjectTypeArgument,
-		m.TagNumber,
-		m.ArrayIndexArgument,
 	}
 	return _BACnetPriorityArrayCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValue.go
index 4ea65cb906f..e8bc25432a8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValue.go
@@ -56,8 +56,6 @@ type BACnetPriorityValueContract interface {
 	GetPeekedTagNumber() uint8
 	// GetPeekedIsContextTag returns PeekedIsContextTag (virtual field)
 	GetPeekedIsContextTag() bool
-	// GetObjectTypeArgument() returns a parser argument
-	GetObjectTypeArgument() BACnetObjectType
 	// IsBACnetPriorityValue is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetPriorityValue()
 	// CreateBuilder creates a BACnetPriorityValueBuilder
@@ -81,19 +79,16 @@ type _BACnetPriorityValue struct {
 		BACnetPriorityValueRequirements
 	}
 	PeekedTagHeader BACnetTagHeader
-
-	// Arguments.
-	ObjectTypeArgument BACnetObjectType
 }
 
 var _ BACnetPriorityValueContract = (*_BACnetPriorityValue)(nil)
 
 // NewBACnetPriorityValue factory function for _BACnetPriorityValue
-func NewBACnetPriorityValue(peekedTagHeader BACnetTagHeader, objectTypeArgument BACnetObjectType) *_BACnetPriorityValue {
+func NewBACnetPriorityValue(peekedTagHeader BACnetTagHeader) *_BACnetPriorityValue {
 	if peekedTagHeader == nil {
 		panic("peekedTagHeader of type BACnetTagHeader for BACnetPriorityValue must not be nil")
 	}
-	return &_BACnetPriorityValue{PeekedTagHeader: peekedTagHeader, ObjectTypeArgument: objectTypeArgument}
+	return &_BACnetPriorityValue{PeekedTagHeader: peekedTagHeader}
 }
 
 ///////////////////////////////////////////////////////////
@@ -110,8 +105,6 @@ type BACnetPriorityValueBuilder interface {
 	WithPeekedTagHeader(BACnetTagHeader) BACnetPriorityValueBuilder
 	// WithPeekedTagHeaderBuilder adds PeekedTagHeader (property field) which is build by the builder
 	WithPeekedTagHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetPriorityValueBuilder
-	// WithArgObjectTypeArgument sets a parser argument
-	WithArgObjectTypeArgument(BACnetObjectType) BACnetPriorityValueBuilder
 	// AsBACnetPriorityValueNull converts this build to a subType of BACnetPriorityValue. It is always possible to return to current builder using Done()
 	AsBACnetPriorityValueNull() BACnetPriorityValueNullBuilder
 	// AsBACnetPriorityValueReal converts this build to a subType of BACnetPriorityValue. It is always possible to return to current builder using Done()
@@ -192,11 +185,6 @@ func (b *_BACnetPriorityValueBuilder) WithPeekedTagHeaderBuilder(builderSupplier
 	return b
 }
 
-func (b *_BACnetPriorityValueBuilder) WithArgObjectTypeArgument(objectTypeArgument BACnetObjectType) BACnetPriorityValueBuilder {
-	b.ObjectTypeArgument = objectTypeArgument
-	return b
-}
-
 func (b *_BACnetPriorityValueBuilder) PartialBuild() (BACnetPriorityValueContract, error) {
 	if b.PeekedTagHeader == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'peekedTagHeader' not set"))
@@ -494,7 +482,7 @@ func BACnetPriorityValueParseWithBufferProducer[T BACnetPriorityValue](objectTyp
 }
 
 func BACnetPriorityValueParseWithBuffer[T BACnetPriorityValue](ctx context.Context, readBuffer utils.ReadBuffer, objectTypeArgument BACnetObjectType) (T, error) {
-	v, err := (&_BACnetPriorityValue{ObjectTypeArgument: objectTypeArgument}).parse(ctx, readBuffer, objectTypeArgument)
+	v, err := (new(_BACnetPriorityValue)).parse(ctx, readBuffer, objectTypeArgument)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -648,16 +636,6 @@ func (pm *_BACnetPriorityValue) serializeParent(ctx context.Context, writeBuffer
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetPriorityValue) GetObjectTypeArgument() BACnetObjectType {
-	return m.ObjectTypeArgument
-}
-
-//
-////
-
 func (m *_BACnetPriorityValue) IsBACnetPriorityValue() {}
 
 func (m *_BACnetPriorityValue) DeepCopy() any {
@@ -671,7 +649,6 @@ func (m *_BACnetPriorityValue) deepCopy() *_BACnetPriorityValue {
 	_BACnetPriorityValueCopy := &_BACnetPriorityValue{
 		nil, // will be set by child
 		utils.DeepCopy[BACnetTagHeader](m.PeekedTagHeader),
-		m.ObjectTypeArgument,
 	}
 	return _BACnetPriorityValueCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBitString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBitString.go
index f163aff7d14..230fbbf6fdd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBitString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBitString.go
@@ -59,12 +59,12 @@ var _ BACnetPriorityValueBitString = (*_BACnetPriorityValueBitString)(nil)
 var _ BACnetPriorityValueRequirements = (*_BACnetPriorityValueBitString)(nil)
 
 // NewBACnetPriorityValueBitString factory function for _BACnetPriorityValueBitString
-func NewBACnetPriorityValueBitString(peekedTagHeader BACnetTagHeader, bitStringValue BACnetApplicationTagBitString, objectTypeArgument BACnetObjectType) *_BACnetPriorityValueBitString {
+func NewBACnetPriorityValueBitString(peekedTagHeader BACnetTagHeader, bitStringValue BACnetApplicationTagBitString) *_BACnetPriorityValueBitString {
 	if bitStringValue == nil {
 		panic("bitStringValue of type BACnetApplicationTagBitString for BACnetPriorityValueBitString must not be nil")
 	}
 	_result := &_BACnetPriorityValueBitString{
-		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader, objectTypeArgument),
+		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader),
 		BitStringValue:              bitStringValue,
 	}
 	_result.BACnetPriorityValueContract.(*_BACnetPriorityValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBoolean.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBoolean.go
index 9bc22a0073b..befe7daea20 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBoolean.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBoolean.go
@@ -59,12 +59,12 @@ var _ BACnetPriorityValueBoolean = (*_BACnetPriorityValueBoolean)(nil)
 var _ BACnetPriorityValueRequirements = (*_BACnetPriorityValueBoolean)(nil)
 
 // NewBACnetPriorityValueBoolean factory function for _BACnetPriorityValueBoolean
-func NewBACnetPriorityValueBoolean(peekedTagHeader BACnetTagHeader, booleanValue BACnetApplicationTagBoolean, objectTypeArgument BACnetObjectType) *_BACnetPriorityValueBoolean {
+func NewBACnetPriorityValueBoolean(peekedTagHeader BACnetTagHeader, booleanValue BACnetApplicationTagBoolean) *_BACnetPriorityValueBoolean {
 	if booleanValue == nil {
 		panic("booleanValue of type BACnetApplicationTagBoolean for BACnetPriorityValueBoolean must not be nil")
 	}
 	_result := &_BACnetPriorityValueBoolean{
-		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader, objectTypeArgument),
+		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader),
 		BooleanValue:                booleanValue,
 	}
 	_result.BACnetPriorityValueContract.(*_BACnetPriorityValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueCharacterString.go
index 17724f3c57c..30901864649 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueCharacterString.go
@@ -59,12 +59,12 @@ var _ BACnetPriorityValueCharacterString = (*_BACnetPriorityValueCharacterString
 var _ BACnetPriorityValueRequirements = (*_BACnetPriorityValueCharacterString)(nil)
 
 // NewBACnetPriorityValueCharacterString factory function for _BACnetPriorityValueCharacterString
-func NewBACnetPriorityValueCharacterString(peekedTagHeader BACnetTagHeader, characterStringValue BACnetApplicationTagCharacterString, objectTypeArgument BACnetObjectType) *_BACnetPriorityValueCharacterString {
+func NewBACnetPriorityValueCharacterString(peekedTagHeader BACnetTagHeader, characterStringValue BACnetApplicationTagCharacterString) *_BACnetPriorityValueCharacterString {
 	if characterStringValue == nil {
 		panic("characterStringValue of type BACnetApplicationTagCharacterString for BACnetPriorityValueCharacterString must not be nil")
 	}
 	_result := &_BACnetPriorityValueCharacterString{
-		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader, objectTypeArgument),
+		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader),
 		CharacterStringValue:        characterStringValue,
 	}
 	_result.BACnetPriorityValueContract.(*_BACnetPriorityValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueConstructedValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueConstructedValue.go
index 7c231657e21..5c6d18ea97f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueConstructedValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueConstructedValue.go
@@ -59,12 +59,12 @@ var _ BACnetPriorityValueConstructedValue = (*_BACnetPriorityValueConstructedVal
 var _ BACnetPriorityValueRequirements = (*_BACnetPriorityValueConstructedValue)(nil)
 
 // NewBACnetPriorityValueConstructedValue factory function for _BACnetPriorityValueConstructedValue
-func NewBACnetPriorityValueConstructedValue(peekedTagHeader BACnetTagHeader, constructedValue BACnetConstructedData, objectTypeArgument BACnetObjectType) *_BACnetPriorityValueConstructedValue {
+func NewBACnetPriorityValueConstructedValue(peekedTagHeader BACnetTagHeader, constructedValue BACnetConstructedData) *_BACnetPriorityValueConstructedValue {
 	if constructedValue == nil {
 		panic("constructedValue of type BACnetConstructedData for BACnetPriorityValueConstructedValue must not be nil")
 	}
 	_result := &_BACnetPriorityValueConstructedValue{
-		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader, objectTypeArgument),
+		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader),
 		ConstructedValue:            constructedValue,
 	}
 	_result.BACnetPriorityValueContract.(*_BACnetPriorityValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDate.go
index ac2ded8a558..4e0eef6571e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDate.go
@@ -59,12 +59,12 @@ var _ BACnetPriorityValueDate = (*_BACnetPriorityValueDate)(nil)
 var _ BACnetPriorityValueRequirements = (*_BACnetPriorityValueDate)(nil)
 
 // NewBACnetPriorityValueDate factory function for _BACnetPriorityValueDate
-func NewBACnetPriorityValueDate(peekedTagHeader BACnetTagHeader, dateValue BACnetApplicationTagDate, objectTypeArgument BACnetObjectType) *_BACnetPriorityValueDate {
+func NewBACnetPriorityValueDate(peekedTagHeader BACnetTagHeader, dateValue BACnetApplicationTagDate) *_BACnetPriorityValueDate {
 	if dateValue == nil {
 		panic("dateValue of type BACnetApplicationTagDate for BACnetPriorityValueDate must not be nil")
 	}
 	_result := &_BACnetPriorityValueDate{
-		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader, objectTypeArgument),
+		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader),
 		DateValue:                   dateValue,
 	}
 	_result.BACnetPriorityValueContract.(*_BACnetPriorityValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDateTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDateTime.go
index 29d0ca9a3e1..f203838150c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDateTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDateTime.go
@@ -59,12 +59,12 @@ var _ BACnetPriorityValueDateTime = (*_BACnetPriorityValueDateTime)(nil)
 var _ BACnetPriorityValueRequirements = (*_BACnetPriorityValueDateTime)(nil)
 
 // NewBACnetPriorityValueDateTime factory function for _BACnetPriorityValueDateTime
-func NewBACnetPriorityValueDateTime(peekedTagHeader BACnetTagHeader, dateTimeValue BACnetDateTimeEnclosed, objectTypeArgument BACnetObjectType) *_BACnetPriorityValueDateTime {
+func NewBACnetPriorityValueDateTime(peekedTagHeader BACnetTagHeader, dateTimeValue BACnetDateTimeEnclosed) *_BACnetPriorityValueDateTime {
 	if dateTimeValue == nil {
 		panic("dateTimeValue of type BACnetDateTimeEnclosed for BACnetPriorityValueDateTime must not be nil")
 	}
 	_result := &_BACnetPriorityValueDateTime{
-		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader, objectTypeArgument),
+		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader),
 		DateTimeValue:               dateTimeValue,
 	}
 	_result.BACnetPriorityValueContract.(*_BACnetPriorityValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDouble.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDouble.go
index 42974b8d233..d4a1668f3aa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDouble.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDouble.go
@@ -59,12 +59,12 @@ var _ BACnetPriorityValueDouble = (*_BACnetPriorityValueDouble)(nil)
 var _ BACnetPriorityValueRequirements = (*_BACnetPriorityValueDouble)(nil)
 
 // NewBACnetPriorityValueDouble factory function for _BACnetPriorityValueDouble
-func NewBACnetPriorityValueDouble(peekedTagHeader BACnetTagHeader, doubleValue BACnetApplicationTagDouble, objectTypeArgument BACnetObjectType) *_BACnetPriorityValueDouble {
+func NewBACnetPriorityValueDouble(peekedTagHeader BACnetTagHeader, doubleValue BACnetApplicationTagDouble) *_BACnetPriorityValueDouble {
 	if doubleValue == nil {
 		panic("doubleValue of type BACnetApplicationTagDouble for BACnetPriorityValueDouble must not be nil")
 	}
 	_result := &_BACnetPriorityValueDouble{
-		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader, objectTypeArgument),
+		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader),
 		DoubleValue:                 doubleValue,
 	}
 	_result.BACnetPriorityValueContract.(*_BACnetPriorityValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueEnumerated.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueEnumerated.go
index 5c93ee6bb68..db8a7389fa9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueEnumerated.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueEnumerated.go
@@ -59,12 +59,12 @@ var _ BACnetPriorityValueEnumerated = (*_BACnetPriorityValueEnumerated)(nil)
 var _ BACnetPriorityValueRequirements = (*_BACnetPriorityValueEnumerated)(nil)
 
 // NewBACnetPriorityValueEnumerated factory function for _BACnetPriorityValueEnumerated
-func NewBACnetPriorityValueEnumerated(peekedTagHeader BACnetTagHeader, enumeratedValue BACnetApplicationTagEnumerated, objectTypeArgument BACnetObjectType) *_BACnetPriorityValueEnumerated {
+func NewBACnetPriorityValueEnumerated(peekedTagHeader BACnetTagHeader, enumeratedValue BACnetApplicationTagEnumerated) *_BACnetPriorityValueEnumerated {
 	if enumeratedValue == nil {
 		panic("enumeratedValue of type BACnetApplicationTagEnumerated for BACnetPriorityValueEnumerated must not be nil")
 	}
 	_result := &_BACnetPriorityValueEnumerated{
-		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader, objectTypeArgument),
+		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader),
 		EnumeratedValue:             enumeratedValue,
 	}
 	_result.BACnetPriorityValueContract.(*_BACnetPriorityValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueInteger.go
index 539e46280b5..334ef9c0c88 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueInteger.go
@@ -59,12 +59,12 @@ var _ BACnetPriorityValueInteger = (*_BACnetPriorityValueInteger)(nil)
 var _ BACnetPriorityValueRequirements = (*_BACnetPriorityValueInteger)(nil)
 
 // NewBACnetPriorityValueInteger factory function for _BACnetPriorityValueInteger
-func NewBACnetPriorityValueInteger(peekedTagHeader BACnetTagHeader, integerValue BACnetApplicationTagSignedInteger, objectTypeArgument BACnetObjectType) *_BACnetPriorityValueInteger {
+func NewBACnetPriorityValueInteger(peekedTagHeader BACnetTagHeader, integerValue BACnetApplicationTagSignedInteger) *_BACnetPriorityValueInteger {
 	if integerValue == nil {
 		panic("integerValue of type BACnetApplicationTagSignedInteger for BACnetPriorityValueInteger must not be nil")
 	}
 	_result := &_BACnetPriorityValueInteger{
-		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader, objectTypeArgument),
+		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader),
 		IntegerValue:                integerValue,
 	}
 	_result.BACnetPriorityValueContract.(*_BACnetPriorityValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueNull.go
index 6b77b9bb88d..8f0a3de8168 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueNull.go
@@ -59,12 +59,12 @@ var _ BACnetPriorityValueNull = (*_BACnetPriorityValueNull)(nil)
 var _ BACnetPriorityValueRequirements = (*_BACnetPriorityValueNull)(nil)
 
 // NewBACnetPriorityValueNull factory function for _BACnetPriorityValueNull
-func NewBACnetPriorityValueNull(peekedTagHeader BACnetTagHeader, nullValue BACnetApplicationTagNull, objectTypeArgument BACnetObjectType) *_BACnetPriorityValueNull {
+func NewBACnetPriorityValueNull(peekedTagHeader BACnetTagHeader, nullValue BACnetApplicationTagNull) *_BACnetPriorityValueNull {
 	if nullValue == nil {
 		panic("nullValue of type BACnetApplicationTagNull for BACnetPriorityValueNull must not be nil")
 	}
 	_result := &_BACnetPriorityValueNull{
-		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader, objectTypeArgument),
+		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader),
 		NullValue:                   nullValue,
 	}
 	_result.BACnetPriorityValueContract.(*_BACnetPriorityValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueObjectidentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueObjectidentifier.go
index d7f6dbbe1ea..35bbcc4deaf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueObjectidentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueObjectidentifier.go
@@ -59,12 +59,12 @@ var _ BACnetPriorityValueObjectidentifier = (*_BACnetPriorityValueObjectidentifi
 var _ BACnetPriorityValueRequirements = (*_BACnetPriorityValueObjectidentifier)(nil)
 
 // NewBACnetPriorityValueObjectidentifier factory function for _BACnetPriorityValueObjectidentifier
-func NewBACnetPriorityValueObjectidentifier(peekedTagHeader BACnetTagHeader, objectidentifierValue BACnetApplicationTagObjectIdentifier, objectTypeArgument BACnetObjectType) *_BACnetPriorityValueObjectidentifier {
+func NewBACnetPriorityValueObjectidentifier(peekedTagHeader BACnetTagHeader, objectidentifierValue BACnetApplicationTagObjectIdentifier) *_BACnetPriorityValueObjectidentifier {
 	if objectidentifierValue == nil {
 		panic("objectidentifierValue of type BACnetApplicationTagObjectIdentifier for BACnetPriorityValueObjectidentifier must not be nil")
 	}
 	_result := &_BACnetPriorityValueObjectidentifier{
-		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader, objectTypeArgument),
+		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader),
 		ObjectidentifierValue:       objectidentifierValue,
 	}
 	_result.BACnetPriorityValueContract.(*_BACnetPriorityValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueOctetString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueOctetString.go
index 8825cce92af..2793cb96584 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueOctetString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueOctetString.go
@@ -59,12 +59,12 @@ var _ BACnetPriorityValueOctetString = (*_BACnetPriorityValueOctetString)(nil)
 var _ BACnetPriorityValueRequirements = (*_BACnetPriorityValueOctetString)(nil)
 
 // NewBACnetPriorityValueOctetString factory function for _BACnetPriorityValueOctetString
-func NewBACnetPriorityValueOctetString(peekedTagHeader BACnetTagHeader, octetStringValue BACnetApplicationTagOctetString, objectTypeArgument BACnetObjectType) *_BACnetPriorityValueOctetString {
+func NewBACnetPriorityValueOctetString(peekedTagHeader BACnetTagHeader, octetStringValue BACnetApplicationTagOctetString) *_BACnetPriorityValueOctetString {
 	if octetStringValue == nil {
 		panic("octetStringValue of type BACnetApplicationTagOctetString for BACnetPriorityValueOctetString must not be nil")
 	}
 	_result := &_BACnetPriorityValueOctetString{
-		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader, objectTypeArgument),
+		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader),
 		OctetStringValue:            octetStringValue,
 	}
 	_result.BACnetPriorityValueContract.(*_BACnetPriorityValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueReal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueReal.go
index ffa32ecc9b0..542574d5596 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueReal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueReal.go
@@ -59,12 +59,12 @@ var _ BACnetPriorityValueReal = (*_BACnetPriorityValueReal)(nil)
 var _ BACnetPriorityValueRequirements = (*_BACnetPriorityValueReal)(nil)
 
 // NewBACnetPriorityValueReal factory function for _BACnetPriorityValueReal
-func NewBACnetPriorityValueReal(peekedTagHeader BACnetTagHeader, realValue BACnetApplicationTagReal, objectTypeArgument BACnetObjectType) *_BACnetPriorityValueReal {
+func NewBACnetPriorityValueReal(peekedTagHeader BACnetTagHeader, realValue BACnetApplicationTagReal) *_BACnetPriorityValueReal {
 	if realValue == nil {
 		panic("realValue of type BACnetApplicationTagReal for BACnetPriorityValueReal must not be nil")
 	}
 	_result := &_BACnetPriorityValueReal{
-		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader, objectTypeArgument),
+		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader),
 		RealValue:                   realValue,
 	}
 	_result.BACnetPriorityValueContract.(*_BACnetPriorityValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueTime.go
index 8e4acb89fbd..30540147875 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueTime.go
@@ -59,12 +59,12 @@ var _ BACnetPriorityValueTime = (*_BACnetPriorityValueTime)(nil)
 var _ BACnetPriorityValueRequirements = (*_BACnetPriorityValueTime)(nil)
 
 // NewBACnetPriorityValueTime factory function for _BACnetPriorityValueTime
-func NewBACnetPriorityValueTime(peekedTagHeader BACnetTagHeader, timeValue BACnetApplicationTagTime, objectTypeArgument BACnetObjectType) *_BACnetPriorityValueTime {
+func NewBACnetPriorityValueTime(peekedTagHeader BACnetTagHeader, timeValue BACnetApplicationTagTime) *_BACnetPriorityValueTime {
 	if timeValue == nil {
 		panic("timeValue of type BACnetApplicationTagTime for BACnetPriorityValueTime must not be nil")
 	}
 	_result := &_BACnetPriorityValueTime{
-		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader, objectTypeArgument),
+		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader),
 		TimeValue:                   timeValue,
 	}
 	_result.BACnetPriorityValueContract.(*_BACnetPriorityValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueUnsigned.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueUnsigned.go
index f469170c8bc..969032edef1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueUnsigned.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueUnsigned.go
@@ -59,12 +59,12 @@ var _ BACnetPriorityValueUnsigned = (*_BACnetPriorityValueUnsigned)(nil)
 var _ BACnetPriorityValueRequirements = (*_BACnetPriorityValueUnsigned)(nil)
 
 // NewBACnetPriorityValueUnsigned factory function for _BACnetPriorityValueUnsigned
-func NewBACnetPriorityValueUnsigned(peekedTagHeader BACnetTagHeader, unsignedValue BACnetApplicationTagUnsignedInteger, objectTypeArgument BACnetObjectType) *_BACnetPriorityValueUnsigned {
+func NewBACnetPriorityValueUnsigned(peekedTagHeader BACnetTagHeader, unsignedValue BACnetApplicationTagUnsignedInteger) *_BACnetPriorityValueUnsigned {
 	if unsignedValue == nil {
 		panic("unsignedValue of type BACnetApplicationTagUnsignedInteger for BACnetPriorityValueUnsigned must not be nil")
 	}
 	_result := &_BACnetPriorityValueUnsigned{
-		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader, objectTypeArgument),
+		BACnetPriorityValueContract: NewBACnetPriorityValue(peekedTagHeader),
 		UnsignedValue:               unsignedValue,
 	}
 	_result.BACnetPriorityValueContract.(*_BACnetPriorityValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelection.go
index 24a635ac3ae..9764040b907 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelection.go
@@ -313,7 +313,7 @@ func BACnetProcessIdSelectionParseWithBufferProducer[T BACnetProcessIdSelection]
 }
 
 func BACnetProcessIdSelectionParseWithBuffer[T BACnetProcessIdSelection](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetProcessIdSelection{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetProcessIdSelection)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramErrorTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramErrorTagged.go
index 3d362893d24..ee47b13f425 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramErrorTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramErrorTagged.go
@@ -59,20 +59,16 @@ type _BACnetProgramErrorTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetProgramError
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetProgramErrorTagged = (*_BACnetProgramErrorTagged)(nil)
 
 // NewBACnetProgramErrorTagged factory function for _BACnetProgramErrorTagged
-func NewBACnetProgramErrorTagged(header BACnetTagHeader, value BACnetProgramError, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetProgramErrorTagged {
+func NewBACnetProgramErrorTagged(header BACnetTagHeader, value BACnetProgramError, proprietaryValue uint32) *_BACnetProgramErrorTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetProgramErrorTagged must not be nil")
 	}
-	return &_BACnetProgramErrorTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetProgramErrorTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetProgramErrorTaggedBuilder interface {
 	WithValue(BACnetProgramError) BACnetProgramErrorTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetProgramErrorTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetProgramErrorTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetProgramErrorTaggedBuilder
 	// Build builds the BACnetProgramErrorTagged or returns an error if something is wrong
 	Build() (BACnetProgramErrorTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetProgramErrorTaggedBuilder) WithProprietaryValue(proprietaryValue
 	return b
 }
 
-func (b *_BACnetProgramErrorTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetProgramErrorTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetProgramErrorTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetProgramErrorTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetProgramErrorTaggedBuilder) Build() (BACnetProgramErrorTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetProgramErrorTaggedParseWithBufferProducer(tagNumber uint8, tagClass T
 }
 
 func BACnetProgramErrorTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetProgramErrorTagged, error) {
-	v, err := (&_BACnetProgramErrorTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetProgramErrorTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetProgramErrorTagged) SerializeWithWriteBuffer(ctx context.Context
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetProgramErrorTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetProgramErrorTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetProgramErrorTagged) IsBACnetProgramErrorTagged() {}
 
 func (m *_BACnetProgramErrorTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetProgramErrorTagged) deepCopy() *_BACnetProgramErrorTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetProgramErrorTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequestTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequestTagged.go
index 183a3a89a4e..1c00a3ed2a5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequestTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequestTagged.go
@@ -54,20 +54,16 @@ type BACnetProgramRequestTagged interface {
 type _BACnetProgramRequestTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetProgramRequest
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetProgramRequestTagged = (*_BACnetProgramRequestTagged)(nil)
 
 // NewBACnetProgramRequestTagged factory function for _BACnetProgramRequestTagged
-func NewBACnetProgramRequestTagged(header BACnetTagHeader, value BACnetProgramRequest, tagNumber uint8, tagClass TagClass) *_BACnetProgramRequestTagged {
+func NewBACnetProgramRequestTagged(header BACnetTagHeader, value BACnetProgramRequest) *_BACnetProgramRequestTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetProgramRequestTagged must not be nil")
 	}
-	return &_BACnetProgramRequestTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetProgramRequestTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetProgramRequestTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetProgramRequestTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetProgramRequest) BACnetProgramRequestTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetProgramRequestTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetProgramRequestTaggedBuilder
 	// Build builds the BACnetProgramRequestTagged or returns an error if something is wrong
 	Build() (BACnetProgramRequestTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetProgramRequestTaggedBuilder) WithValue(value BACnetProgramReques
 	return b
 }
 
-func (b *_BACnetProgramRequestTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetProgramRequestTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetProgramRequestTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetProgramRequestTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetProgramRequestTaggedBuilder) Build() (BACnetProgramRequestTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetProgramRequestTaggedParseWithBufferProducer(tagNumber uint8, tagClass
 }
 
 func BACnetProgramRequestTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetProgramRequestTagged, error) {
-	v, err := (&_BACnetProgramRequestTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetProgramRequestTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetProgramRequestTagged) SerializeWithWriteBuffer(ctx context.Conte
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetProgramRequestTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetProgramRequestTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetProgramRequestTagged) IsBACnetProgramRequestTagged() {}
 
 func (m *_BACnetProgramRequestTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetProgramRequestTagged) deepCopy() *_BACnetProgramRequestTagged {
 	_BACnetProgramRequestTaggedCopy := &_BACnetProgramRequestTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetProgramRequestTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramStateTagged.go
index 356779ccb4a..493e1533e6a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramStateTagged.go
@@ -54,20 +54,16 @@ type BACnetProgramStateTagged interface {
 type _BACnetProgramStateTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetProgramState
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetProgramStateTagged = (*_BACnetProgramStateTagged)(nil)
 
 // NewBACnetProgramStateTagged factory function for _BACnetProgramStateTagged
-func NewBACnetProgramStateTagged(header BACnetTagHeader, value BACnetProgramState, tagNumber uint8, tagClass TagClass) *_BACnetProgramStateTagged {
+func NewBACnetProgramStateTagged(header BACnetTagHeader, value BACnetProgramState) *_BACnetProgramStateTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetProgramStateTagged must not be nil")
 	}
-	return &_BACnetProgramStateTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetProgramStateTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetProgramStateTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetProgramStateTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetProgramState) BACnetProgramStateTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetProgramStateTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetProgramStateTaggedBuilder
 	// Build builds the BACnetProgramStateTagged or returns an error if something is wrong
 	Build() (BACnetProgramStateTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetProgramStateTaggedBuilder) WithValue(value BACnetProgramState) B
 	return b
 }
 
-func (b *_BACnetProgramStateTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetProgramStateTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetProgramStateTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetProgramStateTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetProgramStateTaggedBuilder) Build() (BACnetProgramStateTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetProgramStateTaggedParseWithBufferProducer(tagNumber uint8, tagClass T
 }
 
 func BACnetProgramStateTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetProgramStateTagged, error) {
-	v, err := (&_BACnetProgramStateTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetProgramStateTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetProgramStateTagged) SerializeWithWriteBuffer(ctx context.Context
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetProgramStateTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetProgramStateTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetProgramStateTagged) IsBACnetProgramStateTagged() {}
 
 func (m *_BACnetProgramStateTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetProgramStateTagged) deepCopy() *_BACnetProgramStateTagged {
 	_BACnetProgramStateTaggedCopy := &_BACnetProgramStateTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetProgramStateTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResult.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResult.go
index 243dc07e972..4f76aa20622 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResult.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResult.go
@@ -339,7 +339,7 @@ func BACnetPropertyAccessResultParseWithBufferProducer() func(ctx context.Contex
 }
 
 func BACnetPropertyAccessResultParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetPropertyAccessResult, error) {
-	v, err := (&_BACnetPropertyAccessResult{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetPropertyAccessResult)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResult.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResult.go
index 5687877b913..b6585e2f3f1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResult.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResult.go
@@ -54,12 +54,6 @@ type BACnetPropertyAccessResultAccessResultContract interface {
 	GetPeekedTagHeader() BACnetTagHeader
 	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
-	// GetObjectTypeArgument() returns a parser argument
-	GetObjectTypeArgument() BACnetObjectType
-	// GetPropertyIdentifierArgument() returns a parser argument
-	GetPropertyIdentifierArgument() BACnetPropertyIdentifier
-	// GetPropertyArrayIndexArgument() returns a parser argument
-	GetPropertyArrayIndexArgument() BACnetTagPayloadUnsignedInteger
 	// IsBACnetPropertyAccessResultAccessResult is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetPropertyAccessResultAccessResult()
 	// CreateBuilder creates a BACnetPropertyAccessResultAccessResultBuilder
@@ -81,21 +75,16 @@ type _BACnetPropertyAccessResultAccessResult struct {
 		BACnetPropertyAccessResultAccessResultRequirements
 	}
 	PeekedTagHeader BACnetTagHeader
-
-	// Arguments.
-	ObjectTypeArgument         BACnetObjectType
-	PropertyIdentifierArgument BACnetPropertyIdentifier
-	PropertyArrayIndexArgument BACnetTagPayloadUnsignedInteger
 }
 
 var _ BACnetPropertyAccessResultAccessResultContract = (*_BACnetPropertyAccessResultAccessResult)(nil)
 
 // NewBACnetPropertyAccessResultAccessResult factory function for _BACnetPropertyAccessResultAccessResult
-func NewBACnetPropertyAccessResultAccessResult(peekedTagHeader BACnetTagHeader, objectTypeArgument BACnetObjectType, propertyIdentifierArgument BACnetPropertyIdentifier, propertyArrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetPropertyAccessResultAccessResult {
+func NewBACnetPropertyAccessResultAccessResult(peekedTagHeader BACnetTagHeader) *_BACnetPropertyAccessResultAccessResult {
 	if peekedTagHeader == nil {
 		panic("peekedTagHeader of type BACnetTagHeader for BACnetPropertyAccessResultAccessResult must not be nil")
 	}
-	return &_BACnetPropertyAccessResultAccessResult{PeekedTagHeader: peekedTagHeader, ObjectTypeArgument: objectTypeArgument, PropertyIdentifierArgument: propertyIdentifierArgument, PropertyArrayIndexArgument: propertyArrayIndexArgument}
+	return &_BACnetPropertyAccessResultAccessResult{PeekedTagHeader: peekedTagHeader}
 }
 
 ///////////////////////////////////////////////////////////
@@ -112,12 +101,6 @@ type BACnetPropertyAccessResultAccessResultBuilder interface {
 	WithPeekedTagHeader(BACnetTagHeader) BACnetPropertyAccessResultAccessResultBuilder
 	// WithPeekedTagHeaderBuilder adds PeekedTagHeader (property field) which is build by the builder
 	WithPeekedTagHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetPropertyAccessResultAccessResultBuilder
-	// WithArgObjectTypeArgument sets a parser argument
-	WithArgObjectTypeArgument(BACnetObjectType) BACnetPropertyAccessResultAccessResultBuilder
-	// WithArgPropertyIdentifierArgument sets a parser argument
-	WithArgPropertyIdentifierArgument(BACnetPropertyIdentifier) BACnetPropertyAccessResultAccessResultBuilder
-	// WithArgPropertyArrayIndexArgument sets a parser argument
-	WithArgPropertyArrayIndexArgument(BACnetTagPayloadUnsignedInteger) BACnetPropertyAccessResultAccessResultBuilder
 	// AsBACnetPropertyAccessResultAccessResultPropertyValue converts this build to a subType of BACnetPropertyAccessResultAccessResult. It is always possible to return to current builder using Done()
 	AsBACnetPropertyAccessResultAccessResultPropertyValue() BACnetPropertyAccessResultAccessResultPropertyValueBuilder
 	// AsBACnetPropertyAccessResultAccessResultPropertyAccessError converts this build to a subType of BACnetPropertyAccessResultAccessResult. It is always possible to return to current builder using Done()
@@ -172,19 +155,6 @@ func (b *_BACnetPropertyAccessResultAccessResultBuilder) WithPeekedTagHeaderBuil
 	return b
 }
 
-func (b *_BACnetPropertyAccessResultAccessResultBuilder) WithArgObjectTypeArgument(objectTypeArgument BACnetObjectType) BACnetPropertyAccessResultAccessResultBuilder {
-	b.ObjectTypeArgument = objectTypeArgument
-	return b
-}
-func (b *_BACnetPropertyAccessResultAccessResultBuilder) WithArgPropertyIdentifierArgument(propertyIdentifierArgument BACnetPropertyIdentifier) BACnetPropertyAccessResultAccessResultBuilder {
-	b.PropertyIdentifierArgument = propertyIdentifierArgument
-	return b
-}
-func (b *_BACnetPropertyAccessResultAccessResultBuilder) WithArgPropertyArrayIndexArgument(propertyArrayIndexArgument BACnetTagPayloadUnsignedInteger) BACnetPropertyAccessResultAccessResultBuilder {
-	b.PropertyArrayIndexArgument = propertyArrayIndexArgument
-	return b
-}
-
 func (b *_BACnetPropertyAccessResultAccessResultBuilder) PartialBuild() (BACnetPropertyAccessResultAccessResultContract, error) {
 	if b.PeekedTagHeader == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'peekedTagHeader' not set"))
@@ -343,7 +313,7 @@ func BACnetPropertyAccessResultAccessResultParseWithBufferProducer[T BACnetPrope
 }
 
 func BACnetPropertyAccessResultAccessResultParseWithBuffer[T BACnetPropertyAccessResultAccessResult](ctx context.Context, readBuffer utils.ReadBuffer, objectTypeArgument BACnetObjectType, propertyIdentifierArgument BACnetPropertyIdentifier, propertyArrayIndexArgument BACnetTagPayloadUnsignedInteger) (T, error) {
-	v, err := (&_BACnetPropertyAccessResultAccessResult{ObjectTypeArgument: objectTypeArgument, PropertyIdentifierArgument: propertyIdentifierArgument, PropertyArrayIndexArgument: propertyArrayIndexArgument}).parse(ctx, readBuffer, objectTypeArgument, propertyIdentifierArgument, propertyArrayIndexArgument)
+	v, err := (new(_BACnetPropertyAccessResultAccessResult)).parse(ctx, readBuffer, objectTypeArgument, propertyIdentifierArgument, propertyArrayIndexArgument)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -428,22 +398,6 @@ func (pm *_BACnetPropertyAccessResultAccessResult) serializeParent(ctx context.C
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetPropertyAccessResultAccessResult) GetObjectTypeArgument() BACnetObjectType {
-	return m.ObjectTypeArgument
-}
-func (m *_BACnetPropertyAccessResultAccessResult) GetPropertyIdentifierArgument() BACnetPropertyIdentifier {
-	return m.PropertyIdentifierArgument
-}
-func (m *_BACnetPropertyAccessResultAccessResult) GetPropertyArrayIndexArgument() BACnetTagPayloadUnsignedInteger {
-	return m.PropertyArrayIndexArgument
-}
-
-//
-////
-
 func (m *_BACnetPropertyAccessResultAccessResult) IsBACnetPropertyAccessResultAccessResult() {}
 
 func (m *_BACnetPropertyAccessResultAccessResult) DeepCopy() any {
@@ -457,9 +411,6 @@ func (m *_BACnetPropertyAccessResultAccessResult) deepCopy() *_BACnetPropertyAcc
 	_BACnetPropertyAccessResultAccessResultCopy := &_BACnetPropertyAccessResultAccessResult{
 		nil, // will be set by child
 		utils.DeepCopy[BACnetTagHeader](m.PeekedTagHeader),
-		m.ObjectTypeArgument,
-		m.PropertyIdentifierArgument,
-		m.PropertyArrayIndexArgument,
 	}
 	return _BACnetPropertyAccessResultAccessResultCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyAccessError.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyAccessError.go
index 1267b7d4d79..be3696751c7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyAccessError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyAccessError.go
@@ -59,12 +59,12 @@ var _ BACnetPropertyAccessResultAccessResultPropertyAccessError = (*_BACnetPrope
 var _ BACnetPropertyAccessResultAccessResultRequirements = (*_BACnetPropertyAccessResultAccessResultPropertyAccessError)(nil)
 
 // NewBACnetPropertyAccessResultAccessResultPropertyAccessError factory function for _BACnetPropertyAccessResultAccessResultPropertyAccessError
-func NewBACnetPropertyAccessResultAccessResultPropertyAccessError(peekedTagHeader BACnetTagHeader, propertyAccessError ErrorEnclosed, objectTypeArgument BACnetObjectType, propertyIdentifierArgument BACnetPropertyIdentifier, propertyArrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetPropertyAccessResultAccessResultPropertyAccessError {
+func NewBACnetPropertyAccessResultAccessResultPropertyAccessError(peekedTagHeader BACnetTagHeader, propertyAccessError ErrorEnclosed) *_BACnetPropertyAccessResultAccessResultPropertyAccessError {
 	if propertyAccessError == nil {
 		panic("propertyAccessError of type ErrorEnclosed for BACnetPropertyAccessResultAccessResultPropertyAccessError must not be nil")
 	}
 	_result := &_BACnetPropertyAccessResultAccessResultPropertyAccessError{
-		BACnetPropertyAccessResultAccessResultContract: NewBACnetPropertyAccessResultAccessResult(peekedTagHeader, objectTypeArgument, propertyIdentifierArgument, propertyArrayIndexArgument),
+		BACnetPropertyAccessResultAccessResultContract: NewBACnetPropertyAccessResultAccessResult(peekedTagHeader),
 		PropertyAccessError:                            propertyAccessError,
 	}
 	_result.BACnetPropertyAccessResultAccessResultContract.(*_BACnetPropertyAccessResultAccessResult)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyValue.go
index 65bf0769a96..4448db16570 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyValue.go
@@ -59,12 +59,12 @@ var _ BACnetPropertyAccessResultAccessResultPropertyValue = (*_BACnetPropertyAcc
 var _ BACnetPropertyAccessResultAccessResultRequirements = (*_BACnetPropertyAccessResultAccessResultPropertyValue)(nil)
 
 // NewBACnetPropertyAccessResultAccessResultPropertyValue factory function for _BACnetPropertyAccessResultAccessResultPropertyValue
-func NewBACnetPropertyAccessResultAccessResultPropertyValue(peekedTagHeader BACnetTagHeader, propertyValue BACnetConstructedData, objectTypeArgument BACnetObjectType, propertyIdentifierArgument BACnetPropertyIdentifier, propertyArrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetPropertyAccessResultAccessResultPropertyValue {
+func NewBACnetPropertyAccessResultAccessResultPropertyValue(peekedTagHeader BACnetTagHeader, propertyValue BACnetConstructedData) *_BACnetPropertyAccessResultAccessResultPropertyValue {
 	if propertyValue == nil {
 		panic("propertyValue of type BACnetConstructedData for BACnetPropertyAccessResultAccessResultPropertyValue must not be nil")
 	}
 	_result := &_BACnetPropertyAccessResultAccessResultPropertyValue{
-		BACnetPropertyAccessResultAccessResultContract: NewBACnetPropertyAccessResultAccessResult(peekedTagHeader, objectTypeArgument, propertyIdentifierArgument, propertyArrayIndexArgument),
+		BACnetPropertyAccessResultAccessResultContract: NewBACnetPropertyAccessResultAccessResult(peekedTagHeader),
 		PropertyValue: propertyValue,
 	}
 	_result.BACnetPropertyAccessResultAccessResultContract.(*_BACnetPropertyAccessResultAccessResult)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifierTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifierTagged.go
index 411d8818e39..105833451d3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifierTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifierTagged.go
@@ -59,20 +59,16 @@ type _BACnetPropertyIdentifierTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetPropertyIdentifier
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetPropertyIdentifierTagged = (*_BACnetPropertyIdentifierTagged)(nil)
 
 // NewBACnetPropertyIdentifierTagged factory function for _BACnetPropertyIdentifierTagged
-func NewBACnetPropertyIdentifierTagged(header BACnetTagHeader, value BACnetPropertyIdentifier, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetPropertyIdentifierTagged {
+func NewBACnetPropertyIdentifierTagged(header BACnetTagHeader, value BACnetPropertyIdentifier, proprietaryValue uint32) *_BACnetPropertyIdentifierTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetPropertyIdentifierTagged must not be nil")
 	}
-	return &_BACnetPropertyIdentifierTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetPropertyIdentifierTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetPropertyIdentifierTaggedBuilder interface {
 	WithValue(BACnetPropertyIdentifier) BACnetPropertyIdentifierTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetPropertyIdentifierTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetPropertyIdentifierTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetPropertyIdentifierTaggedBuilder
 	// Build builds the BACnetPropertyIdentifierTagged or returns an error if something is wrong
 	Build() (BACnetPropertyIdentifierTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetPropertyIdentifierTaggedBuilder) WithProprietaryValue(proprietar
 	return b
 }
 
-func (b *_BACnetPropertyIdentifierTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetPropertyIdentifierTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetPropertyIdentifierTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetPropertyIdentifierTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetPropertyIdentifierTaggedBuilder) Build() (BACnetPropertyIdentifierTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetPropertyIdentifierTaggedParseWithBufferProducer(tagNumber uint8, tagC
 }
 
 func BACnetPropertyIdentifierTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetPropertyIdentifierTagged, error) {
-	v, err := (&_BACnetPropertyIdentifierTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetPropertyIdentifierTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetPropertyIdentifierTagged) SerializeWithWriteBuffer(ctx context.C
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetPropertyIdentifierTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetPropertyIdentifierTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetPropertyIdentifierTagged) IsBACnetPropertyIdentifierTagged() {}
 
 func (m *_BACnetPropertyIdentifierTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetPropertyIdentifierTagged) deepCopy() *_BACnetPropertyIdentifierT
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetPropertyIdentifierTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReference.go
index be8c0077e32..b3ebab84deb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReference.go
@@ -238,7 +238,7 @@ func BACnetPropertyReferenceParseWithBufferProducer() func(ctx context.Context,
 }
 
 func BACnetPropertyReferenceParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetPropertyReference, error) {
-	v, err := (&_BACnetPropertyReference{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetPropertyReference)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReferenceEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReferenceEnclosed.go
index 383027fe5df..4190bd8684f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReferenceEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReferenceEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetPropertyReferenceEnclosed struct {
 	OpeningTag BACnetOpeningTag
 	Reference  BACnetPropertyReference
 	ClosingTag BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetPropertyReferenceEnclosed = (*_BACnetPropertyReferenceEnclosed)(nil)
 
 // NewBACnetPropertyReferenceEnclosed factory function for _BACnetPropertyReferenceEnclosed
-func NewBACnetPropertyReferenceEnclosed(openingTag BACnetOpeningTag, reference BACnetPropertyReference, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetPropertyReferenceEnclosed {
+func NewBACnetPropertyReferenceEnclosed(openingTag BACnetOpeningTag, reference BACnetPropertyReference, closingTag BACnetClosingTag) *_BACnetPropertyReferenceEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetPropertyReferenceEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetPropertyReferenceEnclosed(openingTag BACnetOpeningTag, reference B
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetPropertyReferenceEnclosed must not be nil")
 	}
-	return &_BACnetPropertyReferenceEnclosed{OpeningTag: openingTag, Reference: reference, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetPropertyReferenceEnclosed{OpeningTag: openingTag, Reference: reference, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetPropertyReferenceEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetPropertyReferenceEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetPropertyReferenceEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetPropertyReferenceEnclosedBuilder
 	// Build builds the BACnetPropertyReferenceEnclosed or returns an error if something is wrong
 	Build() (BACnetPropertyReferenceEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetPropertyReferenceEnclosedBuilder) WithClosingTagBuilder(builderS
 	return b
 }
 
-func (b *_BACnetPropertyReferenceEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetPropertyReferenceEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetPropertyReferenceEnclosedBuilder) Build() (BACnetPropertyReferenceEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetPropertyReferenceEnclosedParseWithBufferProducer(tagNumber uint8) fun
 }
 
 func BACnetPropertyReferenceEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetPropertyReferenceEnclosed, error) {
-	v, err := (&_BACnetPropertyReferenceEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetPropertyReferenceEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetPropertyReferenceEnclosed) SerializeWithWriteBuffer(ctx context.
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetPropertyReferenceEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetPropertyReferenceEnclosed) IsBACnetPropertyReferenceEnclosed() {}
 
 func (m *_BACnetPropertyReferenceEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetPropertyReferenceEnclosed) deepCopy() *_BACnetPropertyReferenceE
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetPropertyReference](m.Reference),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetPropertyReferenceEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStates.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStates.go
index 9fa8d0c0a89..8f09fc315cb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStates.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStates.go
@@ -997,7 +997,7 @@ func BACnetPropertyStatesParseWithBufferProducer[T BACnetPropertyStates]() func(
 }
 
 func BACnetPropertyStatesParseWithBuffer[T BACnetPropertyStates](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetPropertyStates{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetPropertyStates)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEnclosed.go
index 189376d63f9..8306af93bc2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetPropertyStatesEnclosed struct {
 	OpeningTag    BACnetOpeningTag
 	PropertyState BACnetPropertyStates
 	ClosingTag    BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetPropertyStatesEnclosed = (*_BACnetPropertyStatesEnclosed)(nil)
 
 // NewBACnetPropertyStatesEnclosed factory function for _BACnetPropertyStatesEnclosed
-func NewBACnetPropertyStatesEnclosed(openingTag BACnetOpeningTag, propertyState BACnetPropertyStates, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetPropertyStatesEnclosed {
+func NewBACnetPropertyStatesEnclosed(openingTag BACnetOpeningTag, propertyState BACnetPropertyStates, closingTag BACnetClosingTag) *_BACnetPropertyStatesEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetPropertyStatesEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetPropertyStatesEnclosed(openingTag BACnetOpeningTag, propertyState
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetPropertyStatesEnclosed must not be nil")
 	}
-	return &_BACnetPropertyStatesEnclosed{OpeningTag: openingTag, PropertyState: propertyState, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetPropertyStatesEnclosed{OpeningTag: openingTag, PropertyState: propertyState, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetPropertyStatesEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetPropertyStatesEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetPropertyStatesEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetPropertyStatesEnclosedBuilder
 	// Build builds the BACnetPropertyStatesEnclosed or returns an error if something is wrong
 	Build() (BACnetPropertyStatesEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetPropertyStatesEnclosedBuilder) WithClosingTagBuilder(builderSupp
 	return b
 }
 
-func (b *_BACnetPropertyStatesEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetPropertyStatesEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetPropertyStatesEnclosedBuilder) Build() (BACnetPropertyStatesEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetPropertyStatesEnclosedParseWithBufferProducer(tagNumber uint8) func(c
 }
 
 func BACnetPropertyStatesEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetPropertyStatesEnclosed, error) {
-	v, err := (&_BACnetPropertyStatesEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetPropertyStatesEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetPropertyStatesEnclosed) SerializeWithWriteBuffer(ctx context.Con
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetPropertyStatesEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetPropertyStatesEnclosed) IsBACnetPropertyStatesEnclosed() {}
 
 func (m *_BACnetPropertyStatesEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetPropertyStatesEnclosed) deepCopy() *_BACnetPropertyStatesEnclose
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetPropertyStates](m.PropertyState),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetPropertyStatesEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValue.go
index d60ee932a2d..65e79da149f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValue.go
@@ -60,19 +60,16 @@ type _BACnetPropertyValue struct {
 	PropertyArrayIndex BACnetContextTagUnsignedInteger
 	PropertyValue      BACnetConstructedDataElement
 	Priority           BACnetContextTagUnsignedInteger
-
-	// Arguments.
-	ObjectTypeArgument BACnetObjectType
 }
 
 var _ BACnetPropertyValue = (*_BACnetPropertyValue)(nil)
 
 // NewBACnetPropertyValue factory function for _BACnetPropertyValue
-func NewBACnetPropertyValue(propertyIdentifier BACnetPropertyIdentifierTagged, propertyArrayIndex BACnetContextTagUnsignedInteger, propertyValue BACnetConstructedDataElement, priority BACnetContextTagUnsignedInteger, objectTypeArgument BACnetObjectType) *_BACnetPropertyValue {
+func NewBACnetPropertyValue(propertyIdentifier BACnetPropertyIdentifierTagged, propertyArrayIndex BACnetContextTagUnsignedInteger, propertyValue BACnetConstructedDataElement, priority BACnetContextTagUnsignedInteger) *_BACnetPropertyValue {
 	if propertyIdentifier == nil {
 		panic("propertyIdentifier of type BACnetPropertyIdentifierTagged for BACnetPropertyValue must not be nil")
 	}
-	return &_BACnetPropertyValue{PropertyIdentifier: propertyIdentifier, PropertyArrayIndex: propertyArrayIndex, PropertyValue: propertyValue, Priority: priority, ObjectTypeArgument: objectTypeArgument}
+	return &_BACnetPropertyValue{PropertyIdentifier: propertyIdentifier, PropertyArrayIndex: propertyArrayIndex, PropertyValue: propertyValue, Priority: priority}
 }
 
 ///////////////////////////////////////////////////////////
@@ -101,8 +98,6 @@ type BACnetPropertyValueBuilder interface {
 	WithOptionalPriority(BACnetContextTagUnsignedInteger) BACnetPropertyValueBuilder
 	// WithOptionalPriorityBuilder adds Priority (property field) which is build by the builder
 	WithOptionalPriorityBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetPropertyValueBuilder
-	// WithArgObjectTypeArgument sets a parser argument
-	WithArgObjectTypeArgument(BACnetObjectType) BACnetPropertyValueBuilder
 	// Build builds the BACnetPropertyValue or returns an error if something is wrong
 	Build() (BACnetPropertyValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -186,11 +181,6 @@ func (b *_BACnetPropertyValueBuilder) WithOptionalPriorityBuilder(builderSupplie
 	return b
 }
 
-func (b *_BACnetPropertyValueBuilder) WithArgObjectTypeArgument(objectTypeArgument BACnetObjectType) BACnetPropertyValueBuilder {
-	b.ObjectTypeArgument = objectTypeArgument
-	return b
-}
-
 func (b *_BACnetPropertyValueBuilder) Build() (BACnetPropertyValue, error) {
 	if b.PropertyIdentifier == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'propertyIdentifier' not set"))
@@ -310,7 +300,7 @@ func BACnetPropertyValueParseWithBufferProducer(objectTypeArgument BACnetObjectT
 }
 
 func BACnetPropertyValueParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, objectTypeArgument BACnetObjectType) (BACnetPropertyValue, error) {
-	v, err := (&_BACnetPropertyValue{ObjectTypeArgument: objectTypeArgument}).parse(ctx, readBuffer, objectTypeArgument)
+	v, err := (new(_BACnetPropertyValue)).parse(ctx, readBuffer, objectTypeArgument)
 	if err != nil {
 		return nil, err
 	}
@@ -408,16 +398,6 @@ func (m *_BACnetPropertyValue) SerializeWithWriteBuffer(ctx context.Context, wri
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetPropertyValue) GetObjectTypeArgument() BACnetObjectType {
-	return m.ObjectTypeArgument
-}
-
-//
-////
-
 func (m *_BACnetPropertyValue) IsBACnetPropertyValue() {}
 
 func (m *_BACnetPropertyValue) DeepCopy() any {
@@ -433,7 +413,6 @@ func (m *_BACnetPropertyValue) deepCopy() *_BACnetPropertyValue {
 		utils.DeepCopy[BACnetContextTagUnsignedInteger](m.PropertyArrayIndex),
 		utils.DeepCopy[BACnetConstructedDataElement](m.PropertyValue),
 		utils.DeepCopy[BACnetContextTagUnsignedInteger](m.Priority),
-		m.ObjectTypeArgument,
 	}
 	return _BACnetPropertyValueCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValues.go
index 2fe310ea2a4..29dcb0e977d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValues.go
@@ -57,23 +57,19 @@ type _BACnetPropertyValues struct {
 	InnerOpeningTag BACnetOpeningTag
 	Data            []BACnetPropertyValue
 	InnerClosingTag BACnetClosingTag
-
-	// Arguments.
-	TagNumber          uint8
-	ObjectTypeArgument BACnetObjectType
 }
 
 var _ BACnetPropertyValues = (*_BACnetPropertyValues)(nil)
 
 // NewBACnetPropertyValues factory function for _BACnetPropertyValues
-func NewBACnetPropertyValues(innerOpeningTag BACnetOpeningTag, data []BACnetPropertyValue, innerClosingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetPropertyValues {
+func NewBACnetPropertyValues(innerOpeningTag BACnetOpeningTag, data []BACnetPropertyValue, innerClosingTag BACnetClosingTag) *_BACnetPropertyValues {
 	if innerOpeningTag == nil {
 		panic("innerOpeningTag of type BACnetOpeningTag for BACnetPropertyValues must not be nil")
 	}
 	if innerClosingTag == nil {
 		panic("innerClosingTag of type BACnetClosingTag for BACnetPropertyValues must not be nil")
 	}
-	return &_BACnetPropertyValues{InnerOpeningTag: innerOpeningTag, Data: data, InnerClosingTag: innerClosingTag, TagNumber: tagNumber, ObjectTypeArgument: objectTypeArgument}
+	return &_BACnetPropertyValues{InnerOpeningTag: innerOpeningTag, Data: data, InnerClosingTag: innerClosingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -96,10 +92,6 @@ type BACnetPropertyValuesBuilder interface {
 	WithInnerClosingTag(BACnetClosingTag) BACnetPropertyValuesBuilder
 	// WithInnerClosingTagBuilder adds InnerClosingTag (property field) which is build by the builder
 	WithInnerClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetPropertyValuesBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetPropertyValuesBuilder
-	// WithArgObjectTypeArgument sets a parser argument
-	WithArgObjectTypeArgument(BACnetObjectType) BACnetPropertyValuesBuilder
 	// Build builds the BACnetPropertyValues or returns an error if something is wrong
 	Build() (BACnetPropertyValues, error)
 	// MustBuild does the same as Build but panics on error
@@ -158,15 +150,6 @@ func (b *_BACnetPropertyValuesBuilder) WithInnerClosingTagBuilder(builderSupplie
 	return b
 }
 
-func (b *_BACnetPropertyValuesBuilder) WithArgTagNumber(tagNumber uint8) BACnetPropertyValuesBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetPropertyValuesBuilder) WithArgObjectTypeArgument(objectTypeArgument BACnetObjectType) BACnetPropertyValuesBuilder {
-	b.ObjectTypeArgument = objectTypeArgument
-	return b
-}
-
 func (b *_BACnetPropertyValuesBuilder) Build() (BACnetPropertyValues, error) {
 	if b.InnerOpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'innerOpeningTag' not set"))
@@ -280,7 +263,7 @@ func BACnetPropertyValuesParseWithBufferProducer(tagNumber uint8, objectTypeArgu
 }
 
 func BACnetPropertyValuesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetPropertyValues, error) {
-	v, err := (&_BACnetPropertyValues{TagNumber: tagNumber, ObjectTypeArgument: objectTypeArgument}).parse(ctx, readBuffer, tagNumber, objectTypeArgument)
+	v, err := (new(_BACnetPropertyValues)).parse(ctx, readBuffer, tagNumber, objectTypeArgument)
 	if err != nil {
 		return nil, err
 	}
@@ -356,19 +339,6 @@ func (m *_BACnetPropertyValues) SerializeWithWriteBuffer(ctx context.Context, wr
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetPropertyValues) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetPropertyValues) GetObjectTypeArgument() BACnetObjectType {
-	return m.ObjectTypeArgument
-}
-
-//
-////
-
 func (m *_BACnetPropertyValues) IsBACnetPropertyValues() {}
 
 func (m *_BACnetPropertyValues) DeepCopy() any {
@@ -383,8 +353,6 @@ func (m *_BACnetPropertyValues) deepCopy() *_BACnetPropertyValues {
 		utils.DeepCopy[BACnetOpeningTag](m.InnerOpeningTag),
 		utils.DeepCopySlice[BACnetPropertyValue, BACnetPropertyValue](m.Data),
 		utils.DeepCopy[BACnetClosingTag](m.InnerClosingTag),
-		m.TagNumber,
-		m.ObjectTypeArgument,
 	}
 	return _BACnetPropertyValuesCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyWriteDefinition.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyWriteDefinition.go
index f5ab4bb8b22..5229cec5d92 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyWriteDefinition.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyWriteDefinition.go
@@ -60,19 +60,16 @@ type _BACnetPropertyWriteDefinition struct {
 	ArrayIndex         BACnetContextTagUnsignedInteger
 	PropertyValue      BACnetConstructedData
 	Priority           BACnetContextTagUnsignedInteger
-
-	// Arguments.
-	ObjectTypeArgument BACnetObjectType
 }
 
 var _ BACnetPropertyWriteDefinition = (*_BACnetPropertyWriteDefinition)(nil)
 
 // NewBACnetPropertyWriteDefinition factory function for _BACnetPropertyWriteDefinition
-func NewBACnetPropertyWriteDefinition(propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger, propertyValue BACnetConstructedData, priority BACnetContextTagUnsignedInteger, objectTypeArgument BACnetObjectType) *_BACnetPropertyWriteDefinition {
+func NewBACnetPropertyWriteDefinition(propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger, propertyValue BACnetConstructedData, priority BACnetContextTagUnsignedInteger) *_BACnetPropertyWriteDefinition {
 	if propertyIdentifier == nil {
 		panic("propertyIdentifier of type BACnetPropertyIdentifierTagged for BACnetPropertyWriteDefinition must not be nil")
 	}
-	return &_BACnetPropertyWriteDefinition{PropertyIdentifier: propertyIdentifier, ArrayIndex: arrayIndex, PropertyValue: propertyValue, Priority: priority, ObjectTypeArgument: objectTypeArgument}
+	return &_BACnetPropertyWriteDefinition{PropertyIdentifier: propertyIdentifier, ArrayIndex: arrayIndex, PropertyValue: propertyValue, Priority: priority}
 }
 
 ///////////////////////////////////////////////////////////
@@ -101,8 +98,6 @@ type BACnetPropertyWriteDefinitionBuilder interface {
 	WithOptionalPriority(BACnetContextTagUnsignedInteger) BACnetPropertyWriteDefinitionBuilder
 	// WithOptionalPriorityBuilder adds Priority (property field) which is build by the builder
 	WithOptionalPriorityBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetPropertyWriteDefinitionBuilder
-	// WithArgObjectTypeArgument sets a parser argument
-	WithArgObjectTypeArgument(BACnetObjectType) BACnetPropertyWriteDefinitionBuilder
 	// Build builds the BACnetPropertyWriteDefinition or returns an error if something is wrong
 	Build() (BACnetPropertyWriteDefinition, error)
 	// MustBuild does the same as Build but panics on error
@@ -186,11 +181,6 @@ func (b *_BACnetPropertyWriteDefinitionBuilder) WithOptionalPriorityBuilder(buil
 	return b
 }
 
-func (b *_BACnetPropertyWriteDefinitionBuilder) WithArgObjectTypeArgument(objectTypeArgument BACnetObjectType) BACnetPropertyWriteDefinitionBuilder {
-	b.ObjectTypeArgument = objectTypeArgument
-	return b
-}
-
 func (b *_BACnetPropertyWriteDefinitionBuilder) Build() (BACnetPropertyWriteDefinition, error) {
 	if b.PropertyIdentifier == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'propertyIdentifier' not set"))
@@ -310,7 +300,7 @@ func BACnetPropertyWriteDefinitionParseWithBufferProducer(objectTypeArgument BAC
 }
 
 func BACnetPropertyWriteDefinitionParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, objectTypeArgument BACnetObjectType) (BACnetPropertyWriteDefinition, error) {
-	v, err := (&_BACnetPropertyWriteDefinition{ObjectTypeArgument: objectTypeArgument}).parse(ctx, readBuffer, objectTypeArgument)
+	v, err := (new(_BACnetPropertyWriteDefinition)).parse(ctx, readBuffer, objectTypeArgument)
 	if err != nil {
 		return nil, err
 	}
@@ -408,16 +398,6 @@ func (m *_BACnetPropertyWriteDefinition) SerializeWithWriteBuffer(ctx context.Co
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetPropertyWriteDefinition) GetObjectTypeArgument() BACnetObjectType {
-	return m.ObjectTypeArgument
-}
-
-//
-////
-
 func (m *_BACnetPropertyWriteDefinition) IsBACnetPropertyWriteDefinition() {}
 
 func (m *_BACnetPropertyWriteDefinition) DeepCopy() any {
@@ -433,7 +413,6 @@ func (m *_BACnetPropertyWriteDefinition) deepCopy() *_BACnetPropertyWriteDefinit
 		utils.DeepCopy[BACnetContextTagUnsignedInteger](m.ArrayIndex),
 		utils.DeepCopy[BACnetConstructedData](m.PropertyValue),
 		utils.DeepCopy[BACnetContextTagUnsignedInteger](m.Priority),
-		m.ObjectTypeArgument,
 	}
 	return _BACnetPropertyWriteDefinitionCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevelTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevelTagged.go
index 296ca97f68f..7b5c178e982 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevelTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevelTagged.go
@@ -54,20 +54,16 @@ type BACnetProtocolLevelTagged interface {
 type _BACnetProtocolLevelTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetProtocolLevel
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetProtocolLevelTagged = (*_BACnetProtocolLevelTagged)(nil)
 
 // NewBACnetProtocolLevelTagged factory function for _BACnetProtocolLevelTagged
-func NewBACnetProtocolLevelTagged(header BACnetTagHeader, value BACnetProtocolLevel, tagNumber uint8, tagClass TagClass) *_BACnetProtocolLevelTagged {
+func NewBACnetProtocolLevelTagged(header BACnetTagHeader, value BACnetProtocolLevel) *_BACnetProtocolLevelTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetProtocolLevelTagged must not be nil")
 	}
-	return &_BACnetProtocolLevelTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetProtocolLevelTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetProtocolLevelTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetProtocolLevelTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetProtocolLevel) BACnetProtocolLevelTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetProtocolLevelTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetProtocolLevelTaggedBuilder
 	// Build builds the BACnetProtocolLevelTagged or returns an error if something is wrong
 	Build() (BACnetProtocolLevelTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetProtocolLevelTaggedBuilder) WithValue(value BACnetProtocolLevel)
 	return b
 }
 
-func (b *_BACnetProtocolLevelTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetProtocolLevelTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetProtocolLevelTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetProtocolLevelTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetProtocolLevelTaggedBuilder) Build() (BACnetProtocolLevelTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetProtocolLevelTaggedParseWithBufferProducer(tagNumber uint8, tagClass
 }
 
 func BACnetProtocolLevelTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetProtocolLevelTagged, error) {
-	v, err := (&_BACnetProtocolLevelTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetProtocolLevelTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetProtocolLevelTagged) SerializeWithWriteBuffer(ctx context.Contex
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetProtocolLevelTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetProtocolLevelTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetProtocolLevelTagged) IsBACnetProtocolLevelTagged() {}
 
 func (m *_BACnetProtocolLevelTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetProtocolLevelTagged) deepCopy() *_BACnetProtocolLevelTagged {
 	_BACnetProtocolLevelTaggedCopy := &_BACnetProtocolLevelTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetProtocolLevelTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessProperty.go
index 9570487575f..d988f47fa20 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessProperty.go
@@ -57,19 +57,16 @@ type _BACnetReadAccessProperty struct {
 	PropertyIdentifier BACnetPropertyIdentifierTagged
 	ArrayIndex         BACnetContextTagUnsignedInteger
 	ReadResult         BACnetReadAccessPropertyReadResult
-
-	// Arguments.
-	ObjectTypeArgument BACnetObjectType
 }
 
 var _ BACnetReadAccessProperty = (*_BACnetReadAccessProperty)(nil)
 
 // NewBACnetReadAccessProperty factory function for _BACnetReadAccessProperty
-func NewBACnetReadAccessProperty(propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger, readResult BACnetReadAccessPropertyReadResult, objectTypeArgument BACnetObjectType) *_BACnetReadAccessProperty {
+func NewBACnetReadAccessProperty(propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger, readResult BACnetReadAccessPropertyReadResult) *_BACnetReadAccessProperty {
 	if propertyIdentifier == nil {
 		panic("propertyIdentifier of type BACnetPropertyIdentifierTagged for BACnetReadAccessProperty must not be nil")
 	}
-	return &_BACnetReadAccessProperty{PropertyIdentifier: propertyIdentifier, ArrayIndex: arrayIndex, ReadResult: readResult, ObjectTypeArgument: objectTypeArgument}
+	return &_BACnetReadAccessProperty{PropertyIdentifier: propertyIdentifier, ArrayIndex: arrayIndex, ReadResult: readResult}
 }
 
 ///////////////////////////////////////////////////////////
@@ -94,8 +91,6 @@ type BACnetReadAccessPropertyBuilder interface {
 	WithOptionalReadResult(BACnetReadAccessPropertyReadResult) BACnetReadAccessPropertyBuilder
 	// WithOptionalReadResultBuilder adds ReadResult (property field) which is build by the builder
 	WithOptionalReadResultBuilder(func(BACnetReadAccessPropertyReadResultBuilder) BACnetReadAccessPropertyReadResultBuilder) BACnetReadAccessPropertyBuilder
-	// WithArgObjectTypeArgument sets a parser argument
-	WithArgObjectTypeArgument(BACnetObjectType) BACnetReadAccessPropertyBuilder
 	// Build builds the BACnetReadAccessProperty or returns an error if something is wrong
 	Build() (BACnetReadAccessProperty, error)
 	// MustBuild does the same as Build but panics on error
@@ -164,11 +159,6 @@ func (b *_BACnetReadAccessPropertyBuilder) WithOptionalReadResultBuilder(builder
 	return b
 }
 
-func (b *_BACnetReadAccessPropertyBuilder) WithArgObjectTypeArgument(objectTypeArgument BACnetObjectType) BACnetReadAccessPropertyBuilder {
-	b.ObjectTypeArgument = objectTypeArgument
-	return b
-}
-
 func (b *_BACnetReadAccessPropertyBuilder) Build() (BACnetReadAccessProperty, error) {
 	if b.PropertyIdentifier == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'propertyIdentifier' not set"))
@@ -279,7 +269,7 @@ func BACnetReadAccessPropertyParseWithBufferProducer(objectTypeArgument BACnetOb
 }
 
 func BACnetReadAccessPropertyParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, objectTypeArgument BACnetObjectType) (BACnetReadAccessProperty, error) {
-	v, err := (&_BACnetReadAccessProperty{ObjectTypeArgument: objectTypeArgument}).parse(ctx, readBuffer, objectTypeArgument)
+	v, err := (new(_BACnetReadAccessProperty)).parse(ctx, readBuffer, objectTypeArgument)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetReadAccessProperty) SerializeWithWriteBuffer(ctx context.Context
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetReadAccessProperty) GetObjectTypeArgument() BACnetObjectType {
-	return m.ObjectTypeArgument
-}
-
-//
-////
-
 func (m *_BACnetReadAccessProperty) IsBACnetReadAccessProperty() {}
 
 func (m *_BACnetReadAccessProperty) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetReadAccessProperty) deepCopy() *_BACnetReadAccessProperty {
 		utils.DeepCopy[BACnetPropertyIdentifierTagged](m.PropertyIdentifier),
 		utils.DeepCopy[BACnetContextTagUnsignedInteger](m.ArrayIndex),
 		utils.DeepCopy[BACnetReadAccessPropertyReadResult](m.ReadResult),
-		m.ObjectTypeArgument,
 	}
 	return _BACnetReadAccessPropertyCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go
index 376eee56c47..502a59f66ca 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go
@@ -59,21 +59,16 @@ type _BACnetReadAccessPropertyReadResult struct {
 	PeekedTagHeader     BACnetTagHeader
 	PropertyValue       BACnetConstructedData
 	PropertyAccessError ErrorEnclosed
-
-	// Arguments.
-	ObjectTypeArgument         BACnetObjectType
-	PropertyIdentifierArgument BACnetPropertyIdentifier
-	ArrayIndexArgument         BACnetTagPayloadUnsignedInteger
 }
 
 var _ BACnetReadAccessPropertyReadResult = (*_BACnetReadAccessPropertyReadResult)(nil)
 
 // NewBACnetReadAccessPropertyReadResult factory function for _BACnetReadAccessPropertyReadResult
-func NewBACnetReadAccessPropertyReadResult(peekedTagHeader BACnetTagHeader, propertyValue BACnetConstructedData, propertyAccessError ErrorEnclosed, objectTypeArgument BACnetObjectType, propertyIdentifierArgument BACnetPropertyIdentifier, arrayIndexArgument BACnetTagPayloadUnsignedInteger) *_BACnetReadAccessPropertyReadResult {
+func NewBACnetReadAccessPropertyReadResult(peekedTagHeader BACnetTagHeader, propertyValue BACnetConstructedData, propertyAccessError ErrorEnclosed) *_BACnetReadAccessPropertyReadResult {
 	if peekedTagHeader == nil {
 		panic("peekedTagHeader of type BACnetTagHeader for BACnetReadAccessPropertyReadResult must not be nil")
 	}
-	return &_BACnetReadAccessPropertyReadResult{PeekedTagHeader: peekedTagHeader, PropertyValue: propertyValue, PropertyAccessError: propertyAccessError, ObjectTypeArgument: objectTypeArgument, PropertyIdentifierArgument: propertyIdentifierArgument, ArrayIndexArgument: arrayIndexArgument}
+	return &_BACnetReadAccessPropertyReadResult{PeekedTagHeader: peekedTagHeader, PropertyValue: propertyValue, PropertyAccessError: propertyAccessError}
 }
 
 ///////////////////////////////////////////////////////////
@@ -98,12 +93,6 @@ type BACnetReadAccessPropertyReadResultBuilder interface {
 	WithOptionalPropertyAccessError(ErrorEnclosed) BACnetReadAccessPropertyReadResultBuilder
 	// WithOptionalPropertyAccessErrorBuilder adds PropertyAccessError (property field) which is build by the builder
 	WithOptionalPropertyAccessErrorBuilder(func(ErrorEnclosedBuilder) ErrorEnclosedBuilder) BACnetReadAccessPropertyReadResultBuilder
-	// WithArgObjectTypeArgument sets a parser argument
-	WithArgObjectTypeArgument(BACnetObjectType) BACnetReadAccessPropertyReadResultBuilder
-	// WithArgPropertyIdentifierArgument sets a parser argument
-	WithArgPropertyIdentifierArgument(BACnetPropertyIdentifier) BACnetReadAccessPropertyReadResultBuilder
-	// WithArgArrayIndexArgument sets a parser argument
-	WithArgArrayIndexArgument(BACnetTagPayloadUnsignedInteger) BACnetReadAccessPropertyReadResultBuilder
 	// Build builds the BACnetReadAccessPropertyReadResult or returns an error if something is wrong
 	Build() (BACnetReadAccessPropertyReadResult, error)
 	// MustBuild does the same as Build but panics on error
@@ -172,19 +161,6 @@ func (b *_BACnetReadAccessPropertyReadResultBuilder) WithOptionalPropertyAccessE
 	return b
 }
 
-func (b *_BACnetReadAccessPropertyReadResultBuilder) WithArgObjectTypeArgument(objectTypeArgument BACnetObjectType) BACnetReadAccessPropertyReadResultBuilder {
-	b.ObjectTypeArgument = objectTypeArgument
-	return b
-}
-func (b *_BACnetReadAccessPropertyReadResultBuilder) WithArgPropertyIdentifierArgument(propertyIdentifierArgument BACnetPropertyIdentifier) BACnetReadAccessPropertyReadResultBuilder {
-	b.PropertyIdentifierArgument = propertyIdentifierArgument
-	return b
-}
-func (b *_BACnetReadAccessPropertyReadResultBuilder) WithArgArrayIndexArgument(arrayIndexArgument BACnetTagPayloadUnsignedInteger) BACnetReadAccessPropertyReadResultBuilder {
-	b.ArrayIndexArgument = arrayIndexArgument
-	return b
-}
-
 func (b *_BACnetReadAccessPropertyReadResultBuilder) Build() (BACnetReadAccessPropertyReadResult, error) {
 	if b.PeekedTagHeader == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'peekedTagHeader' not set"))
@@ -313,7 +289,7 @@ func BACnetReadAccessPropertyReadResultParseWithBufferProducer(objectTypeArgumen
 }
 
 func BACnetReadAccessPropertyReadResultParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, objectTypeArgument BACnetObjectType, propertyIdentifierArgument BACnetPropertyIdentifier, arrayIndexArgument BACnetTagPayloadUnsignedInteger) (BACnetReadAccessPropertyReadResult, error) {
-	v, err := (&_BACnetReadAccessPropertyReadResult{ObjectTypeArgument: objectTypeArgument, PropertyIdentifierArgument: propertyIdentifierArgument, ArrayIndexArgument: arrayIndexArgument}).parse(ctx, readBuffer, objectTypeArgument, propertyIdentifierArgument, arrayIndexArgument)
+	v, err := (new(_BACnetReadAccessPropertyReadResult)).parse(ctx, readBuffer, objectTypeArgument, propertyIdentifierArgument, arrayIndexArgument)
 	if err != nil {
 		return nil, err
 	}
@@ -420,22 +396,6 @@ func (m *_BACnetReadAccessPropertyReadResult) SerializeWithWriteBuffer(ctx conte
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetReadAccessPropertyReadResult) GetObjectTypeArgument() BACnetObjectType {
-	return m.ObjectTypeArgument
-}
-func (m *_BACnetReadAccessPropertyReadResult) GetPropertyIdentifierArgument() BACnetPropertyIdentifier {
-	return m.PropertyIdentifierArgument
-}
-func (m *_BACnetReadAccessPropertyReadResult) GetArrayIndexArgument() BACnetTagPayloadUnsignedInteger {
-	return m.ArrayIndexArgument
-}
-
-//
-////
-
 func (m *_BACnetReadAccessPropertyReadResult) IsBACnetReadAccessPropertyReadResult() {}
 
 func (m *_BACnetReadAccessPropertyReadResult) DeepCopy() any {
@@ -450,9 +410,6 @@ func (m *_BACnetReadAccessPropertyReadResult) deepCopy() *_BACnetReadAccessPrope
 		utils.DeepCopy[BACnetTagHeader](m.PeekedTagHeader),
 		utils.DeepCopy[BACnetConstructedData](m.PropertyValue),
 		utils.DeepCopy[ErrorEnclosed](m.PropertyAccessError),
-		m.ObjectTypeArgument,
-		m.PropertyIdentifierArgument,
-		m.ArrayIndexArgument,
 	}
 	return _BACnetReadAccessPropertyReadResultCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResult.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResult.go
index d26f08f3e3d..4321619699c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResult.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResult.go
@@ -238,7 +238,7 @@ func BACnetReadAccessResultParseWithBufferProducer() func(ctx context.Context, r
 }
 
 func BACnetReadAccessResultParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetReadAccessResult, error) {
-	v, err := (&_BACnetReadAccessResult{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetReadAccessResult)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResultListOfResults.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResultListOfResults.go
index 8e3b58e6e2e..7339cdb53ed 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResultListOfResults.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResultListOfResults.go
@@ -57,23 +57,19 @@ type _BACnetReadAccessResultListOfResults struct {
 	OpeningTag               BACnetOpeningTag
 	ListOfReadAccessProperty []BACnetReadAccessProperty
 	ClosingTag               BACnetClosingTag
-
-	// Arguments.
-	TagNumber          uint8
-	ObjectTypeArgument BACnetObjectType
 }
 
 var _ BACnetReadAccessResultListOfResults = (*_BACnetReadAccessResultListOfResults)(nil)
 
 // NewBACnetReadAccessResultListOfResults factory function for _BACnetReadAccessResultListOfResults
-func NewBACnetReadAccessResultListOfResults(openingTag BACnetOpeningTag, listOfReadAccessProperty []BACnetReadAccessProperty, closingTag BACnetClosingTag, tagNumber uint8, objectTypeArgument BACnetObjectType) *_BACnetReadAccessResultListOfResults {
+func NewBACnetReadAccessResultListOfResults(openingTag BACnetOpeningTag, listOfReadAccessProperty []BACnetReadAccessProperty, closingTag BACnetClosingTag) *_BACnetReadAccessResultListOfResults {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetReadAccessResultListOfResults must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetReadAccessResultListOfResults must not be nil")
 	}
-	return &_BACnetReadAccessResultListOfResults{OpeningTag: openingTag, ListOfReadAccessProperty: listOfReadAccessProperty, ClosingTag: closingTag, TagNumber: tagNumber, ObjectTypeArgument: objectTypeArgument}
+	return &_BACnetReadAccessResultListOfResults{OpeningTag: openingTag, ListOfReadAccessProperty: listOfReadAccessProperty, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -96,10 +92,6 @@ type BACnetReadAccessResultListOfResultsBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetReadAccessResultListOfResultsBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetReadAccessResultListOfResultsBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetReadAccessResultListOfResultsBuilder
-	// WithArgObjectTypeArgument sets a parser argument
-	WithArgObjectTypeArgument(BACnetObjectType) BACnetReadAccessResultListOfResultsBuilder
 	// Build builds the BACnetReadAccessResultListOfResults or returns an error if something is wrong
 	Build() (BACnetReadAccessResultListOfResults, error)
 	// MustBuild does the same as Build but panics on error
@@ -158,15 +150,6 @@ func (b *_BACnetReadAccessResultListOfResultsBuilder) WithClosingTagBuilder(buil
 	return b
 }
 
-func (b *_BACnetReadAccessResultListOfResultsBuilder) WithArgTagNumber(tagNumber uint8) BACnetReadAccessResultListOfResultsBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetReadAccessResultListOfResultsBuilder) WithArgObjectTypeArgument(objectTypeArgument BACnetObjectType) BACnetReadAccessResultListOfResultsBuilder {
-	b.ObjectTypeArgument = objectTypeArgument
-	return b
-}
-
 func (b *_BACnetReadAccessResultListOfResultsBuilder) Build() (BACnetReadAccessResultListOfResults, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -280,7 +263,7 @@ func BACnetReadAccessResultListOfResultsParseWithBufferProducer(tagNumber uint8,
 }
 
 func BACnetReadAccessResultListOfResultsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetReadAccessResultListOfResults, error) {
-	v, err := (&_BACnetReadAccessResultListOfResults{TagNumber: tagNumber, ObjectTypeArgument: objectTypeArgument}).parse(ctx, readBuffer, tagNumber, objectTypeArgument)
+	v, err := (new(_BACnetReadAccessResultListOfResults)).parse(ctx, readBuffer, tagNumber, objectTypeArgument)
 	if err != nil {
 		return nil, err
 	}
@@ -356,19 +339,6 @@ func (m *_BACnetReadAccessResultListOfResults) SerializeWithWriteBuffer(ctx cont
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetReadAccessResultListOfResults) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetReadAccessResultListOfResults) GetObjectTypeArgument() BACnetObjectType {
-	return m.ObjectTypeArgument
-}
-
-//
-////
-
 func (m *_BACnetReadAccessResultListOfResults) IsBACnetReadAccessResultListOfResults() {}
 
 func (m *_BACnetReadAccessResultListOfResults) DeepCopy() any {
@@ -383,8 +353,6 @@ func (m *_BACnetReadAccessResultListOfResults) deepCopy() *_BACnetReadAccessResu
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetReadAccessProperty, BACnetReadAccessProperty](m.ListOfReadAccessProperty),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
-		m.ObjectTypeArgument,
 	}
 	return _BACnetReadAccessResultListOfResultsCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessSpecification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessSpecification.go
index 8c09b6513a4..accd89ebda2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessSpecification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessSpecification.go
@@ -298,7 +298,7 @@ func BACnetReadAccessSpecificationParseWithBufferProducer() func(ctx context.Con
 }
 
 func BACnetReadAccessSpecificationParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetReadAccessSpecification, error) {
-	v, err := (&_BACnetReadAccessSpecification{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetReadAccessSpecification)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipient.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipient.go
index 799579cb198..bbbea6b3286 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipient.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipient.go
@@ -313,7 +313,7 @@ func BACnetRecipientParseWithBufferProducer[T BACnetRecipient]() func(ctx contex
 }
 
 func BACnetRecipientParseWithBuffer[T BACnetRecipient](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetRecipient{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetRecipient)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientEnclosed.go
index 9d70e8f1962..74d91d24b13 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetRecipientEnclosed struct {
 	OpeningTag BACnetOpeningTag
 	Recipient  BACnetRecipient
 	ClosingTag BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetRecipientEnclosed = (*_BACnetRecipientEnclosed)(nil)
 
 // NewBACnetRecipientEnclosed factory function for _BACnetRecipientEnclosed
-func NewBACnetRecipientEnclosed(openingTag BACnetOpeningTag, recipient BACnetRecipient, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetRecipientEnclosed {
+func NewBACnetRecipientEnclosed(openingTag BACnetOpeningTag, recipient BACnetRecipient, closingTag BACnetClosingTag) *_BACnetRecipientEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetRecipientEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetRecipientEnclosed(openingTag BACnetOpeningTag, recipient BACnetRec
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetRecipientEnclosed must not be nil")
 	}
-	return &_BACnetRecipientEnclosed{OpeningTag: openingTag, Recipient: recipient, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetRecipientEnclosed{OpeningTag: openingTag, Recipient: recipient, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetRecipientEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetRecipientEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetRecipientEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetRecipientEnclosedBuilder
 	// Build builds the BACnetRecipientEnclosed or returns an error if something is wrong
 	Build() (BACnetRecipientEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetRecipientEnclosedBuilder) WithClosingTagBuilder(builderSupplier
 	return b
 }
 
-func (b *_BACnetRecipientEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetRecipientEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetRecipientEnclosedBuilder) Build() (BACnetRecipientEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetRecipientEnclosedParseWithBufferProducer(tagNumber uint8) func(ctx co
 }
 
 func BACnetRecipientEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetRecipientEnclosed, error) {
-	v, err := (&_BACnetRecipientEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetRecipientEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetRecipientEnclosed) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetRecipientEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetRecipientEnclosed) IsBACnetRecipientEnclosed() {}
 
 func (m *_BACnetRecipientEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetRecipientEnclosed) deepCopy() *_BACnetRecipientEnclosed {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetRecipient](m.Recipient),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetRecipientEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcess.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcess.go
index 14546b46cd3..2f3887705b4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcess.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcess.go
@@ -238,7 +238,7 @@ func BACnetRecipientProcessParseWithBufferProducer() func(ctx context.Context, r
 }
 
 func BACnetRecipientProcessParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetRecipientProcess, error) {
-	v, err := (&_BACnetRecipientProcess{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetRecipientProcess)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcessEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcessEnclosed.go
index 78877d78b10..911163f15ca 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcessEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcessEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetRecipientProcessEnclosed struct {
 	OpeningTag       BACnetOpeningTag
 	RecipientProcess BACnetRecipientProcess
 	ClosingTag       BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetRecipientProcessEnclosed = (*_BACnetRecipientProcessEnclosed)(nil)
 
 // NewBACnetRecipientProcessEnclosed factory function for _BACnetRecipientProcessEnclosed
-func NewBACnetRecipientProcessEnclosed(openingTag BACnetOpeningTag, recipientProcess BACnetRecipientProcess, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetRecipientProcessEnclosed {
+func NewBACnetRecipientProcessEnclosed(openingTag BACnetOpeningTag, recipientProcess BACnetRecipientProcess, closingTag BACnetClosingTag) *_BACnetRecipientProcessEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetRecipientProcessEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetRecipientProcessEnclosed(openingTag BACnetOpeningTag, recipientPro
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetRecipientProcessEnclosed must not be nil")
 	}
-	return &_BACnetRecipientProcessEnclosed{OpeningTag: openingTag, RecipientProcess: recipientProcess, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetRecipientProcessEnclosed{OpeningTag: openingTag, RecipientProcess: recipientProcess, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetRecipientProcessEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetRecipientProcessEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetRecipientProcessEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetRecipientProcessEnclosedBuilder
 	// Build builds the BACnetRecipientProcessEnclosed or returns an error if something is wrong
 	Build() (BACnetRecipientProcessEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetRecipientProcessEnclosedBuilder) WithClosingTagBuilder(builderSu
 	return b
 }
 
-func (b *_BACnetRecipientProcessEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetRecipientProcessEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetRecipientProcessEnclosedBuilder) Build() (BACnetRecipientProcessEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetRecipientProcessEnclosedParseWithBufferProducer(tagNumber uint8) func
 }
 
 func BACnetRecipientProcessEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetRecipientProcessEnclosed, error) {
-	v, err := (&_BACnetRecipientProcessEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetRecipientProcessEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetRecipientProcessEnclosed) SerializeWithWriteBuffer(ctx context.C
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetRecipientProcessEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetRecipientProcessEnclosed) IsBACnetRecipientProcessEnclosed() {}
 
 func (m *_BACnetRecipientProcessEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetRecipientProcessEnclosed) deepCopy() *_BACnetRecipientProcessEnc
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetRecipientProcess](m.RecipientProcess),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetRecipientProcessEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReasonTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReasonTagged.go
index 51eb3351ef5..3261e28c12b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReasonTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReasonTagged.go
@@ -39,6 +39,8 @@ type BACnetRejectReasonTagged interface {
 	utils.LengthAware
 	utils.Serializable
 	utils.Copyable
+	// GetActualLength returns ActualLength (property field)
+	GetActualLength() uint32
 	// GetValue returns Value (property field)
 	GetValue() BACnetRejectReason
 	// GetProprietaryValue returns ProprietaryValue (property field)
@@ -53,18 +55,16 @@ type BACnetRejectReasonTagged interface {
 
 // _BACnetRejectReasonTagged is the data-structure of this message
 type _BACnetRejectReasonTagged struct {
+	ActualLength     uint32
 	Value            BACnetRejectReason
 	ProprietaryValue uint32
-
-	// Arguments.
-	ActualLength uint32
 }
 
 var _ BACnetRejectReasonTagged = (*_BACnetRejectReasonTagged)(nil)
 
 // NewBACnetRejectReasonTagged factory function for _BACnetRejectReasonTagged
-func NewBACnetRejectReasonTagged(value BACnetRejectReason, proprietaryValue uint32, actualLength uint32) *_BACnetRejectReasonTagged {
-	return &_BACnetRejectReasonTagged{Value: value, ProprietaryValue: proprietaryValue, ActualLength: actualLength}
+func NewBACnetRejectReasonTagged(actualLength uint32, value BACnetRejectReason, proprietaryValue uint32) *_BACnetRejectReasonTagged {
+	return &_BACnetRejectReasonTagged{ActualLength: actualLength, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -76,13 +76,13 @@ func NewBACnetRejectReasonTagged(value BACnetRejectReason, proprietaryValue uint
 type BACnetRejectReasonTaggedBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
-	WithMandatoryFields(value BACnetRejectReason, proprietaryValue uint32) BACnetRejectReasonTaggedBuilder
+	WithMandatoryFields(actualLength uint32, value BACnetRejectReason, proprietaryValue uint32) BACnetRejectReasonTaggedBuilder
+	// WithActualLength adds ActualLength (property field)
+	WithActualLength(uint32) BACnetRejectReasonTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetRejectReason) BACnetRejectReasonTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetRejectReasonTaggedBuilder
-	// WithArgActualLength sets a parser argument
-	WithArgActualLength(uint32) BACnetRejectReasonTaggedBuilder
 	// Build builds the BACnetRejectReasonTagged or returns an error if something is wrong
 	Build() (BACnetRejectReasonTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -102,8 +102,13 @@ type _BACnetRejectReasonTaggedBuilder struct {
 
 var _ (BACnetRejectReasonTaggedBuilder) = (*_BACnetRejectReasonTaggedBuilder)(nil)
 
-func (b *_BACnetRejectReasonTaggedBuilder) WithMandatoryFields(value BACnetRejectReason, proprietaryValue uint32) BACnetRejectReasonTaggedBuilder {
-	return b.WithValue(value).WithProprietaryValue(proprietaryValue)
+func (b *_BACnetRejectReasonTaggedBuilder) WithMandatoryFields(actualLength uint32, value BACnetRejectReason, proprietaryValue uint32) BACnetRejectReasonTaggedBuilder {
+	return b.WithActualLength(actualLength).WithValue(value).WithProprietaryValue(proprietaryValue)
+}
+
+func (b *_BACnetRejectReasonTaggedBuilder) WithActualLength(actualLength uint32) BACnetRejectReasonTaggedBuilder {
+	b.ActualLength = actualLength
+	return b
 }
 
 func (b *_BACnetRejectReasonTaggedBuilder) WithValue(value BACnetRejectReason) BACnetRejectReasonTaggedBuilder {
@@ -116,11 +121,6 @@ func (b *_BACnetRejectReasonTaggedBuilder) WithProprietaryValue(proprietaryValue
 	return b
 }
 
-func (b *_BACnetRejectReasonTaggedBuilder) WithArgActualLength(actualLength uint32) BACnetRejectReasonTaggedBuilder {
-	b.ActualLength = actualLength
-	return b
-}
-
 func (b *_BACnetRejectReasonTaggedBuilder) Build() (BACnetRejectReasonTagged, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -162,6 +162,10 @@ func (b *_BACnetRejectReasonTagged) CreateBACnetRejectReasonTaggedBuilder() BACn
 /////////////////////// Accessors for property fields.
 ///////////////////////
 
+func (m *_BACnetRejectReasonTagged) GetActualLength() uint32 {
+	return m.ActualLength
+}
+
 func (m *_BACnetRejectReasonTagged) GetValue() BACnetRejectReason {
 	return m.Value
 }
@@ -234,7 +238,7 @@ func BACnetRejectReasonTaggedParseWithBufferProducer(actualLength uint32) func(c
 }
 
 func BACnetRejectReasonTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, actualLength uint32) (BACnetRejectReasonTagged, error) {
-	v, err := (&_BACnetRejectReasonTagged{ActualLength: actualLength}).parse(ctx, readBuffer, actualLength)
+	v, err := (new(_BACnetRejectReasonTagged)).parse(ctx, readBuffer, actualLength)
 	if err != nil {
 		return nil, err
 	}
@@ -249,6 +253,7 @@ func (m *_BACnetRejectReasonTagged) parse(ctx context.Context, readBuffer utils.
 	}
 	currentPos := positionAware.GetPos()
 	_ = currentPos
+	m.ActualLength = actualLength
 
 	value, err := ReadManualField[BACnetRejectReason](ctx, "value", readBuffer, EnsureType[BACnetRejectReason](ReadEnumGeneric(ctx, readBuffer, actualLength, BACnetRejectReason_VENDOR_PROPRIETARY_VALUE)))
 	if err != nil {
@@ -314,16 +319,6 @@ func (m *_BACnetRejectReasonTagged) SerializeWithWriteBuffer(ctx context.Context
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetRejectReasonTagged) GetActualLength() uint32 {
-	return m.ActualLength
-}
-
-//
-////
-
 func (m *_BACnetRejectReasonTagged) IsBACnetRejectReasonTagged() {}
 
 func (m *_BACnetRejectReasonTagged) DeepCopy() any {
@@ -335,9 +330,9 @@ func (m *_BACnetRejectReasonTagged) deepCopy() *_BACnetRejectReasonTagged {
 		return nil
 	}
 	_BACnetRejectReasonTaggedCopy := &_BACnetRejectReasonTagged{
+		m.ActualLength,
 		m.Value,
 		m.ProprietaryValue,
-		m.ActualLength,
 	}
 	return _BACnetRejectReasonTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationshipTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationshipTagged.go
index e1fed069ad3..510e51672a1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationshipTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationshipTagged.go
@@ -59,20 +59,16 @@ type _BACnetRelationshipTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetRelationship
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetRelationshipTagged = (*_BACnetRelationshipTagged)(nil)
 
 // NewBACnetRelationshipTagged factory function for _BACnetRelationshipTagged
-func NewBACnetRelationshipTagged(header BACnetTagHeader, value BACnetRelationship, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetRelationshipTagged {
+func NewBACnetRelationshipTagged(header BACnetTagHeader, value BACnetRelationship, proprietaryValue uint32) *_BACnetRelationshipTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetRelationshipTagged must not be nil")
 	}
-	return &_BACnetRelationshipTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetRelationshipTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetRelationshipTaggedBuilder interface {
 	WithValue(BACnetRelationship) BACnetRelationshipTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetRelationshipTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetRelationshipTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetRelationshipTaggedBuilder
 	// Build builds the BACnetRelationshipTagged or returns an error if something is wrong
 	Build() (BACnetRelationshipTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetRelationshipTaggedBuilder) WithProprietaryValue(proprietaryValue
 	return b
 }
 
-func (b *_BACnetRelationshipTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetRelationshipTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetRelationshipTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetRelationshipTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetRelationshipTaggedBuilder) Build() (BACnetRelationshipTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetRelationshipTaggedParseWithBufferProducer(tagNumber uint8, tagClass T
 }
 
 func BACnetRelationshipTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetRelationshipTagged, error) {
-	v, err := (&_BACnetRelationshipTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetRelationshipTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetRelationshipTagged) SerializeWithWriteBuffer(ctx context.Context
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetRelationshipTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetRelationshipTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetRelationshipTagged) IsBACnetRelationshipTagged() {}
 
 func (m *_BACnetRelationshipTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetRelationshipTagged) deepCopy() *_BACnetRelationshipTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetRelationshipTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReliabilityTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReliabilityTagged.go
index 51d60dd901e..f31436e6b46 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReliabilityTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReliabilityTagged.go
@@ -59,20 +59,16 @@ type _BACnetReliabilityTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetReliability
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetReliabilityTagged = (*_BACnetReliabilityTagged)(nil)
 
 // NewBACnetReliabilityTagged factory function for _BACnetReliabilityTagged
-func NewBACnetReliabilityTagged(header BACnetTagHeader, value BACnetReliability, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetReliabilityTagged {
+func NewBACnetReliabilityTagged(header BACnetTagHeader, value BACnetReliability, proprietaryValue uint32) *_BACnetReliabilityTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetReliabilityTagged must not be nil")
 	}
-	return &_BACnetReliabilityTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetReliabilityTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetReliabilityTaggedBuilder interface {
 	WithValue(BACnetReliability) BACnetReliabilityTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetReliabilityTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetReliabilityTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetReliabilityTaggedBuilder
 	// Build builds the BACnetReliabilityTagged or returns an error if something is wrong
 	Build() (BACnetReliabilityTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetReliabilityTaggedBuilder) WithProprietaryValue(proprietaryValue
 	return b
 }
 
-func (b *_BACnetReliabilityTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetReliabilityTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetReliabilityTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetReliabilityTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetReliabilityTaggedBuilder) Build() (BACnetReliabilityTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetReliabilityTaggedParseWithBufferProducer(tagNumber uint8, tagClass Ta
 }
 
 func BACnetReliabilityTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetReliabilityTagged, error) {
-	v, err := (&_BACnetReliabilityTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetReliabilityTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetReliabilityTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetReliabilityTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetReliabilityTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetReliabilityTagged) IsBACnetReliabilityTagged() {}
 
 func (m *_BACnetReliabilityTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetReliabilityTagged) deepCopy() *_BACnetReliabilityTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetReliabilityTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReasonTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReasonTagged.go
index 069371993f7..65e9514a637 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReasonTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReasonTagged.go
@@ -59,20 +59,16 @@ type _BACnetRestartReasonTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetRestartReason
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetRestartReasonTagged = (*_BACnetRestartReasonTagged)(nil)
 
 // NewBACnetRestartReasonTagged factory function for _BACnetRestartReasonTagged
-func NewBACnetRestartReasonTagged(header BACnetTagHeader, value BACnetRestartReason, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetRestartReasonTagged {
+func NewBACnetRestartReasonTagged(header BACnetTagHeader, value BACnetRestartReason, proprietaryValue uint32) *_BACnetRestartReasonTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetRestartReasonTagged must not be nil")
 	}
-	return &_BACnetRestartReasonTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetRestartReasonTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetRestartReasonTaggedBuilder interface {
 	WithValue(BACnetRestartReason) BACnetRestartReasonTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetRestartReasonTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetRestartReasonTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetRestartReasonTaggedBuilder
 	// Build builds the BACnetRestartReasonTagged or returns an error if something is wrong
 	Build() (BACnetRestartReasonTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetRestartReasonTaggedBuilder) WithProprietaryValue(proprietaryValu
 	return b
 }
 
-func (b *_BACnetRestartReasonTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetRestartReasonTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetRestartReasonTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetRestartReasonTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetRestartReasonTaggedBuilder) Build() (BACnetRestartReasonTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetRestartReasonTaggedParseWithBufferProducer(tagNumber uint8, tagClass
 }
 
 func BACnetRestartReasonTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetRestartReasonTagged, error) {
-	v, err := (&_BACnetRestartReasonTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetRestartReasonTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetRestartReasonTagged) SerializeWithWriteBuffer(ctx context.Contex
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetRestartReasonTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetRestartReasonTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetRestartReasonTagged) IsBACnetRestartReasonTagged() {}
 
 func (m *_BACnetRestartReasonTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetRestartReasonTagged) deepCopy() *_BACnetRestartReasonTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetRestartReasonTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlagsTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlagsTagged.go
index c6925da3cc9..379477c3a82 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlagsTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlagsTagged.go
@@ -60,23 +60,19 @@ type BACnetResultFlagsTagged interface {
 type _BACnetResultFlagsTagged struct {
 	Header  BACnetTagHeader
 	Payload BACnetTagPayloadBitString
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetResultFlagsTagged = (*_BACnetResultFlagsTagged)(nil)
 
 // NewBACnetResultFlagsTagged factory function for _BACnetResultFlagsTagged
-func NewBACnetResultFlagsTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString, tagNumber uint8, tagClass TagClass) *_BACnetResultFlagsTagged {
+func NewBACnetResultFlagsTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString) *_BACnetResultFlagsTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetResultFlagsTagged must not be nil")
 	}
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadBitString for BACnetResultFlagsTagged must not be nil")
 	}
-	return &_BACnetResultFlagsTagged{Header: header, Payload: payload, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetResultFlagsTagged{Header: header, Payload: payload}
 }
 
 ///////////////////////////////////////////////////////////
@@ -97,10 +93,6 @@ type BACnetResultFlagsTaggedBuilder interface {
 	WithPayload(BACnetTagPayloadBitString) BACnetResultFlagsTaggedBuilder
 	// WithPayloadBuilder adds Payload (property field) which is build by the builder
 	WithPayloadBuilder(func(BACnetTagPayloadBitStringBuilder) BACnetTagPayloadBitStringBuilder) BACnetResultFlagsTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetResultFlagsTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetResultFlagsTaggedBuilder
 	// Build builds the BACnetResultFlagsTagged or returns an error if something is wrong
 	Build() (BACnetResultFlagsTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -154,15 +146,6 @@ func (b *_BACnetResultFlagsTaggedBuilder) WithPayloadBuilder(builderSupplier fun
 	return b
 }
 
-func (b *_BACnetResultFlagsTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetResultFlagsTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetResultFlagsTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetResultFlagsTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetResultFlagsTaggedBuilder) Build() (BACnetResultFlagsTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -298,7 +281,7 @@ func BACnetResultFlagsTaggedParseWithBufferProducer(tagNumber uint8, tagClass Ta
 }
 
 func BACnetResultFlagsTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetResultFlagsTagged, error) {
-	v, err := (&_BACnetResultFlagsTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetResultFlagsTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -410,19 +393,6 @@ func (m *_BACnetResultFlagsTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetResultFlagsTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetResultFlagsTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetResultFlagsTagged) IsBACnetResultFlagsTagged() {}
 
 func (m *_BACnetResultFlagsTagged) DeepCopy() any {
@@ -436,8 +406,6 @@ func (m *_BACnetResultFlagsTagged) deepCopy() *_BACnetResultFlagsTagged {
 	_BACnetResultFlagsTaggedCopy := &_BACnetResultFlagsTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		utils.DeepCopy[BACnetTagPayloadBitString](m.Payload),
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetResultFlagsTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntry.go
index f9939e4eea1..05a2880f829 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntry.go
@@ -308,7 +308,7 @@ func BACnetRouterEntryParseWithBufferProducer() func(ctx context.Context, readBu
 }
 
 func BACnetRouterEntryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetRouterEntry, error) {
-	v, err := (&_BACnetRouterEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetRouterEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatusTagged.go
index 239d3286d1d..32ceec2ba9f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatusTagged.go
@@ -54,20 +54,16 @@ type BACnetRouterEntryStatusTagged interface {
 type _BACnetRouterEntryStatusTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetRouterEntryStatus
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetRouterEntryStatusTagged = (*_BACnetRouterEntryStatusTagged)(nil)
 
 // NewBACnetRouterEntryStatusTagged factory function for _BACnetRouterEntryStatusTagged
-func NewBACnetRouterEntryStatusTagged(header BACnetTagHeader, value BACnetRouterEntryStatus, tagNumber uint8, tagClass TagClass) *_BACnetRouterEntryStatusTagged {
+func NewBACnetRouterEntryStatusTagged(header BACnetTagHeader, value BACnetRouterEntryStatus) *_BACnetRouterEntryStatusTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetRouterEntryStatusTagged must not be nil")
 	}
-	return &_BACnetRouterEntryStatusTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetRouterEntryStatusTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetRouterEntryStatusTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetRouterEntryStatusTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetRouterEntryStatus) BACnetRouterEntryStatusTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetRouterEntryStatusTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetRouterEntryStatusTaggedBuilder
 	// Build builds the BACnetRouterEntryStatusTagged or returns an error if something is wrong
 	Build() (BACnetRouterEntryStatusTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetRouterEntryStatusTaggedBuilder) WithValue(value BACnetRouterEntr
 	return b
 }
 
-func (b *_BACnetRouterEntryStatusTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetRouterEntryStatusTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetRouterEntryStatusTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetRouterEntryStatusTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetRouterEntryStatusTaggedBuilder) Build() (BACnetRouterEntryStatusTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetRouterEntryStatusTaggedParseWithBufferProducer(tagNumber uint8, tagCl
 }
 
 func BACnetRouterEntryStatusTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetRouterEntryStatusTagged, error) {
-	v, err := (&_BACnetRouterEntryStatusTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetRouterEntryStatusTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetRouterEntryStatusTagged) SerializeWithWriteBuffer(ctx context.Co
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetRouterEntryStatusTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetRouterEntryStatusTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetRouterEntryStatusTagged) IsBACnetRouterEntryStatusTagged() {}
 
 func (m *_BACnetRouterEntryStatusTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetRouterEntryStatusTagged) deepCopy() *_BACnetRouterEntryStatusTag
 	_BACnetRouterEntryStatusTaggedCopy := &_BACnetRouterEntryStatusTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetRouterEntryStatusTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetScale.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetScale.go
index a536dd42a56..72afd8099ef 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetScale.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetScale.go
@@ -313,7 +313,7 @@ func BACnetScaleParseWithBufferProducer[T BACnetScale]() func(ctx context.Contex
 }
 
 func BACnetScaleParseWithBuffer[T BACnetScale](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetScale{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetScale)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySet.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySet.go
index 99066f75a78..7920bbf6e26 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySet.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySet.go
@@ -312,7 +312,7 @@ func BACnetSecurityKeySetParseWithBufferProducer() func(ctx context.Context, rea
 }
 
 func BACnetSecurityKeySetParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetSecurityKeySet, error) {
-	v, err := (&_BACnetSecurityKeySet{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetSecurityKeySet)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySetKeyIds.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySetKeyIds.go
index b9f1b98e032..1a9417635aa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySetKeyIds.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySetKeyIds.go
@@ -57,22 +57,19 @@ type _BACnetSecurityKeySetKeyIds struct {
 	OpeningTag BACnetOpeningTag
 	KeyIds     []BACnetKeyIdentifier
 	ClosingTag BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetSecurityKeySetKeyIds = (*_BACnetSecurityKeySetKeyIds)(nil)
 
 // NewBACnetSecurityKeySetKeyIds factory function for _BACnetSecurityKeySetKeyIds
-func NewBACnetSecurityKeySetKeyIds(openingTag BACnetOpeningTag, keyIds []BACnetKeyIdentifier, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetSecurityKeySetKeyIds {
+func NewBACnetSecurityKeySetKeyIds(openingTag BACnetOpeningTag, keyIds []BACnetKeyIdentifier, closingTag BACnetClosingTag) *_BACnetSecurityKeySetKeyIds {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetSecurityKeySetKeyIds must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetSecurityKeySetKeyIds must not be nil")
 	}
-	return &_BACnetSecurityKeySetKeyIds{OpeningTag: openingTag, KeyIds: keyIds, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetSecurityKeySetKeyIds{OpeningTag: openingTag, KeyIds: keyIds, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetSecurityKeySetKeyIdsBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetSecurityKeySetKeyIdsBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetSecurityKeySetKeyIdsBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetSecurityKeySetKeyIdsBuilder
 	// Build builds the BACnetSecurityKeySetKeyIds or returns an error if something is wrong
 	Build() (BACnetSecurityKeySetKeyIds, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetSecurityKeySetKeyIdsBuilder) WithClosingTagBuilder(builderSuppli
 	return b
 }
 
-func (b *_BACnetSecurityKeySetKeyIdsBuilder) WithArgTagNumber(tagNumber uint8) BACnetSecurityKeySetKeyIdsBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetSecurityKeySetKeyIdsBuilder) Build() (BACnetSecurityKeySetKeyIds, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetSecurityKeySetKeyIdsParseWithBufferProducer(tagNumber uint8) func(ctx
 }
 
 func BACnetSecurityKeySetKeyIdsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetSecurityKeySetKeyIds, error) {
-	v, err := (&_BACnetSecurityKeySetKeyIds{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetSecurityKeySetKeyIds)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetSecurityKeySetKeyIds) SerializeWithWriteBuffer(ctx context.Conte
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetSecurityKeySetKeyIds) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetSecurityKeySetKeyIds) IsBACnetSecurityKeySetKeyIds() {}
 
 func (m *_BACnetSecurityKeySetKeyIds) DeepCopy() any {
@@ -373,7 +353,6 @@ func (m *_BACnetSecurityKeySetKeyIds) deepCopy() *_BACnetSecurityKeySetKeyIds {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetKeyIdentifier, BACnetKeyIdentifier](m.KeyIds),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetSecurityKeySetKeyIdsCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevelTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevelTagged.go
index f597b7512c3..566f635f70d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevelTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevelTagged.go
@@ -54,20 +54,16 @@ type BACnetSecurityLevelTagged interface {
 type _BACnetSecurityLevelTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetSecurityLevel
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetSecurityLevelTagged = (*_BACnetSecurityLevelTagged)(nil)
 
 // NewBACnetSecurityLevelTagged factory function for _BACnetSecurityLevelTagged
-func NewBACnetSecurityLevelTagged(header BACnetTagHeader, value BACnetSecurityLevel, tagNumber uint8, tagClass TagClass) *_BACnetSecurityLevelTagged {
+func NewBACnetSecurityLevelTagged(header BACnetTagHeader, value BACnetSecurityLevel) *_BACnetSecurityLevelTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetSecurityLevelTagged must not be nil")
 	}
-	return &_BACnetSecurityLevelTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetSecurityLevelTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetSecurityLevelTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetSecurityLevelTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetSecurityLevel) BACnetSecurityLevelTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetSecurityLevelTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetSecurityLevelTaggedBuilder
 	// Build builds the BACnetSecurityLevelTagged or returns an error if something is wrong
 	Build() (BACnetSecurityLevelTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetSecurityLevelTaggedBuilder) WithValue(value BACnetSecurityLevel)
 	return b
 }
 
-func (b *_BACnetSecurityLevelTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetSecurityLevelTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetSecurityLevelTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetSecurityLevelTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetSecurityLevelTaggedBuilder) Build() (BACnetSecurityLevelTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetSecurityLevelTaggedParseWithBufferProducer(tagNumber uint8, tagClass
 }
 
 func BACnetSecurityLevelTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetSecurityLevelTagged, error) {
-	v, err := (&_BACnetSecurityLevelTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetSecurityLevelTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetSecurityLevelTagged) SerializeWithWriteBuffer(ctx context.Contex
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetSecurityLevelTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetSecurityLevelTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetSecurityLevelTagged) IsBACnetSecurityLevelTagged() {}
 
 func (m *_BACnetSecurityLevelTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetSecurityLevelTagged) deepCopy() *_BACnetSecurityLevelTagged {
 	_BACnetSecurityLevelTaggedCopy := &_BACnetSecurityLevelTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetSecurityLevelTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicyTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicyTagged.go
index 8f5fdd1f967..67c773abe21 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicyTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicyTagged.go
@@ -54,20 +54,16 @@ type BACnetSecurityPolicyTagged interface {
 type _BACnetSecurityPolicyTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetSecurityPolicy
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetSecurityPolicyTagged = (*_BACnetSecurityPolicyTagged)(nil)
 
 // NewBACnetSecurityPolicyTagged factory function for _BACnetSecurityPolicyTagged
-func NewBACnetSecurityPolicyTagged(header BACnetTagHeader, value BACnetSecurityPolicy, tagNumber uint8, tagClass TagClass) *_BACnetSecurityPolicyTagged {
+func NewBACnetSecurityPolicyTagged(header BACnetTagHeader, value BACnetSecurityPolicy) *_BACnetSecurityPolicyTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetSecurityPolicyTagged must not be nil")
 	}
-	return &_BACnetSecurityPolicyTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetSecurityPolicyTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetSecurityPolicyTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetSecurityPolicyTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetSecurityPolicy) BACnetSecurityPolicyTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetSecurityPolicyTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetSecurityPolicyTaggedBuilder
 	// Build builds the BACnetSecurityPolicyTagged or returns an error if something is wrong
 	Build() (BACnetSecurityPolicyTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetSecurityPolicyTaggedBuilder) WithValue(value BACnetSecurityPolic
 	return b
 }
 
-func (b *_BACnetSecurityPolicyTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetSecurityPolicyTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetSecurityPolicyTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetSecurityPolicyTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetSecurityPolicyTaggedBuilder) Build() (BACnetSecurityPolicyTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetSecurityPolicyTaggedParseWithBufferProducer(tagNumber uint8, tagClass
 }
 
 func BACnetSecurityPolicyTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetSecurityPolicyTagged, error) {
-	v, err := (&_BACnetSecurityPolicyTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetSecurityPolicyTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetSecurityPolicyTagged) SerializeWithWriteBuffer(ctx context.Conte
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetSecurityPolicyTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetSecurityPolicyTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetSecurityPolicyTagged) IsBACnetSecurityPolicyTagged() {}
 
 func (m *_BACnetSecurityPolicyTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetSecurityPolicyTagged) deepCopy() *_BACnetSecurityPolicyTagged {
 	_BACnetSecurityPolicyTaggedCopy := &_BACnetSecurityPolicyTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetSecurityPolicyTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentationTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentationTagged.go
index 3a7ee8c9f16..4ac20dbf4d3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentationTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentationTagged.go
@@ -54,20 +54,16 @@ type BACnetSegmentationTagged interface {
 type _BACnetSegmentationTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetSegmentation
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetSegmentationTagged = (*_BACnetSegmentationTagged)(nil)
 
 // NewBACnetSegmentationTagged factory function for _BACnetSegmentationTagged
-func NewBACnetSegmentationTagged(header BACnetTagHeader, value BACnetSegmentation, tagNumber uint8, tagClass TagClass) *_BACnetSegmentationTagged {
+func NewBACnetSegmentationTagged(header BACnetTagHeader, value BACnetSegmentation) *_BACnetSegmentationTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetSegmentationTagged must not be nil")
 	}
-	return &_BACnetSegmentationTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetSegmentationTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetSegmentationTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetSegmentationTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetSegmentation) BACnetSegmentationTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetSegmentationTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetSegmentationTaggedBuilder
 	// Build builds the BACnetSegmentationTagged or returns an error if something is wrong
 	Build() (BACnetSegmentationTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetSegmentationTaggedBuilder) WithValue(value BACnetSegmentation) B
 	return b
 }
 
-func (b *_BACnetSegmentationTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetSegmentationTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetSegmentationTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetSegmentationTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetSegmentationTaggedBuilder) Build() (BACnetSegmentationTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetSegmentationTaggedParseWithBufferProducer(tagNumber uint8, tagClass T
 }
 
 func BACnetSegmentationTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetSegmentationTagged, error) {
-	v, err := (&_BACnetSegmentationTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetSegmentationTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetSegmentationTagged) SerializeWithWriteBuffer(ctx context.Context
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetSegmentationTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetSegmentationTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetSegmentationTagged) IsBACnetSegmentationTagged() {}
 
 func (m *_BACnetSegmentationTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetSegmentationTagged) deepCopy() *_BACnetSegmentationTagged {
 	_BACnetSegmentationTaggedCopy := &_BACnetSegmentationTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetSegmentationTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAck.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAck.go
index 91c9117576e..96b8927f69e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAck.go
@@ -50,10 +50,10 @@ type BACnetServiceAck interface {
 
 // BACnetServiceAckContract provides a set of functions which can be overwritten by a sub struct
 type BACnetServiceAckContract interface {
+	// GetServiceAckLength returns ServiceAckLength (property field)
+	GetServiceAckLength() uint32
 	// GetServiceAckPayloadLength returns ServiceAckPayloadLength (virtual field)
 	GetServiceAckPayloadLength() uint32
-	// GetServiceAckLength() returns a parser argument
-	GetServiceAckLength() uint32
 	// IsBACnetServiceAck is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetServiceAck()
 	// CreateBuilder creates a BACnetServiceAckBuilder
@@ -74,8 +74,6 @@ type _BACnetServiceAck struct {
 		BACnetServiceAckContract
 		BACnetServiceAckRequirements
 	}
-
-	// Arguments.
 	ServiceAckLength uint32
 }
 
@@ -95,9 +93,9 @@ func NewBACnetServiceAck(serviceAckLength uint32) *_BACnetServiceAck {
 type BACnetServiceAckBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
-	WithMandatoryFields() BACnetServiceAckBuilder
-	// WithArgServiceAckLength sets a parser argument
-	WithArgServiceAckLength(uint32) BACnetServiceAckBuilder
+	WithMandatoryFields(serviceAckLength uint32) BACnetServiceAckBuilder
+	// WithServiceAckLength adds ServiceAckLength (property field)
+	WithServiceAckLength(uint32) BACnetServiceAckBuilder
 	// AsBACnetServiceAckGetAlarmSummary converts this build to a subType of BACnetServiceAck. It is always possible to return to current builder using Done()
 	AsBACnetServiceAckGetAlarmSummary() BACnetServiceAckGetAlarmSummaryBuilder
 	// AsBACnetServiceAckGetEnrollmentSummary converts this build to a subType of BACnetServiceAck. It is always possible to return to current builder using Done()
@@ -159,11 +157,11 @@ type _BACnetServiceAckBuilder struct {
 
 var _ (BACnetServiceAckBuilder) = (*_BACnetServiceAckBuilder)(nil)
 
-func (b *_BACnetServiceAckBuilder) WithMandatoryFields() BACnetServiceAckBuilder {
-	return b
+func (b *_BACnetServiceAckBuilder) WithMandatoryFields(serviceAckLength uint32) BACnetServiceAckBuilder {
+	return b.WithServiceAckLength(serviceAckLength)
 }
 
-func (b *_BACnetServiceAckBuilder) WithArgServiceAckLength(serviceAckLength uint32) BACnetServiceAckBuilder {
+func (b *_BACnetServiceAckBuilder) WithServiceAckLength(serviceAckLength uint32) BACnetServiceAckBuilder {
 	b.ServiceAckLength = serviceAckLength
 	return b
 }
@@ -376,6 +374,19 @@ func (b *_BACnetServiceAck) CreateBACnetServiceAckBuilder() BACnetServiceAckBuil
 ///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 
+///////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////
+/////////////////////// Accessors for property fields.
+///////////////////////
+
+func (m *_BACnetServiceAck) GetServiceAckLength() uint32 {
+	return m.ServiceAckLength
+}
+
+///////////////////////
+///////////////////////
+///////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 /////////////////////// Accessors for virtual fields.
@@ -442,7 +453,7 @@ func BACnetServiceAckParseWithBufferProducer[T BACnetServiceAck](serviceAckLengt
 }
 
 func BACnetServiceAckParseWithBuffer[T BACnetServiceAck](ctx context.Context, readBuffer utils.ReadBuffer, serviceAckLength uint32) (T, error) {
-	v, err := (&_BACnetServiceAck{ServiceAckLength: serviceAckLength}).parse(ctx, readBuffer, serviceAckLength)
+	v, err := (new(_BACnetServiceAck)).parse(ctx, readBuffer, serviceAckLength)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -463,6 +474,7 @@ func (m *_BACnetServiceAck) parse(ctx context.Context, readBuffer utils.ReadBuff
 	}
 	currentPos := positionAware.GetPos()
 	_ = currentPos
+	m.ServiceAckLength = serviceAckLength
 
 	serviceChoice, err := ReadDiscriminatorEnumField[BACnetConfirmedServiceChoice](ctx, "serviceChoice", "BACnetConfirmedServiceChoice", ReadEnum(BACnetConfirmedServiceChoiceByValue, ReadUnsignedByte(readBuffer, uint8(8))))
 	if err != nil {
@@ -582,16 +594,6 @@ func (pm *_BACnetServiceAck) serializeParent(ctx context.Context, writeBuffer ut
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetServiceAck) GetServiceAckLength() uint32 {
-	return m.ServiceAckLength
-}
-
-//
-////
-
 func (m *_BACnetServiceAck) IsBACnetServiceAck() {}
 
 func (m *_BACnetServiceAck) DeepCopy() any {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go
index 504b4df12e1..eed12fe3664 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go
@@ -62,7 +62,7 @@ var _ BACnetServiceAckAtomicReadFile = (*_BACnetServiceAckAtomicReadFile)(nil)
 var _ BACnetServiceAckRequirements = (*_BACnetServiceAckAtomicReadFile)(nil)
 
 // NewBACnetServiceAckAtomicReadFile factory function for _BACnetServiceAckAtomicReadFile
-func NewBACnetServiceAckAtomicReadFile(endOfFile BACnetApplicationTagBoolean, accessMethod BACnetServiceAckAtomicReadFileStreamOrRecord, serviceAckLength uint32) *_BACnetServiceAckAtomicReadFile {
+func NewBACnetServiceAckAtomicReadFile(serviceAckLength uint32, endOfFile BACnetApplicationTagBoolean, accessMethod BACnetServiceAckAtomicReadFileStreamOrRecord) *_BACnetServiceAckAtomicReadFile {
 	if endOfFile == nil {
 		panic("endOfFile of type BACnetApplicationTagBoolean for BACnetServiceAckAtomicReadFile must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go
index 97cc6066ee1..71366ea8467 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go
@@ -383,7 +383,7 @@ func BACnetServiceAckAtomicReadFileStreamOrRecordParseWithBufferProducer[T BACne
 }
 
 func BACnetServiceAckAtomicReadFileStreamOrRecordParseWithBuffer[T BACnetServiceAckAtomicReadFileStreamOrRecord](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetServiceAckAtomicReadFileStreamOrRecord{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetServiceAckAtomicReadFileStreamOrRecord)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
index 6339ba1e56a..4ea746203bc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
@@ -59,7 +59,7 @@ var _ BACnetServiceAckAtomicWriteFile = (*_BACnetServiceAckAtomicWriteFile)(nil)
 var _ BACnetServiceAckRequirements = (*_BACnetServiceAckAtomicWriteFile)(nil)
 
 // NewBACnetServiceAckAtomicWriteFile factory function for _BACnetServiceAckAtomicWriteFile
-func NewBACnetServiceAckAtomicWriteFile(fileStartPosition BACnetContextTagSignedInteger, serviceAckLength uint32) *_BACnetServiceAckAtomicWriteFile {
+func NewBACnetServiceAckAtomicWriteFile(serviceAckLength uint32, fileStartPosition BACnetContextTagSignedInteger) *_BACnetServiceAckAtomicWriteFile {
 	if fileStartPosition == nil {
 		panic("fileStartPosition of type BACnetContextTagSignedInteger for BACnetServiceAckAtomicWriteFile must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAuthenticate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAuthenticate.go
index 511ddfb578f..2dac6f92233 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAuthenticate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAuthenticate.go
@@ -53,16 +53,13 @@ type BACnetServiceAckAuthenticate interface {
 type _BACnetServiceAckAuthenticate struct {
 	BACnetServiceAckContract
 	BytesOfRemovedService []byte
-
-	// Arguments.
-	ServiceAckPayloadLength uint32
 }
 
 var _ BACnetServiceAckAuthenticate = (*_BACnetServiceAckAuthenticate)(nil)
 var _ BACnetServiceAckRequirements = (*_BACnetServiceAckAuthenticate)(nil)
 
 // NewBACnetServiceAckAuthenticate factory function for _BACnetServiceAckAuthenticate
-func NewBACnetServiceAckAuthenticate(bytesOfRemovedService []byte, serviceAckPayloadLength uint32, serviceAckLength uint32) *_BACnetServiceAckAuthenticate {
+func NewBACnetServiceAckAuthenticate(serviceAckLength uint32, bytesOfRemovedService []byte) *_BACnetServiceAckAuthenticate {
 	_result := &_BACnetServiceAckAuthenticate{
 		BACnetServiceAckContract: NewBACnetServiceAck(serviceAckLength),
 		BytesOfRemovedService:    bytesOfRemovedService,
@@ -83,8 +80,6 @@ type BACnetServiceAckAuthenticateBuilder interface {
 	WithMandatoryFields(bytesOfRemovedService []byte) BACnetServiceAckAuthenticateBuilder
 	// WithBytesOfRemovedService adds BytesOfRemovedService (property field)
 	WithBytesOfRemovedService(...byte) BACnetServiceAckAuthenticateBuilder
-	// WithArgServiceAckPayloadLength sets a parser argument
-	WithArgServiceAckPayloadLength(uint32) BACnetServiceAckAuthenticateBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BACnetServiceAckBuilder
 	// Build builds the BACnetServiceAckAuthenticate or returns an error if something is wrong
@@ -122,11 +117,6 @@ func (b *_BACnetServiceAckAuthenticateBuilder) WithBytesOfRemovedService(bytesOf
 	return b
 }
 
-func (b *_BACnetServiceAckAuthenticateBuilder) WithArgServiceAckPayloadLength(serviceAckPayloadLength uint32) BACnetServiceAckAuthenticateBuilder {
-	b.ServiceAckPayloadLength = serviceAckPayloadLength
-	return b
-}
-
 func (b *_BACnetServiceAckAuthenticateBuilder) Build() (BACnetServiceAckAuthenticate, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -290,16 +280,6 @@ func (m *_BACnetServiceAckAuthenticate) SerializeWithWriteBuffer(ctx context.Con
 	return m.BACnetServiceAckContract.(*_BACnetServiceAck).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetServiceAckAuthenticate) GetServiceAckPayloadLength() uint32 {
-	return m.ServiceAckPayloadLength
-}
-
-//
-////
-
 func (m *_BACnetServiceAckAuthenticate) IsBACnetServiceAckAuthenticate() {}
 
 func (m *_BACnetServiceAckAuthenticate) DeepCopy() any {
@@ -313,7 +293,6 @@ func (m *_BACnetServiceAckAuthenticate) deepCopy() *_BACnetServiceAckAuthenticat
 	_BACnetServiceAckAuthenticateCopy := &_BACnetServiceAckAuthenticate{
 		m.BACnetServiceAckContract.(*_BACnetServiceAck).deepCopy(),
 		utils.DeepCopySlice[byte, byte](m.BytesOfRemovedService),
-		m.ServiceAckPayloadLength,
 	}
 	_BACnetServiceAckAuthenticateCopy.BACnetServiceAckContract.(*_BACnetServiceAck)._SubType = m
 	return _BACnetServiceAckAuthenticateCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go
index d9dea9bb7aa..467b41439e8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go
@@ -65,7 +65,7 @@ var _ BACnetServiceAckConfirmedPrivateTransfer = (*_BACnetServiceAckConfirmedPri
 var _ BACnetServiceAckRequirements = (*_BACnetServiceAckConfirmedPrivateTransfer)(nil)
 
 // NewBACnetServiceAckConfirmedPrivateTransfer factory function for _BACnetServiceAckConfirmedPrivateTransfer
-func NewBACnetServiceAckConfirmedPrivateTransfer(vendorId BACnetVendorIdTagged, serviceNumber BACnetContextTagUnsignedInteger, resultBlock BACnetConstructedData, serviceAckLength uint32) *_BACnetServiceAckConfirmedPrivateTransfer {
+func NewBACnetServiceAckConfirmedPrivateTransfer(serviceAckLength uint32, vendorId BACnetVendorIdTagged, serviceNumber BACnetContextTagUnsignedInteger, resultBlock BACnetConstructedData) *_BACnetServiceAckConfirmedPrivateTransfer {
 	if vendorId == nil {
 		panic("vendorId of type BACnetVendorIdTagged for BACnetServiceAckConfirmedPrivateTransfer must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go
index 22f53bc7789..e1effd054ec 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go
@@ -59,7 +59,7 @@ var _ BACnetServiceAckCreateObject = (*_BACnetServiceAckCreateObject)(nil)
 var _ BACnetServiceAckRequirements = (*_BACnetServiceAckCreateObject)(nil)
 
 // NewBACnetServiceAckCreateObject factory function for _BACnetServiceAckCreateObject
-func NewBACnetServiceAckCreateObject(objectIdentifier BACnetApplicationTagObjectIdentifier, serviceAckLength uint32) *_BACnetServiceAckCreateObject {
+func NewBACnetServiceAckCreateObject(serviceAckLength uint32, objectIdentifier BACnetApplicationTagObjectIdentifier) *_BACnetServiceAckCreateObject {
 	if objectIdentifier == nil {
 		panic("objectIdentifier of type BACnetApplicationTagObjectIdentifier for BACnetServiceAckCreateObject must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go
index 86e2d0084df..00449e25ce3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go
@@ -65,7 +65,7 @@ var _ BACnetServiceAckGetAlarmSummary = (*_BACnetServiceAckGetAlarmSummary)(nil)
 var _ BACnetServiceAckRequirements = (*_BACnetServiceAckGetAlarmSummary)(nil)
 
 // NewBACnetServiceAckGetAlarmSummary factory function for _BACnetServiceAckGetAlarmSummary
-func NewBACnetServiceAckGetAlarmSummary(objectIdentifier BACnetApplicationTagObjectIdentifier, eventState BACnetEventStateTagged, acknowledgedTransitions BACnetEventTransitionBitsTagged, serviceAckLength uint32) *_BACnetServiceAckGetAlarmSummary {
+func NewBACnetServiceAckGetAlarmSummary(serviceAckLength uint32, objectIdentifier BACnetApplicationTagObjectIdentifier, eventState BACnetEventStateTagged, acknowledgedTransitions BACnetEventTransitionBitsTagged) *_BACnetServiceAckGetAlarmSummary {
 	if objectIdentifier == nil {
 		panic("objectIdentifier of type BACnetApplicationTagObjectIdentifier for BACnetServiceAckGetAlarmSummary must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go
index 6ddac6fb358..eb4cff92994 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go
@@ -71,7 +71,7 @@ var _ BACnetServiceAckGetEnrollmentSummary = (*_BACnetServiceAckGetEnrollmentSum
 var _ BACnetServiceAckRequirements = (*_BACnetServiceAckGetEnrollmentSummary)(nil)
 
 // NewBACnetServiceAckGetEnrollmentSummary factory function for _BACnetServiceAckGetEnrollmentSummary
-func NewBACnetServiceAckGetEnrollmentSummary(objectIdentifier BACnetApplicationTagObjectIdentifier, eventType BACnetEventTypeTagged, eventState BACnetEventStateTagged, priority BACnetApplicationTagUnsignedInteger, notificationClass BACnetApplicationTagUnsignedInteger, serviceAckLength uint32) *_BACnetServiceAckGetEnrollmentSummary {
+func NewBACnetServiceAckGetEnrollmentSummary(serviceAckLength uint32, objectIdentifier BACnetApplicationTagObjectIdentifier, eventType BACnetEventTypeTagged, eventState BACnetEventStateTagged, priority BACnetApplicationTagUnsignedInteger, notificationClass BACnetApplicationTagUnsignedInteger) *_BACnetServiceAckGetEnrollmentSummary {
 	if objectIdentifier == nil {
 		panic("objectIdentifier of type BACnetApplicationTagObjectIdentifier for BACnetServiceAckGetEnrollmentSummary must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go
index a69ec00a949..300d94eb117 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go
@@ -62,7 +62,7 @@ var _ BACnetServiceAckGetEventInformation = (*_BACnetServiceAckGetEventInformati
 var _ BACnetServiceAckRequirements = (*_BACnetServiceAckGetEventInformation)(nil)
 
 // NewBACnetServiceAckGetEventInformation factory function for _BACnetServiceAckGetEventInformation
-func NewBACnetServiceAckGetEventInformation(listOfEventSummaries BACnetEventSummariesList, moreEvents BACnetContextTagBoolean, serviceAckLength uint32) *_BACnetServiceAckGetEventInformation {
+func NewBACnetServiceAckGetEventInformation(serviceAckLength uint32, listOfEventSummaries BACnetEventSummariesList, moreEvents BACnetContextTagBoolean) *_BACnetServiceAckGetEventInformation {
 	if listOfEventSummaries == nil {
 		panic("listOfEventSummaries of type BACnetEventSummariesList for BACnetServiceAckGetEventInformation must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
index bb8369bed22..16ab3bc264f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
@@ -68,7 +68,7 @@ var _ BACnetServiceAckReadProperty = (*_BACnetServiceAckReadProperty)(nil)
 var _ BACnetServiceAckRequirements = (*_BACnetServiceAckReadProperty)(nil)
 
 // NewBACnetServiceAckReadProperty factory function for _BACnetServiceAckReadProperty
-func NewBACnetServiceAckReadProperty(objectIdentifier BACnetContextTagObjectIdentifier, propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger, values BACnetConstructedData, serviceAckLength uint32) *_BACnetServiceAckReadProperty {
+func NewBACnetServiceAckReadProperty(serviceAckLength uint32, objectIdentifier BACnetContextTagObjectIdentifier, propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger, values BACnetConstructedData) *_BACnetServiceAckReadProperty {
 	if objectIdentifier == nil {
 		panic("objectIdentifier of type BACnetContextTagObjectIdentifier for BACnetServiceAckReadProperty must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyConditional.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyConditional.go
index 438dc653f91..0df7dd8bb4c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyConditional.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyConditional.go
@@ -53,16 +53,13 @@ type BACnetServiceAckReadPropertyConditional interface {
 type _BACnetServiceAckReadPropertyConditional struct {
 	BACnetServiceAckContract
 	BytesOfRemovedService []byte
-
-	// Arguments.
-	ServiceAckPayloadLength uint32
 }
 
 var _ BACnetServiceAckReadPropertyConditional = (*_BACnetServiceAckReadPropertyConditional)(nil)
 var _ BACnetServiceAckRequirements = (*_BACnetServiceAckReadPropertyConditional)(nil)
 
 // NewBACnetServiceAckReadPropertyConditional factory function for _BACnetServiceAckReadPropertyConditional
-func NewBACnetServiceAckReadPropertyConditional(bytesOfRemovedService []byte, serviceAckPayloadLength uint32, serviceAckLength uint32) *_BACnetServiceAckReadPropertyConditional {
+func NewBACnetServiceAckReadPropertyConditional(serviceAckLength uint32, bytesOfRemovedService []byte) *_BACnetServiceAckReadPropertyConditional {
 	_result := &_BACnetServiceAckReadPropertyConditional{
 		BACnetServiceAckContract: NewBACnetServiceAck(serviceAckLength),
 		BytesOfRemovedService:    bytesOfRemovedService,
@@ -83,8 +80,6 @@ type BACnetServiceAckReadPropertyConditionalBuilder interface {
 	WithMandatoryFields(bytesOfRemovedService []byte) BACnetServiceAckReadPropertyConditionalBuilder
 	// WithBytesOfRemovedService adds BytesOfRemovedService (property field)
 	WithBytesOfRemovedService(...byte) BACnetServiceAckReadPropertyConditionalBuilder
-	// WithArgServiceAckPayloadLength sets a parser argument
-	WithArgServiceAckPayloadLength(uint32) BACnetServiceAckReadPropertyConditionalBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BACnetServiceAckBuilder
 	// Build builds the BACnetServiceAckReadPropertyConditional or returns an error if something is wrong
@@ -122,11 +117,6 @@ func (b *_BACnetServiceAckReadPropertyConditionalBuilder) WithBytesOfRemovedServ
 	return b
 }
 
-func (b *_BACnetServiceAckReadPropertyConditionalBuilder) WithArgServiceAckPayloadLength(serviceAckPayloadLength uint32) BACnetServiceAckReadPropertyConditionalBuilder {
-	b.ServiceAckPayloadLength = serviceAckPayloadLength
-	return b
-}
-
 func (b *_BACnetServiceAckReadPropertyConditionalBuilder) Build() (BACnetServiceAckReadPropertyConditional, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -290,16 +280,6 @@ func (m *_BACnetServiceAckReadPropertyConditional) SerializeWithWriteBuffer(ctx
 	return m.BACnetServiceAckContract.(*_BACnetServiceAck).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetServiceAckReadPropertyConditional) GetServiceAckPayloadLength() uint32 {
-	return m.ServiceAckPayloadLength
-}
-
-//
-////
-
 func (m *_BACnetServiceAckReadPropertyConditional) IsBACnetServiceAckReadPropertyConditional() {}
 
 func (m *_BACnetServiceAckReadPropertyConditional) DeepCopy() any {
@@ -313,7 +293,6 @@ func (m *_BACnetServiceAckReadPropertyConditional) deepCopy() *_BACnetServiceAck
 	_BACnetServiceAckReadPropertyConditionalCopy := &_BACnetServiceAckReadPropertyConditional{
 		m.BACnetServiceAckContract.(*_BACnetServiceAck).deepCopy(),
 		utils.DeepCopySlice[byte, byte](m.BytesOfRemovedService),
-		m.ServiceAckPayloadLength,
 	}
 	_BACnetServiceAckReadPropertyConditionalCopy.BACnetServiceAckContract.(*_BACnetServiceAck)._SubType = m
 	return _BACnetServiceAckReadPropertyConditionalCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go
index cc00dce82c6..4bdba2af43f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go
@@ -53,16 +53,13 @@ type BACnetServiceAckReadPropertyMultiple interface {
 type _BACnetServiceAckReadPropertyMultiple struct {
 	BACnetServiceAckContract
 	Data []BACnetReadAccessResult
-
-	// Arguments.
-	ServiceAckPayloadLength uint32
 }
 
 var _ BACnetServiceAckReadPropertyMultiple = (*_BACnetServiceAckReadPropertyMultiple)(nil)
 var _ BACnetServiceAckRequirements = (*_BACnetServiceAckReadPropertyMultiple)(nil)
 
 // NewBACnetServiceAckReadPropertyMultiple factory function for _BACnetServiceAckReadPropertyMultiple
-func NewBACnetServiceAckReadPropertyMultiple(data []BACnetReadAccessResult, serviceAckPayloadLength uint32, serviceAckLength uint32) *_BACnetServiceAckReadPropertyMultiple {
+func NewBACnetServiceAckReadPropertyMultiple(serviceAckLength uint32, data []BACnetReadAccessResult) *_BACnetServiceAckReadPropertyMultiple {
 	_result := &_BACnetServiceAckReadPropertyMultiple{
 		BACnetServiceAckContract: NewBACnetServiceAck(serviceAckLength),
 		Data:                     data,
@@ -83,8 +80,6 @@ type BACnetServiceAckReadPropertyMultipleBuilder interface {
 	WithMandatoryFields(data []BACnetReadAccessResult) BACnetServiceAckReadPropertyMultipleBuilder
 	// WithData adds Data (property field)
 	WithData(...BACnetReadAccessResult) BACnetServiceAckReadPropertyMultipleBuilder
-	// WithArgServiceAckPayloadLength sets a parser argument
-	WithArgServiceAckPayloadLength(uint32) BACnetServiceAckReadPropertyMultipleBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BACnetServiceAckBuilder
 	// Build builds the BACnetServiceAckReadPropertyMultiple or returns an error if something is wrong
@@ -122,11 +117,6 @@ func (b *_BACnetServiceAckReadPropertyMultipleBuilder) WithData(data ...BACnetRe
 	return b
 }
 
-func (b *_BACnetServiceAckReadPropertyMultipleBuilder) WithArgServiceAckPayloadLength(serviceAckPayloadLength uint32) BACnetServiceAckReadPropertyMultipleBuilder {
-	b.ServiceAckPayloadLength = serviceAckPayloadLength
-	return b
-}
-
 func (b *_BACnetServiceAckReadPropertyMultipleBuilder) Build() (BACnetServiceAckReadPropertyMultiple, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -292,16 +282,6 @@ func (m *_BACnetServiceAckReadPropertyMultiple) SerializeWithWriteBuffer(ctx con
 	return m.BACnetServiceAckContract.(*_BACnetServiceAck).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetServiceAckReadPropertyMultiple) GetServiceAckPayloadLength() uint32 {
-	return m.ServiceAckPayloadLength
-}
-
-//
-////
-
 func (m *_BACnetServiceAckReadPropertyMultiple) IsBACnetServiceAckReadPropertyMultiple() {}
 
 func (m *_BACnetServiceAckReadPropertyMultiple) DeepCopy() any {
@@ -315,7 +295,6 @@ func (m *_BACnetServiceAckReadPropertyMultiple) deepCopy() *_BACnetServiceAckRea
 	_BACnetServiceAckReadPropertyMultipleCopy := &_BACnetServiceAckReadPropertyMultiple{
 		m.BACnetServiceAckContract.(*_BACnetServiceAck).deepCopy(),
 		utils.DeepCopySlice[BACnetReadAccessResult, BACnetReadAccessResult](m.Data),
-		m.ServiceAckPayloadLength,
 	}
 	_BACnetServiceAckReadPropertyMultipleCopy.BACnetServiceAckContract.(*_BACnetServiceAck)._SubType = m
 	return _BACnetServiceAckReadPropertyMultipleCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadRange.go
index 58433bf7155..b51f5ecca8c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadRange.go
@@ -77,7 +77,7 @@ var _ BACnetServiceAckReadRange = (*_BACnetServiceAckReadRange)(nil)
 var _ BACnetServiceAckRequirements = (*_BACnetServiceAckReadRange)(nil)
 
 // NewBACnetServiceAckReadRange factory function for _BACnetServiceAckReadRange
-func NewBACnetServiceAckReadRange(objectIdentifier BACnetContextTagObjectIdentifier, propertyIdentifier BACnetPropertyIdentifierTagged, propertyArrayIndex BACnetContextTagUnsignedInteger, resultFlags BACnetResultFlagsTagged, itemCount BACnetContextTagUnsignedInteger, itemData BACnetConstructedData, firstSequenceNumber BACnetContextTagUnsignedInteger, serviceAckLength uint32) *_BACnetServiceAckReadRange {
+func NewBACnetServiceAckReadRange(serviceAckLength uint32, objectIdentifier BACnetContextTagObjectIdentifier, propertyIdentifier BACnetPropertyIdentifierTagged, propertyArrayIndex BACnetContextTagUnsignedInteger, resultFlags BACnetResultFlagsTagged, itemCount BACnetContextTagUnsignedInteger, itemData BACnetConstructedData, firstSequenceNumber BACnetContextTagUnsignedInteger) *_BACnetServiceAckReadRange {
 	if objectIdentifier == nil {
 		panic("objectIdentifier of type BACnetContextTagObjectIdentifier for BACnetServiceAckReadRange must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckRequestKey.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckRequestKey.go
index 49913f3ff58..492cc48c048 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckRequestKey.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckRequestKey.go
@@ -53,16 +53,13 @@ type BACnetServiceAckRequestKey interface {
 type _BACnetServiceAckRequestKey struct {
 	BACnetServiceAckContract
 	BytesOfRemovedService []byte
-
-	// Arguments.
-	ServiceAckPayloadLength uint32
 }
 
 var _ BACnetServiceAckRequestKey = (*_BACnetServiceAckRequestKey)(nil)
 var _ BACnetServiceAckRequirements = (*_BACnetServiceAckRequestKey)(nil)
 
 // NewBACnetServiceAckRequestKey factory function for _BACnetServiceAckRequestKey
-func NewBACnetServiceAckRequestKey(bytesOfRemovedService []byte, serviceAckPayloadLength uint32, serviceAckLength uint32) *_BACnetServiceAckRequestKey {
+func NewBACnetServiceAckRequestKey(serviceAckLength uint32, bytesOfRemovedService []byte) *_BACnetServiceAckRequestKey {
 	_result := &_BACnetServiceAckRequestKey{
 		BACnetServiceAckContract: NewBACnetServiceAck(serviceAckLength),
 		BytesOfRemovedService:    bytesOfRemovedService,
@@ -83,8 +80,6 @@ type BACnetServiceAckRequestKeyBuilder interface {
 	WithMandatoryFields(bytesOfRemovedService []byte) BACnetServiceAckRequestKeyBuilder
 	// WithBytesOfRemovedService adds BytesOfRemovedService (property field)
 	WithBytesOfRemovedService(...byte) BACnetServiceAckRequestKeyBuilder
-	// WithArgServiceAckPayloadLength sets a parser argument
-	WithArgServiceAckPayloadLength(uint32) BACnetServiceAckRequestKeyBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BACnetServiceAckBuilder
 	// Build builds the BACnetServiceAckRequestKey or returns an error if something is wrong
@@ -122,11 +117,6 @@ func (b *_BACnetServiceAckRequestKeyBuilder) WithBytesOfRemovedService(bytesOfRe
 	return b
 }
 
-func (b *_BACnetServiceAckRequestKeyBuilder) WithArgServiceAckPayloadLength(serviceAckPayloadLength uint32) BACnetServiceAckRequestKeyBuilder {
-	b.ServiceAckPayloadLength = serviceAckPayloadLength
-	return b
-}
-
 func (b *_BACnetServiceAckRequestKeyBuilder) Build() (BACnetServiceAckRequestKey, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -290,16 +280,6 @@ func (m *_BACnetServiceAckRequestKey) SerializeWithWriteBuffer(ctx context.Conte
 	return m.BACnetServiceAckContract.(*_BACnetServiceAck).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetServiceAckRequestKey) GetServiceAckPayloadLength() uint32 {
-	return m.ServiceAckPayloadLength
-}
-
-//
-////
-
 func (m *_BACnetServiceAckRequestKey) IsBACnetServiceAckRequestKey() {}
 
 func (m *_BACnetServiceAckRequestKey) DeepCopy() any {
@@ -313,7 +293,6 @@ func (m *_BACnetServiceAckRequestKey) deepCopy() *_BACnetServiceAckRequestKey {
 	_BACnetServiceAckRequestKeyCopy := &_BACnetServiceAckRequestKey{
 		m.BACnetServiceAckContract.(*_BACnetServiceAck).deepCopy(),
 		utils.DeepCopySlice[byte, byte](m.BytesOfRemovedService),
-		m.ServiceAckPayloadLength,
 	}
 	_BACnetServiceAckRequestKeyCopy.BACnetServiceAckContract.(*_BACnetServiceAck)._SubType = m
 	return _BACnetServiceAckRequestKeyCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTData.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTData.go
index feb632864cb..da1f3c83caf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTData.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTData.go
@@ -65,7 +65,7 @@ var _ BACnetServiceAckVTData = (*_BACnetServiceAckVTData)(nil)
 var _ BACnetServiceAckRequirements = (*_BACnetServiceAckVTData)(nil)
 
 // NewBACnetServiceAckVTData factory function for _BACnetServiceAckVTData
-func NewBACnetServiceAckVTData(vtSessionIdentifier BACnetApplicationTagUnsignedInteger, vtNewData BACnetApplicationTagOctetString, vtDataFlag BACnetApplicationTagUnsignedInteger, serviceAckLength uint32) *_BACnetServiceAckVTData {
+func NewBACnetServiceAckVTData(serviceAckLength uint32, vtSessionIdentifier BACnetApplicationTagUnsignedInteger, vtNewData BACnetApplicationTagOctetString, vtDataFlag BACnetApplicationTagUnsignedInteger) *_BACnetServiceAckVTData {
 	if vtSessionIdentifier == nil {
 		panic("vtSessionIdentifier of type BACnetApplicationTagUnsignedInteger for BACnetServiceAckVTData must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go
index cd7cd832d7e..da73c5523c9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go
@@ -59,7 +59,7 @@ var _ BACnetServiceAckVTOpen = (*_BACnetServiceAckVTOpen)(nil)
 var _ BACnetServiceAckRequirements = (*_BACnetServiceAckVTOpen)(nil)
 
 // NewBACnetServiceAckVTOpen factory function for _BACnetServiceAckVTOpen
-func NewBACnetServiceAckVTOpen(remoteVtSessionIdentifier BACnetApplicationTagUnsignedInteger, serviceAckLength uint32) *_BACnetServiceAckVTOpen {
+func NewBACnetServiceAckVTOpen(serviceAckLength uint32, remoteVtSessionIdentifier BACnetApplicationTagUnsignedInteger) *_BACnetServiceAckVTOpen {
 	if remoteVtSessionIdentifier == nil {
 		panic("remoteVtSessionIdentifier of type BACnetApplicationTagUnsignedInteger for BACnetServiceAckVTOpen must not be nil")
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupportedTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupportedTagged.go
index e8417f087cb..ebd6cd757f9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupportedTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupportedTagged.go
@@ -74,23 +74,19 @@ type BACnetServicesSupportedTagged interface {
 type _BACnetServicesSupportedTagged struct {
 	Header  BACnetTagHeader
 	Payload BACnetTagPayloadBitString
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetServicesSupportedTagged = (*_BACnetServicesSupportedTagged)(nil)
 
 // NewBACnetServicesSupportedTagged factory function for _BACnetServicesSupportedTagged
-func NewBACnetServicesSupportedTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString, tagNumber uint8, tagClass TagClass) *_BACnetServicesSupportedTagged {
+func NewBACnetServicesSupportedTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString) *_BACnetServicesSupportedTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetServicesSupportedTagged must not be nil")
 	}
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadBitString for BACnetServicesSupportedTagged must not be nil")
 	}
-	return &_BACnetServicesSupportedTagged{Header: header, Payload: payload, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetServicesSupportedTagged{Header: header, Payload: payload}
 }
 
 ///////////////////////////////////////////////////////////
@@ -111,10 +107,6 @@ type BACnetServicesSupportedTaggedBuilder interface {
 	WithPayload(BACnetTagPayloadBitString) BACnetServicesSupportedTaggedBuilder
 	// WithPayloadBuilder adds Payload (property field) which is build by the builder
 	WithPayloadBuilder(func(BACnetTagPayloadBitStringBuilder) BACnetTagPayloadBitStringBuilder) BACnetServicesSupportedTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetServicesSupportedTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetServicesSupportedTaggedBuilder
 	// Build builds the BACnetServicesSupportedTagged or returns an error if something is wrong
 	Build() (BACnetServicesSupportedTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -168,15 +160,6 @@ func (b *_BACnetServicesSupportedTaggedBuilder) WithPayloadBuilder(builderSuppli
 	return b
 }
 
-func (b *_BACnetServicesSupportedTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetServicesSupportedTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetServicesSupportedTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetServicesSupportedTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetServicesSupportedTaggedBuilder) Build() (BACnetServicesSupportedTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -368,7 +351,7 @@ func BACnetServicesSupportedTaggedParseWithBufferProducer(tagNumber uint8, tagCl
 }
 
 func BACnetServicesSupportedTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetServicesSupportedTagged, error) {
-	v, err := (&_BACnetServicesSupportedTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetServicesSupportedTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -564,19 +547,6 @@ func (m *_BACnetServicesSupportedTagged) SerializeWithWriteBuffer(ctx context.Co
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetServicesSupportedTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetServicesSupportedTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetServicesSupportedTagged) IsBACnetServicesSupportedTagged() {}
 
 func (m *_BACnetServicesSupportedTagged) DeepCopy() any {
@@ -590,8 +560,6 @@ func (m *_BACnetServicesSupportedTagged) deepCopy() *_BACnetServicesSupportedTag
 	_BACnetServicesSupportedTaggedCopy := &_BACnetServicesSupportedTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		utils.DeepCopy[BACnetTagPayloadBitString](m.Payload),
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetServicesSupportedTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSetpointReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSetpointReference.go
index 5fa4f345685..68a27eadf47 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSetpointReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSetpointReference.go
@@ -203,7 +203,7 @@ func BACnetSetpointReferenceParseWithBufferProducer() func(ctx context.Context,
 }
 
 func BACnetSetpointReferenceParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetSetpointReference, error) {
-	v, err := (&_BACnetSetpointReference{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetSetpointReference)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevel.go
index 8809cbb16c7..8b6375007f7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevel.go
@@ -325,7 +325,7 @@ func BACnetShedLevelParseWithBufferProducer[T BACnetShedLevel]() func(ctx contex
 }
 
 func BACnetShedLevelParseWithBuffer[T BACnetShedLevel](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetShedLevel{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetShedLevel)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedStateTagged.go
index 9dbb78e6aa2..ff33ff9d690 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedStateTagged.go
@@ -54,20 +54,16 @@ type BACnetShedStateTagged interface {
 type _BACnetShedStateTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetShedState
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetShedStateTagged = (*_BACnetShedStateTagged)(nil)
 
 // NewBACnetShedStateTagged factory function for _BACnetShedStateTagged
-func NewBACnetShedStateTagged(header BACnetTagHeader, value BACnetShedState, tagNumber uint8, tagClass TagClass) *_BACnetShedStateTagged {
+func NewBACnetShedStateTagged(header BACnetTagHeader, value BACnetShedState) *_BACnetShedStateTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetShedStateTagged must not be nil")
 	}
-	return &_BACnetShedStateTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetShedStateTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetShedStateTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetShedStateTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetShedState) BACnetShedStateTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetShedStateTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetShedStateTaggedBuilder
 	// Build builds the BACnetShedStateTagged or returns an error if something is wrong
 	Build() (BACnetShedStateTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetShedStateTaggedBuilder) WithValue(value BACnetShedState) BACnetS
 	return b
 }
 
-func (b *_BACnetShedStateTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetShedStateTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetShedStateTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetShedStateTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetShedStateTaggedBuilder) Build() (BACnetShedStateTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetShedStateTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagC
 }
 
 func BACnetShedStateTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetShedStateTagged, error) {
-	v, err := (&_BACnetShedStateTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetShedStateTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetShedStateTagged) SerializeWithWriteBuffer(ctx context.Context, w
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetShedStateTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetShedStateTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetShedStateTagged) IsBACnetShedStateTagged() {}
 
 func (m *_BACnetShedStateTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetShedStateTagged) deepCopy() *_BACnetShedStateTagged {
 	_BACnetShedStateTaggedCopy := &_BACnetShedStateTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetShedStateTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedStateTagged.go
index 81b7e79ea9f..86354d5f297 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedStateTagged.go
@@ -59,20 +59,16 @@ type _BACnetSilencedStateTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetSilencedState
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetSilencedStateTagged = (*_BACnetSilencedStateTagged)(nil)
 
 // NewBACnetSilencedStateTagged factory function for _BACnetSilencedStateTagged
-func NewBACnetSilencedStateTagged(header BACnetTagHeader, value BACnetSilencedState, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetSilencedStateTagged {
+func NewBACnetSilencedStateTagged(header BACnetTagHeader, value BACnetSilencedState, proprietaryValue uint32) *_BACnetSilencedStateTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetSilencedStateTagged must not be nil")
 	}
-	return &_BACnetSilencedStateTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetSilencedStateTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetSilencedStateTaggedBuilder interface {
 	WithValue(BACnetSilencedState) BACnetSilencedStateTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetSilencedStateTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetSilencedStateTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetSilencedStateTaggedBuilder
 	// Build builds the BACnetSilencedStateTagged or returns an error if something is wrong
 	Build() (BACnetSilencedStateTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetSilencedStateTaggedBuilder) WithProprietaryValue(proprietaryValu
 	return b
 }
 
-func (b *_BACnetSilencedStateTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetSilencedStateTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetSilencedStateTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetSilencedStateTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetSilencedStateTaggedBuilder) Build() (BACnetSilencedStateTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetSilencedStateTaggedParseWithBufferProducer(tagNumber uint8, tagClass
 }
 
 func BACnetSilencedStateTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetSilencedStateTagged, error) {
-	v, err := (&_BACnetSilencedStateTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetSilencedStateTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetSilencedStateTagged) SerializeWithWriteBuffer(ctx context.Contex
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetSilencedStateTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetSilencedStateTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetSilencedStateTagged) IsBACnetSilencedStateTagged() {}
 
 func (m *_BACnetSilencedStateTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetSilencedStateTagged) deepCopy() *_BACnetSilencedStateTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetSilencedStateTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEvent.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEvent.go
index 8984ef6b71f..375336cc5b9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEvent.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEvent.go
@@ -277,7 +277,7 @@ func BACnetSpecialEventParseWithBufferProducer() func(ctx context.Context, readB
 }
 
 func BACnetSpecialEventParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetSpecialEvent, error) {
-	v, err := (&_BACnetSpecialEvent{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetSpecialEvent)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventListOfTimeValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventListOfTimeValues.go
index 784de4f373e..36b1ffb0cb6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventListOfTimeValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventListOfTimeValues.go
@@ -57,22 +57,19 @@ type _BACnetSpecialEventListOfTimeValues struct {
 	OpeningTag       BACnetOpeningTag
 	ListOfTimeValues []BACnetTimeValue
 	ClosingTag       BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetSpecialEventListOfTimeValues = (*_BACnetSpecialEventListOfTimeValues)(nil)
 
 // NewBACnetSpecialEventListOfTimeValues factory function for _BACnetSpecialEventListOfTimeValues
-func NewBACnetSpecialEventListOfTimeValues(openingTag BACnetOpeningTag, listOfTimeValues []BACnetTimeValue, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetSpecialEventListOfTimeValues {
+func NewBACnetSpecialEventListOfTimeValues(openingTag BACnetOpeningTag, listOfTimeValues []BACnetTimeValue, closingTag BACnetClosingTag) *_BACnetSpecialEventListOfTimeValues {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetSpecialEventListOfTimeValues must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetSpecialEventListOfTimeValues must not be nil")
 	}
-	return &_BACnetSpecialEventListOfTimeValues{OpeningTag: openingTag, ListOfTimeValues: listOfTimeValues, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetSpecialEventListOfTimeValues{OpeningTag: openingTag, ListOfTimeValues: listOfTimeValues, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetSpecialEventListOfTimeValuesBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetSpecialEventListOfTimeValuesBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetSpecialEventListOfTimeValuesBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetSpecialEventListOfTimeValuesBuilder
 	// Build builds the BACnetSpecialEventListOfTimeValues or returns an error if something is wrong
 	Build() (BACnetSpecialEventListOfTimeValues, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetSpecialEventListOfTimeValuesBuilder) WithClosingTagBuilder(build
 	return b
 }
 
-func (b *_BACnetSpecialEventListOfTimeValuesBuilder) WithArgTagNumber(tagNumber uint8) BACnetSpecialEventListOfTimeValuesBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetSpecialEventListOfTimeValuesBuilder) Build() (BACnetSpecialEventListOfTimeValues, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetSpecialEventListOfTimeValuesParseWithBufferProducer(tagNumber uint8)
 }
 
 func BACnetSpecialEventListOfTimeValuesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetSpecialEventListOfTimeValues, error) {
-	v, err := (&_BACnetSpecialEventListOfTimeValues{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetSpecialEventListOfTimeValues)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetSpecialEventListOfTimeValues) SerializeWithWriteBuffer(ctx conte
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetSpecialEventListOfTimeValues) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetSpecialEventListOfTimeValues) IsBACnetSpecialEventListOfTimeValues() {}
 
 func (m *_BACnetSpecialEventListOfTimeValues) DeepCopy() any {
@@ -373,7 +353,6 @@ func (m *_BACnetSpecialEventListOfTimeValues) deepCopy() *_BACnetSpecialEventLis
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetTimeValue, BACnetTimeValue](m.ListOfTimeValues),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetSpecialEventListOfTimeValuesCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriod.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriod.go
index 1fe17b1413d..e78dc63ea23 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriod.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriod.go
@@ -313,7 +313,7 @@ func BACnetSpecialEventPeriodParseWithBufferProducer[T BACnetSpecialEventPeriod]
 }
 
 func BACnetSpecialEventPeriodParseWithBuffer[T BACnetSpecialEventPeriod](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetSpecialEventPeriod{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetSpecialEventPeriod)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlagsTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlagsTagged.go
index 434d747ad13..deca0491ec4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlagsTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlagsTagged.go
@@ -62,23 +62,19 @@ type BACnetStatusFlagsTagged interface {
 type _BACnetStatusFlagsTagged struct {
 	Header  BACnetTagHeader
 	Payload BACnetTagPayloadBitString
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetStatusFlagsTagged = (*_BACnetStatusFlagsTagged)(nil)
 
 // NewBACnetStatusFlagsTagged factory function for _BACnetStatusFlagsTagged
-func NewBACnetStatusFlagsTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString, tagNumber uint8, tagClass TagClass) *_BACnetStatusFlagsTagged {
+func NewBACnetStatusFlagsTagged(header BACnetTagHeader, payload BACnetTagPayloadBitString) *_BACnetStatusFlagsTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetStatusFlagsTagged must not be nil")
 	}
 	if payload == nil {
 		panic("payload of type BACnetTagPayloadBitString for BACnetStatusFlagsTagged must not be nil")
 	}
-	return &_BACnetStatusFlagsTagged{Header: header, Payload: payload, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetStatusFlagsTagged{Header: header, Payload: payload}
 }
 
 ///////////////////////////////////////////////////////////
@@ -99,10 +95,6 @@ type BACnetStatusFlagsTaggedBuilder interface {
 	WithPayload(BACnetTagPayloadBitString) BACnetStatusFlagsTaggedBuilder
 	// WithPayloadBuilder adds Payload (property field) which is build by the builder
 	WithPayloadBuilder(func(BACnetTagPayloadBitStringBuilder) BACnetTagPayloadBitStringBuilder) BACnetStatusFlagsTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetStatusFlagsTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetStatusFlagsTaggedBuilder
 	// Build builds the BACnetStatusFlagsTagged or returns an error if something is wrong
 	Build() (BACnetStatusFlagsTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -156,15 +148,6 @@ func (b *_BACnetStatusFlagsTaggedBuilder) WithPayloadBuilder(builderSupplier fun
 	return b
 }
 
-func (b *_BACnetStatusFlagsTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetStatusFlagsTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetStatusFlagsTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetStatusFlagsTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetStatusFlagsTaggedBuilder) Build() (BACnetStatusFlagsTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -308,7 +291,7 @@ func BACnetStatusFlagsTaggedParseWithBufferProducer(tagNumber uint8, tagClass Ta
 }
 
 func BACnetStatusFlagsTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetStatusFlagsTagged, error) {
-	v, err := (&_BACnetStatusFlagsTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetStatusFlagsTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -432,19 +415,6 @@ func (m *_BACnetStatusFlagsTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetStatusFlagsTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetStatusFlagsTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetStatusFlagsTagged) IsBACnetStatusFlagsTagged() {}
 
 func (m *_BACnetStatusFlagsTagged) DeepCopy() any {
@@ -458,8 +428,6 @@ func (m *_BACnetStatusFlagsTagged) deepCopy() *_BACnetStatusFlagsTagged {
 	_BACnetStatusFlagsTaggedCopy := &_BACnetStatusFlagsTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		utils.DeepCopy[BACnetTagPayloadBitString](m.Payload),
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetStatusFlagsTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagHeader.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagHeader.go
index cc40c11f870..cf729651dd0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagHeader.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagHeader.go
@@ -402,7 +402,7 @@ func BACnetTagHeaderParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func BACnetTagHeaderParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetTagHeader, error) {
-	v, err := (&_BACnetTagHeader{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetTagHeader)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBitString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBitString.go
index 31635e95af6..b10f7c18815 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBitString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBitString.go
@@ -57,16 +57,13 @@ type _BACnetTagPayloadBitString struct {
 	UnusedBits uint8
 	Data       []bool
 	Unused     []bool
-
-	// Arguments.
-	ActualLength uint32
 }
 
 var _ BACnetTagPayloadBitString = (*_BACnetTagPayloadBitString)(nil)
 
 // NewBACnetTagPayloadBitString factory function for _BACnetTagPayloadBitString
-func NewBACnetTagPayloadBitString(unusedBits uint8, data []bool, unused []bool, actualLength uint32) *_BACnetTagPayloadBitString {
-	return &_BACnetTagPayloadBitString{UnusedBits: unusedBits, Data: data, Unused: unused, ActualLength: actualLength}
+func NewBACnetTagPayloadBitString(unusedBits uint8, data []bool, unused []bool) *_BACnetTagPayloadBitString {
+	return &_BACnetTagPayloadBitString{UnusedBits: unusedBits, Data: data, Unused: unused}
 }
 
 ///////////////////////////////////////////////////////////
@@ -85,8 +82,6 @@ type BACnetTagPayloadBitStringBuilder interface {
 	WithData(...bool) BACnetTagPayloadBitStringBuilder
 	// WithUnused adds Unused (property field)
 	WithUnused(...bool) BACnetTagPayloadBitStringBuilder
-	// WithArgActualLength sets a parser argument
-	WithArgActualLength(uint32) BACnetTagPayloadBitStringBuilder
 	// Build builds the BACnetTagPayloadBitString or returns an error if something is wrong
 	Build() (BACnetTagPayloadBitString, error)
 	// MustBuild does the same as Build but panics on error
@@ -125,11 +120,6 @@ func (b *_BACnetTagPayloadBitStringBuilder) WithUnused(unused ...bool) BACnetTag
 	return b
 }
 
-func (b *_BACnetTagPayloadBitStringBuilder) WithArgActualLength(actualLength uint32) BACnetTagPayloadBitStringBuilder {
-	b.ActualLength = actualLength
-	return b
-}
-
 func (b *_BACnetTagPayloadBitStringBuilder) Build() (BACnetTagPayloadBitString, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -237,7 +227,7 @@ func BACnetTagPayloadBitStringParseWithBufferProducer(actualLength uint32) func(
 }
 
 func BACnetTagPayloadBitStringParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, actualLength uint32) (BACnetTagPayloadBitString, error) {
-	v, err := (&_BACnetTagPayloadBitString{ActualLength: actualLength}).parse(ctx, readBuffer, actualLength)
+	v, err := (new(_BACnetTagPayloadBitString)).parse(ctx, readBuffer, actualLength)
 	if err != nil {
 		return nil, err
 	}
@@ -313,16 +303,6 @@ func (m *_BACnetTagPayloadBitString) SerializeWithWriteBuffer(ctx context.Contex
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetTagPayloadBitString) GetActualLength() uint32 {
-	return m.ActualLength
-}
-
-//
-////
-
 func (m *_BACnetTagPayloadBitString) IsBACnetTagPayloadBitString() {}
 
 func (m *_BACnetTagPayloadBitString) DeepCopy() any {
@@ -337,7 +317,6 @@ func (m *_BACnetTagPayloadBitString) deepCopy() *_BACnetTagPayloadBitString {
 		m.UnusedBits,
 		utils.DeepCopySlice[bool, bool](m.Data),
 		utils.DeepCopySlice[bool, bool](m.Unused),
-		m.ActualLength,
 	}
 	return _BACnetTagPayloadBitStringCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go
index 7927245b767..b609c8645e8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go
@@ -39,6 +39,8 @@ type BACnetTagPayloadBoolean interface {
 	utils.LengthAware
 	utils.Serializable
 	utils.Copyable
+	// GetActualLength returns ActualLength (property field)
+	GetActualLength() uint32
 	// GetValue returns Value (virtual field)
 	GetValue() bool
 	// GetIsTrue returns IsTrue (virtual field)
@@ -53,8 +55,6 @@ type BACnetTagPayloadBoolean interface {
 
 // _BACnetTagPayloadBoolean is the data-structure of this message
 type _BACnetTagPayloadBoolean struct {
-
-	// Arguments.
 	ActualLength uint32
 }
 
@@ -74,9 +74,9 @@ func NewBACnetTagPayloadBoolean(actualLength uint32) *_BACnetTagPayloadBoolean {
 type BACnetTagPayloadBooleanBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
-	WithMandatoryFields() BACnetTagPayloadBooleanBuilder
-	// WithArgActualLength sets a parser argument
-	WithArgActualLength(uint32) BACnetTagPayloadBooleanBuilder
+	WithMandatoryFields(actualLength uint32) BACnetTagPayloadBooleanBuilder
+	// WithActualLength adds ActualLength (property field)
+	WithActualLength(uint32) BACnetTagPayloadBooleanBuilder
 	// Build builds the BACnetTagPayloadBoolean or returns an error if something is wrong
 	Build() (BACnetTagPayloadBoolean, error)
 	// MustBuild does the same as Build but panics on error
@@ -96,11 +96,11 @@ type _BACnetTagPayloadBooleanBuilder struct {
 
 var _ (BACnetTagPayloadBooleanBuilder) = (*_BACnetTagPayloadBooleanBuilder)(nil)
 
-func (b *_BACnetTagPayloadBooleanBuilder) WithMandatoryFields() BACnetTagPayloadBooleanBuilder {
-	return b
+func (b *_BACnetTagPayloadBooleanBuilder) WithMandatoryFields(actualLength uint32) BACnetTagPayloadBooleanBuilder {
+	return b.WithActualLength(actualLength)
 }
 
-func (b *_BACnetTagPayloadBooleanBuilder) WithArgActualLength(actualLength uint32) BACnetTagPayloadBooleanBuilder {
+func (b *_BACnetTagPayloadBooleanBuilder) WithActualLength(actualLength uint32) BACnetTagPayloadBooleanBuilder {
 	b.ActualLength = actualLength
 	return b
 }
@@ -141,6 +141,19 @@ func (b *_BACnetTagPayloadBoolean) CreateBACnetTagPayloadBooleanBuilder() BACnet
 ///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 
+///////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////
+/////////////////////// Accessors for property fields.
+///////////////////////
+
+func (m *_BACnetTagPayloadBoolean) GetActualLength() uint32 {
+	return m.ActualLength
+}
+
+///////////////////////
+///////////////////////
+///////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 /////////////////////// Accessors for virtual fields.
@@ -211,7 +224,7 @@ func BACnetTagPayloadBooleanParseWithBufferProducer(actualLength uint32) func(ct
 }
 
 func BACnetTagPayloadBooleanParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, actualLength uint32) (BACnetTagPayloadBoolean, error) {
-	v, err := (&_BACnetTagPayloadBoolean{ActualLength: actualLength}).parse(ctx, readBuffer, actualLength)
+	v, err := (new(_BACnetTagPayloadBoolean)).parse(ctx, readBuffer, actualLength)
 	if err != nil {
 		return nil, err
 	}
@@ -226,6 +239,7 @@ func (m *_BACnetTagPayloadBoolean) parse(ctx context.Context, readBuffer utils.R
 	}
 	currentPos := positionAware.GetPos()
 	_ = currentPos
+	m.ActualLength = actualLength
 
 	value, err := ReadVirtualField[bool](ctx, "value", (*bool)(nil), bool((actualLength) == (1)))
 	if err != nil {
@@ -293,16 +307,6 @@ func (m *_BACnetTagPayloadBoolean) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetTagPayloadBoolean) GetActualLength() uint32 {
-	return m.ActualLength
-}
-
-//
-////
-
 func (m *_BACnetTagPayloadBoolean) IsBACnetTagPayloadBoolean() {}
 
 func (m *_BACnetTagPayloadBoolean) DeepCopy() any {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go
index b897d5c5b1a..fcb33b53fda 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go
@@ -41,6 +41,8 @@ type BACnetTagPayloadCharacterString interface {
 	utils.LengthAware
 	utils.Serializable
 	utils.Copyable
+	// GetActualLength returns ActualLength (property field)
+	GetActualLength() uint32
 	// GetEncoding returns Encoding (property field)
 	GetEncoding() BACnetCharacterEncoding
 	// GetValue returns Value (property field)
@@ -55,18 +57,16 @@ type BACnetTagPayloadCharacterString interface {
 
 // _BACnetTagPayloadCharacterString is the data-structure of this message
 type _BACnetTagPayloadCharacterString struct {
-	Encoding BACnetCharacterEncoding
-	Value    string
-
-	// Arguments.
 	ActualLength uint32
+	Encoding     BACnetCharacterEncoding
+	Value        string
 }
 
 var _ BACnetTagPayloadCharacterString = (*_BACnetTagPayloadCharacterString)(nil)
 
 // NewBACnetTagPayloadCharacterString factory function for _BACnetTagPayloadCharacterString
-func NewBACnetTagPayloadCharacterString(encoding BACnetCharacterEncoding, value string, actualLength uint32) *_BACnetTagPayloadCharacterString {
-	return &_BACnetTagPayloadCharacterString{Encoding: encoding, Value: value, ActualLength: actualLength}
+func NewBACnetTagPayloadCharacterString(actualLength uint32, encoding BACnetCharacterEncoding, value string) *_BACnetTagPayloadCharacterString {
+	return &_BACnetTagPayloadCharacterString{ActualLength: actualLength, Encoding: encoding, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -78,13 +78,13 @@ func NewBACnetTagPayloadCharacterString(encoding BACnetCharacterEncoding, value
 type BACnetTagPayloadCharacterStringBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
-	WithMandatoryFields(encoding BACnetCharacterEncoding, value string) BACnetTagPayloadCharacterStringBuilder
+	WithMandatoryFields(actualLength uint32, encoding BACnetCharacterEncoding, value string) BACnetTagPayloadCharacterStringBuilder
+	// WithActualLength adds ActualLength (property field)
+	WithActualLength(uint32) BACnetTagPayloadCharacterStringBuilder
 	// WithEncoding adds Encoding (property field)
 	WithEncoding(BACnetCharacterEncoding) BACnetTagPayloadCharacterStringBuilder
 	// WithValue adds Value (property field)
 	WithValue(string) BACnetTagPayloadCharacterStringBuilder
-	// WithArgActualLength sets a parser argument
-	WithArgActualLength(uint32) BACnetTagPayloadCharacterStringBuilder
 	// Build builds the BACnetTagPayloadCharacterString or returns an error if something is wrong
 	Build() (BACnetTagPayloadCharacterString, error)
 	// MustBuild does the same as Build but panics on error
@@ -104,8 +104,13 @@ type _BACnetTagPayloadCharacterStringBuilder struct {
 
 var _ (BACnetTagPayloadCharacterStringBuilder) = (*_BACnetTagPayloadCharacterStringBuilder)(nil)
 
-func (b *_BACnetTagPayloadCharacterStringBuilder) WithMandatoryFields(encoding BACnetCharacterEncoding, value string) BACnetTagPayloadCharacterStringBuilder {
-	return b.WithEncoding(encoding).WithValue(value)
+func (b *_BACnetTagPayloadCharacterStringBuilder) WithMandatoryFields(actualLength uint32, encoding BACnetCharacterEncoding, value string) BACnetTagPayloadCharacterStringBuilder {
+	return b.WithActualLength(actualLength).WithEncoding(encoding).WithValue(value)
+}
+
+func (b *_BACnetTagPayloadCharacterStringBuilder) WithActualLength(actualLength uint32) BACnetTagPayloadCharacterStringBuilder {
+	b.ActualLength = actualLength
+	return b
 }
 
 func (b *_BACnetTagPayloadCharacterStringBuilder) WithEncoding(encoding BACnetCharacterEncoding) BACnetTagPayloadCharacterStringBuilder {
@@ -118,11 +123,6 @@ func (b *_BACnetTagPayloadCharacterStringBuilder) WithValue(value string) BACnet
 	return b
 }
 
-func (b *_BACnetTagPayloadCharacterStringBuilder) WithArgActualLength(actualLength uint32) BACnetTagPayloadCharacterStringBuilder {
-	b.ActualLength = actualLength
-	return b
-}
-
 func (b *_BACnetTagPayloadCharacterStringBuilder) Build() (BACnetTagPayloadCharacterString, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -164,6 +164,10 @@ func (b *_BACnetTagPayloadCharacterString) CreateBACnetTagPayloadCharacterString
 /////////////////////// Accessors for property fields.
 ///////////////////////
 
+func (m *_BACnetTagPayloadCharacterString) GetActualLength() uint32 {
+	return m.ActualLength
+}
+
 func (m *_BACnetTagPayloadCharacterString) GetEncoding() BACnetCharacterEncoding {
 	return m.Encoding
 }
@@ -236,7 +240,7 @@ func BACnetTagPayloadCharacterStringParseWithBufferProducer(actualLength uint32)
 }
 
 func BACnetTagPayloadCharacterStringParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, actualLength uint32) (BACnetTagPayloadCharacterString, error) {
-	v, err := (&_BACnetTagPayloadCharacterString{ActualLength: actualLength}).parse(ctx, readBuffer, actualLength)
+	v, err := (new(_BACnetTagPayloadCharacterString)).parse(ctx, readBuffer, actualLength)
 	if err != nil {
 		return nil, err
 	}
@@ -251,6 +255,7 @@ func (m *_BACnetTagPayloadCharacterString) parse(ctx context.Context, readBuffer
 	}
 	currentPos := positionAware.GetPos()
 	_ = currentPos
+	m.ActualLength = actualLength
 
 	encoding, err := ReadEnumField[BACnetCharacterEncoding](ctx, "encoding", "BACnetCharacterEncoding", ReadEnum(BACnetCharacterEncodingByValue, ReadByte(readBuffer, 8)))
 	if err != nil {
@@ -314,16 +319,6 @@ func (m *_BACnetTagPayloadCharacterString) SerializeWithWriteBuffer(ctx context.
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetTagPayloadCharacterString) GetActualLength() uint32 {
-	return m.ActualLength
-}
-
-//
-////
-
 func (m *_BACnetTagPayloadCharacterString) IsBACnetTagPayloadCharacterString() {}
 
 func (m *_BACnetTagPayloadCharacterString) DeepCopy() any {
@@ -335,9 +330,9 @@ func (m *_BACnetTagPayloadCharacterString) deepCopy() *_BACnetTagPayloadCharacte
 		return nil
 	}
 	_BACnetTagPayloadCharacterStringCopy := &_BACnetTagPayloadCharacterString{
+		m.ActualLength,
 		m.Encoding,
 		m.Value,
-		m.ActualLength,
 	}
 	return _BACnetTagPayloadCharacterStringCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDate.go
index 7aec25fae97..686ba7429f9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDate.go
@@ -359,7 +359,7 @@ func BACnetTagPayloadDateParseWithBufferProducer() func(ctx context.Context, rea
 }
 
 func BACnetTagPayloadDateParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetTagPayloadDate, error) {
-	v, err := (&_BACnetTagPayloadDate{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetTagPayloadDate)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDouble.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDouble.go
index 4a4c98f7aec..531e506390a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDouble.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDouble.go
@@ -189,7 +189,7 @@ func BACnetTagPayloadDoubleParseWithBufferProducer() func(ctx context.Context, r
 }
 
 func BACnetTagPayloadDoubleParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetTagPayloadDouble, error) {
-	v, err := (&_BACnetTagPayloadDouble{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetTagPayloadDouble)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go
index be5fd099e5f..d4d8f2cd217 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go
@@ -53,16 +53,13 @@ type BACnetTagPayloadEnumerated interface {
 // _BACnetTagPayloadEnumerated is the data-structure of this message
 type _BACnetTagPayloadEnumerated struct {
 	Data []byte
-
-	// Arguments.
-	ActualLength uint32
 }
 
 var _ BACnetTagPayloadEnumerated = (*_BACnetTagPayloadEnumerated)(nil)
 
 // NewBACnetTagPayloadEnumerated factory function for _BACnetTagPayloadEnumerated
-func NewBACnetTagPayloadEnumerated(data []byte, actualLength uint32) *_BACnetTagPayloadEnumerated {
-	return &_BACnetTagPayloadEnumerated{Data: data, ActualLength: actualLength}
+func NewBACnetTagPayloadEnumerated(data []byte) *_BACnetTagPayloadEnumerated {
+	return &_BACnetTagPayloadEnumerated{Data: data}
 }
 
 ///////////////////////////////////////////////////////////
@@ -77,8 +74,6 @@ type BACnetTagPayloadEnumeratedBuilder interface {
 	WithMandatoryFields(data []byte) BACnetTagPayloadEnumeratedBuilder
 	// WithData adds Data (property field)
 	WithData(...byte) BACnetTagPayloadEnumeratedBuilder
-	// WithArgActualLength sets a parser argument
-	WithArgActualLength(uint32) BACnetTagPayloadEnumeratedBuilder
 	// Build builds the BACnetTagPayloadEnumerated or returns an error if something is wrong
 	Build() (BACnetTagPayloadEnumerated, error)
 	// MustBuild does the same as Build but panics on error
@@ -107,11 +102,6 @@ func (b *_BACnetTagPayloadEnumeratedBuilder) WithData(data ...byte) BACnetTagPay
 	return b
 }
 
-func (b *_BACnetTagPayloadEnumeratedBuilder) WithArgActualLength(actualLength uint32) BACnetTagPayloadEnumeratedBuilder {
-	b.ActualLength = actualLength
-	return b
-}
-
 func (b *_BACnetTagPayloadEnumeratedBuilder) Build() (BACnetTagPayloadEnumerated, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -220,7 +210,7 @@ func BACnetTagPayloadEnumeratedParseWithBufferProducer(actualLength uint32) func
 }
 
 func BACnetTagPayloadEnumeratedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, actualLength uint32) (BACnetTagPayloadEnumerated, error) {
-	v, err := (&_BACnetTagPayloadEnumerated{ActualLength: actualLength}).parse(ctx, readBuffer, actualLength)
+	v, err := (new(_BACnetTagPayloadEnumerated)).parse(ctx, readBuffer, actualLength)
 	if err != nil {
 		return nil, err
 	}
@@ -288,16 +278,6 @@ func (m *_BACnetTagPayloadEnumerated) SerializeWithWriteBuffer(ctx context.Conte
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetTagPayloadEnumerated) GetActualLength() uint32 {
-	return m.ActualLength
-}
-
-//
-////
-
 func (m *_BACnetTagPayloadEnumerated) IsBACnetTagPayloadEnumerated() {}
 
 func (m *_BACnetTagPayloadEnumerated) DeepCopy() any {
@@ -310,7 +290,6 @@ func (m *_BACnetTagPayloadEnumerated) deepCopy() *_BACnetTagPayloadEnumerated {
 	}
 	_BACnetTagPayloadEnumeratedCopy := &_BACnetTagPayloadEnumerated{
 		utils.DeepCopySlice[byte, byte](m.Data),
-		m.ActualLength,
 	}
 	return _BACnetTagPayloadEnumeratedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go
index 344caf04289..69543627573 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go
@@ -242,7 +242,7 @@ func BACnetTagPayloadObjectIdentifierParseWithBufferProducer() func(ctx context.
 }
 
 func BACnetTagPayloadObjectIdentifierParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetTagPayloadObjectIdentifier, error) {
-	v, err := (&_BACnetTagPayloadObjectIdentifier{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetTagPayloadObjectIdentifier)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go
index 33ffeb96ddb..48d4849cdcf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go
@@ -51,16 +51,13 @@ type BACnetTagPayloadOctetString interface {
 // _BACnetTagPayloadOctetString is the data-structure of this message
 type _BACnetTagPayloadOctetString struct {
 	Octets []byte
-
-	// Arguments.
-	ActualLength uint32
 }
 
 var _ BACnetTagPayloadOctetString = (*_BACnetTagPayloadOctetString)(nil)
 
 // NewBACnetTagPayloadOctetString factory function for _BACnetTagPayloadOctetString
-func NewBACnetTagPayloadOctetString(octets []byte, actualLength uint32) *_BACnetTagPayloadOctetString {
-	return &_BACnetTagPayloadOctetString{Octets: octets, ActualLength: actualLength}
+func NewBACnetTagPayloadOctetString(octets []byte) *_BACnetTagPayloadOctetString {
+	return &_BACnetTagPayloadOctetString{Octets: octets}
 }
 
 ///////////////////////////////////////////////////////////
@@ -75,8 +72,6 @@ type BACnetTagPayloadOctetStringBuilder interface {
 	WithMandatoryFields(octets []byte) BACnetTagPayloadOctetStringBuilder
 	// WithOctets adds Octets (property field)
 	WithOctets(...byte) BACnetTagPayloadOctetStringBuilder
-	// WithArgActualLength sets a parser argument
-	WithArgActualLength(uint32) BACnetTagPayloadOctetStringBuilder
 	// Build builds the BACnetTagPayloadOctetString or returns an error if something is wrong
 	Build() (BACnetTagPayloadOctetString, error)
 	// MustBuild does the same as Build but panics on error
@@ -105,11 +100,6 @@ func (b *_BACnetTagPayloadOctetStringBuilder) WithOctets(octets ...byte) BACnetT
 	return b
 }
 
-func (b *_BACnetTagPayloadOctetStringBuilder) WithArgActualLength(actualLength uint32) BACnetTagPayloadOctetStringBuilder {
-	b.ActualLength = actualLength
-	return b
-}
-
 func (b *_BACnetTagPayloadOctetStringBuilder) Build() (BACnetTagPayloadOctetString, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -201,7 +191,7 @@ func BACnetTagPayloadOctetStringParseWithBufferProducer(actualLength uint32) fun
 }
 
 func BACnetTagPayloadOctetStringParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, actualLength uint32) (BACnetTagPayloadOctetString, error) {
-	v, err := (&_BACnetTagPayloadOctetString{ActualLength: actualLength}).parse(ctx, readBuffer, actualLength)
+	v, err := (new(_BACnetTagPayloadOctetString)).parse(ctx, readBuffer, actualLength)
 	if err != nil {
 		return nil, err
 	}
@@ -257,16 +247,6 @@ func (m *_BACnetTagPayloadOctetString) SerializeWithWriteBuffer(ctx context.Cont
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetTagPayloadOctetString) GetActualLength() uint32 {
-	return m.ActualLength
-}
-
-//
-////
-
 func (m *_BACnetTagPayloadOctetString) IsBACnetTagPayloadOctetString() {}
 
 func (m *_BACnetTagPayloadOctetString) DeepCopy() any {
@@ -279,7 +259,6 @@ func (m *_BACnetTagPayloadOctetString) deepCopy() *_BACnetTagPayloadOctetString
 	}
 	_BACnetTagPayloadOctetStringCopy := &_BACnetTagPayloadOctetString{
 		utils.DeepCopySlice[byte, byte](m.Octets),
-		m.ActualLength,
 	}
 	return _BACnetTagPayloadOctetStringCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadReal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadReal.go
index db056a33a0e..b316044773e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadReal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadReal.go
@@ -189,7 +189,7 @@ func BACnetTagPayloadRealParseWithBufferProducer() func(ctx context.Context, rea
 }
 
 func BACnetTagPayloadRealParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetTagPayloadReal, error) {
-	v, err := (&_BACnetTagPayloadReal{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetTagPayloadReal)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go
index 975c99e7455..27a5f6e5b87 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go
@@ -40,6 +40,8 @@ type BACnetTagPayloadSignedInteger interface {
 	utils.LengthAware
 	utils.Serializable
 	utils.Copyable
+	// GetActualLength returns ActualLength (property field)
+	GetActualLength() uint32
 	// GetValueInt8 returns ValueInt8 (property field)
 	GetValueInt8() *int8
 	// GetValueInt16 returns ValueInt16 (property field)
@@ -82,24 +84,22 @@ type BACnetTagPayloadSignedInteger interface {
 
 // _BACnetTagPayloadSignedInteger is the data-structure of this message
 type _BACnetTagPayloadSignedInteger struct {
-	ValueInt8  *int8
-	ValueInt16 *int16
-	ValueInt24 *int32
-	ValueInt32 *int32
-	ValueInt40 *int64
-	ValueInt48 *int64
-	ValueInt56 *int64
-	ValueInt64 *int64
-
-	// Arguments.
 	ActualLength uint32
+	ValueInt8    *int8
+	ValueInt16   *int16
+	ValueInt24   *int32
+	ValueInt32   *int32
+	ValueInt40   *int64
+	ValueInt48   *int64
+	ValueInt56   *int64
+	ValueInt64   *int64
 }
 
 var _ BACnetTagPayloadSignedInteger = (*_BACnetTagPayloadSignedInteger)(nil)
 
 // NewBACnetTagPayloadSignedInteger factory function for _BACnetTagPayloadSignedInteger
-func NewBACnetTagPayloadSignedInteger(valueInt8 *int8, valueInt16 *int16, valueInt24 *int32, valueInt32 *int32, valueInt40 *int64, valueInt48 *int64, valueInt56 *int64, valueInt64 *int64, actualLength uint32) *_BACnetTagPayloadSignedInteger {
-	return &_BACnetTagPayloadSignedInteger{ValueInt8: valueInt8, ValueInt16: valueInt16, ValueInt24: valueInt24, ValueInt32: valueInt32, ValueInt40: valueInt40, ValueInt48: valueInt48, ValueInt56: valueInt56, ValueInt64: valueInt64, ActualLength: actualLength}
+func NewBACnetTagPayloadSignedInteger(actualLength uint32, valueInt8 *int8, valueInt16 *int16, valueInt24 *int32, valueInt32 *int32, valueInt40 *int64, valueInt48 *int64, valueInt56 *int64, valueInt64 *int64) *_BACnetTagPayloadSignedInteger {
+	return &_BACnetTagPayloadSignedInteger{ActualLength: actualLength, ValueInt8: valueInt8, ValueInt16: valueInt16, ValueInt24: valueInt24, ValueInt32: valueInt32, ValueInt40: valueInt40, ValueInt48: valueInt48, ValueInt56: valueInt56, ValueInt64: valueInt64}
 }
 
 ///////////////////////////////////////////////////////////
@@ -111,7 +111,9 @@ func NewBACnetTagPayloadSignedInteger(valueInt8 *int8, valueInt16 *int16, valueI
 type BACnetTagPayloadSignedIntegerBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
-	WithMandatoryFields() BACnetTagPayloadSignedIntegerBuilder
+	WithMandatoryFields(actualLength uint32) BACnetTagPayloadSignedIntegerBuilder
+	// WithActualLength adds ActualLength (property field)
+	WithActualLength(uint32) BACnetTagPayloadSignedIntegerBuilder
 	// WithValueInt8 adds ValueInt8 (property field)
 	WithOptionalValueInt8(int8) BACnetTagPayloadSignedIntegerBuilder
 	// WithValueInt16 adds ValueInt16 (property field)
@@ -128,8 +130,6 @@ type BACnetTagPayloadSignedIntegerBuilder interface {
 	WithOptionalValueInt56(int64) BACnetTagPayloadSignedIntegerBuilder
 	// WithValueInt64 adds ValueInt64 (property field)
 	WithOptionalValueInt64(int64) BACnetTagPayloadSignedIntegerBuilder
-	// WithArgActualLength sets a parser argument
-	WithArgActualLength(uint32) BACnetTagPayloadSignedIntegerBuilder
 	// Build builds the BACnetTagPayloadSignedInteger or returns an error if something is wrong
 	Build() (BACnetTagPayloadSignedInteger, error)
 	// MustBuild does the same as Build but panics on error
@@ -149,7 +149,12 @@ type _BACnetTagPayloadSignedIntegerBuilder struct {
 
 var _ (BACnetTagPayloadSignedIntegerBuilder) = (*_BACnetTagPayloadSignedIntegerBuilder)(nil)
 
-func (b *_BACnetTagPayloadSignedIntegerBuilder) WithMandatoryFields() BACnetTagPayloadSignedIntegerBuilder {
+func (b *_BACnetTagPayloadSignedIntegerBuilder) WithMandatoryFields(actualLength uint32) BACnetTagPayloadSignedIntegerBuilder {
+	return b.WithActualLength(actualLength)
+}
+
+func (b *_BACnetTagPayloadSignedIntegerBuilder) WithActualLength(actualLength uint32) BACnetTagPayloadSignedIntegerBuilder {
+	b.ActualLength = actualLength
 	return b
 }
 
@@ -193,11 +198,6 @@ func (b *_BACnetTagPayloadSignedIntegerBuilder) WithOptionalValueInt64(valueInt6
 	return b
 }
 
-func (b *_BACnetTagPayloadSignedIntegerBuilder) WithArgActualLength(actualLength uint32) BACnetTagPayloadSignedIntegerBuilder {
-	b.ActualLength = actualLength
-	return b
-}
-
 func (b *_BACnetTagPayloadSignedIntegerBuilder) Build() (BACnetTagPayloadSignedInteger, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -239,6 +239,10 @@ func (b *_BACnetTagPayloadSignedInteger) CreateBACnetTagPayloadSignedIntegerBuil
 /////////////////////// Accessors for property fields.
 ///////////////////////
 
+func (m *_BACnetTagPayloadSignedInteger) GetActualLength() uint32 {
+	return m.ActualLength
+}
+
 func (m *_BACnetTagPayloadSignedInteger) GetValueInt8() *int8 {
 	return m.ValueInt8
 }
@@ -589,7 +593,7 @@ func BACnetTagPayloadSignedIntegerParseWithBufferProducer(actualLength uint32) f
 }
 
 func BACnetTagPayloadSignedIntegerParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, actualLength uint32) (BACnetTagPayloadSignedInteger, error) {
-	v, err := (&_BACnetTagPayloadSignedInteger{ActualLength: actualLength}).parse(ctx, readBuffer, actualLength)
+	v, err := (new(_BACnetTagPayloadSignedInteger)).parse(ctx, readBuffer, actualLength)
 	if err != nil {
 		return nil, err
 	}
@@ -604,6 +608,7 @@ func (m *_BACnetTagPayloadSignedInteger) parse(ctx context.Context, readBuffer u
 	}
 	currentPos := positionAware.GetPos()
 	_ = currentPos
+	m.ActualLength = actualLength
 
 	isInt8, err := ReadVirtualField[bool](ctx, "isInt8", (*bool)(nil), bool((actualLength) == (1)))
 	if err != nil {
@@ -848,16 +853,6 @@ func (m *_BACnetTagPayloadSignedInteger) SerializeWithWriteBuffer(ctx context.Co
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetTagPayloadSignedInteger) GetActualLength() uint32 {
-	return m.ActualLength
-}
-
-//
-////
-
 func (m *_BACnetTagPayloadSignedInteger) IsBACnetTagPayloadSignedInteger() {}
 
 func (m *_BACnetTagPayloadSignedInteger) DeepCopy() any {
@@ -869,6 +864,7 @@ func (m *_BACnetTagPayloadSignedInteger) deepCopy() *_BACnetTagPayloadSignedInte
 		return nil
 	}
 	_BACnetTagPayloadSignedIntegerCopy := &_BACnetTagPayloadSignedInteger{
+		m.ActualLength,
 		utils.CopyPtr[int8](m.ValueInt8),
 		utils.CopyPtr[int16](m.ValueInt16),
 		utils.CopyPtr[int32](m.ValueInt24),
@@ -877,7 +873,6 @@ func (m *_BACnetTagPayloadSignedInteger) deepCopy() *_BACnetTagPayloadSignedInte
 		utils.CopyPtr[int64](m.ValueInt48),
 		utils.CopyPtr[int64](m.ValueInt56),
 		utils.CopyPtr[int64](m.ValueInt64),
-		m.ActualLength,
 	}
 	return _BACnetTagPayloadSignedIntegerCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadTime.go
index 8e189eaf286..3a363c1db56 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadTime.go
@@ -299,7 +299,7 @@ func BACnetTagPayloadTimeParseWithBufferProducer() func(ctx context.Context, rea
 }
 
 func BACnetTagPayloadTimeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetTagPayloadTime, error) {
-	v, err := (&_BACnetTagPayloadTime{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetTagPayloadTime)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go
index bd86fa6ab4e..5a76cef7c31 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go
@@ -40,6 +40,8 @@ type BACnetTagPayloadUnsignedInteger interface {
 	utils.LengthAware
 	utils.Serializable
 	utils.Copyable
+	// GetActualLength returns ActualLength (property field)
+	GetActualLength() uint32
 	// GetValueUint8 returns ValueUint8 (property field)
 	GetValueUint8() *uint8
 	// GetValueUint16 returns ValueUint16 (property field)
@@ -82,24 +84,22 @@ type BACnetTagPayloadUnsignedInteger interface {
 
 // _BACnetTagPayloadUnsignedInteger is the data-structure of this message
 type _BACnetTagPayloadUnsignedInteger struct {
-	ValueUint8  *uint8
-	ValueUint16 *uint16
-	ValueUint24 *uint32
-	ValueUint32 *uint32
-	ValueUint40 *uint64
-	ValueUint48 *uint64
-	ValueUint56 *uint64
-	ValueUint64 *uint64
-
-	// Arguments.
 	ActualLength uint32
+	ValueUint8   *uint8
+	ValueUint16  *uint16
+	ValueUint24  *uint32
+	ValueUint32  *uint32
+	ValueUint40  *uint64
+	ValueUint48  *uint64
+	ValueUint56  *uint64
+	ValueUint64  *uint64
 }
 
 var _ BACnetTagPayloadUnsignedInteger = (*_BACnetTagPayloadUnsignedInteger)(nil)
 
 // NewBACnetTagPayloadUnsignedInteger factory function for _BACnetTagPayloadUnsignedInteger
-func NewBACnetTagPayloadUnsignedInteger(valueUint8 *uint8, valueUint16 *uint16, valueUint24 *uint32, valueUint32 *uint32, valueUint40 *uint64, valueUint48 *uint64, valueUint56 *uint64, valueUint64 *uint64, actualLength uint32) *_BACnetTagPayloadUnsignedInteger {
-	return &_BACnetTagPayloadUnsignedInteger{ValueUint8: valueUint8, ValueUint16: valueUint16, ValueUint24: valueUint24, ValueUint32: valueUint32, ValueUint40: valueUint40, ValueUint48: valueUint48, ValueUint56: valueUint56, ValueUint64: valueUint64, ActualLength: actualLength}
+func NewBACnetTagPayloadUnsignedInteger(actualLength uint32, valueUint8 *uint8, valueUint16 *uint16, valueUint24 *uint32, valueUint32 *uint32, valueUint40 *uint64, valueUint48 *uint64, valueUint56 *uint64, valueUint64 *uint64) *_BACnetTagPayloadUnsignedInteger {
+	return &_BACnetTagPayloadUnsignedInteger{ActualLength: actualLength, ValueUint8: valueUint8, ValueUint16: valueUint16, ValueUint24: valueUint24, ValueUint32: valueUint32, ValueUint40: valueUint40, ValueUint48: valueUint48, ValueUint56: valueUint56, ValueUint64: valueUint64}
 }
 
 ///////////////////////////////////////////////////////////
@@ -111,7 +111,9 @@ func NewBACnetTagPayloadUnsignedInteger(valueUint8 *uint8, valueUint16 *uint16,
 type BACnetTagPayloadUnsignedIntegerBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
-	WithMandatoryFields() BACnetTagPayloadUnsignedIntegerBuilder
+	WithMandatoryFields(actualLength uint32) BACnetTagPayloadUnsignedIntegerBuilder
+	// WithActualLength adds ActualLength (property field)
+	WithActualLength(uint32) BACnetTagPayloadUnsignedIntegerBuilder
 	// WithValueUint8 adds ValueUint8 (property field)
 	WithOptionalValueUint8(uint8) BACnetTagPayloadUnsignedIntegerBuilder
 	// WithValueUint16 adds ValueUint16 (property field)
@@ -128,8 +130,6 @@ type BACnetTagPayloadUnsignedIntegerBuilder interface {
 	WithOptionalValueUint56(uint64) BACnetTagPayloadUnsignedIntegerBuilder
 	// WithValueUint64 adds ValueUint64 (property field)
 	WithOptionalValueUint64(uint64) BACnetTagPayloadUnsignedIntegerBuilder
-	// WithArgActualLength sets a parser argument
-	WithArgActualLength(uint32) BACnetTagPayloadUnsignedIntegerBuilder
 	// Build builds the BACnetTagPayloadUnsignedInteger or returns an error if something is wrong
 	Build() (BACnetTagPayloadUnsignedInteger, error)
 	// MustBuild does the same as Build but panics on error
@@ -149,7 +149,12 @@ type _BACnetTagPayloadUnsignedIntegerBuilder struct {
 
 var _ (BACnetTagPayloadUnsignedIntegerBuilder) = (*_BACnetTagPayloadUnsignedIntegerBuilder)(nil)
 
-func (b *_BACnetTagPayloadUnsignedIntegerBuilder) WithMandatoryFields() BACnetTagPayloadUnsignedIntegerBuilder {
+func (b *_BACnetTagPayloadUnsignedIntegerBuilder) WithMandatoryFields(actualLength uint32) BACnetTagPayloadUnsignedIntegerBuilder {
+	return b.WithActualLength(actualLength)
+}
+
+func (b *_BACnetTagPayloadUnsignedIntegerBuilder) WithActualLength(actualLength uint32) BACnetTagPayloadUnsignedIntegerBuilder {
+	b.ActualLength = actualLength
 	return b
 }
 
@@ -193,11 +198,6 @@ func (b *_BACnetTagPayloadUnsignedIntegerBuilder) WithOptionalValueUint64(valueU
 	return b
 }
 
-func (b *_BACnetTagPayloadUnsignedIntegerBuilder) WithArgActualLength(actualLength uint32) BACnetTagPayloadUnsignedIntegerBuilder {
-	b.ActualLength = actualLength
-	return b
-}
-
 func (b *_BACnetTagPayloadUnsignedIntegerBuilder) Build() (BACnetTagPayloadUnsignedInteger, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -239,6 +239,10 @@ func (b *_BACnetTagPayloadUnsignedInteger) CreateBACnetTagPayloadUnsignedInteger
 /////////////////////// Accessors for property fields.
 ///////////////////////
 
+func (m *_BACnetTagPayloadUnsignedInteger) GetActualLength() uint32 {
+	return m.ActualLength
+}
+
 func (m *_BACnetTagPayloadUnsignedInteger) GetValueUint8() *uint8 {
 	return m.ValueUint8
 }
@@ -589,7 +593,7 @@ func BACnetTagPayloadUnsignedIntegerParseWithBufferProducer(actualLength uint32)
 }
 
 func BACnetTagPayloadUnsignedIntegerParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, actualLength uint32) (BACnetTagPayloadUnsignedInteger, error) {
-	v, err := (&_BACnetTagPayloadUnsignedInteger{ActualLength: actualLength}).parse(ctx, readBuffer, actualLength)
+	v, err := (new(_BACnetTagPayloadUnsignedInteger)).parse(ctx, readBuffer, actualLength)
 	if err != nil {
 		return nil, err
 	}
@@ -604,6 +608,7 @@ func (m *_BACnetTagPayloadUnsignedInteger) parse(ctx context.Context, readBuffer
 	}
 	currentPos := positionAware.GetPos()
 	_ = currentPos
+	m.ActualLength = actualLength
 
 	isUint8, err := ReadVirtualField[bool](ctx, "isUint8", (*bool)(nil), bool((actualLength) == (1)))
 	if err != nil {
@@ -848,16 +853,6 @@ func (m *_BACnetTagPayloadUnsignedInteger) SerializeWithWriteBuffer(ctx context.
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetTagPayloadUnsignedInteger) GetActualLength() uint32 {
-	return m.ActualLength
-}
-
-//
-////
-
 func (m *_BACnetTagPayloadUnsignedInteger) IsBACnetTagPayloadUnsignedInteger() {}
 
 func (m *_BACnetTagPayloadUnsignedInteger) DeepCopy() any {
@@ -869,6 +864,7 @@ func (m *_BACnetTagPayloadUnsignedInteger) deepCopy() *_BACnetTagPayloadUnsigned
 		return nil
 	}
 	_BACnetTagPayloadUnsignedIntegerCopy := &_BACnetTagPayloadUnsignedInteger{
+		m.ActualLength,
 		utils.CopyPtr[uint8](m.ValueUint8),
 		utils.CopyPtr[uint16](m.ValueUint16),
 		utils.CopyPtr[uint32](m.ValueUint24),
@@ -877,7 +873,6 @@ func (m *_BACnetTagPayloadUnsignedInteger) deepCopy() *_BACnetTagPayloadUnsigned
 		utils.CopyPtr[uint64](m.ValueUint48),
 		utils.CopyPtr[uint64](m.ValueUint56),
 		utils.CopyPtr[uint64](m.ValueUint64),
-		m.ActualLength,
 	}
 	return _BACnetTagPayloadUnsignedIntegerCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStamp.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStamp.go
index f2963b5b7e7..44fa9f835af 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStamp.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStamp.go
@@ -325,7 +325,7 @@ func BACnetTimeStampParseWithBufferProducer[T BACnetTimeStamp]() func(ctx contex
 }
 
 func BACnetTimeStampParseWithBuffer[T BACnetTimeStamp](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetTimeStamp{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetTimeStamp)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampEnclosed.go
index 82d3a1468b6..ea4beea2c80 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampEnclosed.go
@@ -57,15 +57,12 @@ type _BACnetTimeStampEnclosed struct {
 	OpeningTag BACnetOpeningTag
 	Timestamp  BACnetTimeStamp
 	ClosingTag BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetTimeStampEnclosed = (*_BACnetTimeStampEnclosed)(nil)
 
 // NewBACnetTimeStampEnclosed factory function for _BACnetTimeStampEnclosed
-func NewBACnetTimeStampEnclosed(openingTag BACnetOpeningTag, timestamp BACnetTimeStamp, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetTimeStampEnclosed {
+func NewBACnetTimeStampEnclosed(openingTag BACnetOpeningTag, timestamp BACnetTimeStamp, closingTag BACnetClosingTag) *_BACnetTimeStampEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetTimeStampEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewBACnetTimeStampEnclosed(openingTag BACnetOpeningTag, timestamp BACnetTim
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetTimeStampEnclosed must not be nil")
 	}
-	return &_BACnetTimeStampEnclosed{OpeningTag: openingTag, Timestamp: timestamp, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetTimeStampEnclosed{OpeningTag: openingTag, Timestamp: timestamp, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type BACnetTimeStampEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetTimeStampEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetTimeStampEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetTimeStampEnclosedBuilder
 	// Build builds the BACnetTimeStampEnclosed or returns an error if something is wrong
 	Build() (BACnetTimeStampEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_BACnetTimeStampEnclosedBuilder) WithClosingTagBuilder(builderSupplier
 	return b
 }
 
-func (b *_BACnetTimeStampEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetTimeStampEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetTimeStampEnclosedBuilder) Build() (BACnetTimeStampEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func BACnetTimeStampEnclosedParseWithBufferProducer(tagNumber uint8) func(ctx co
 }
 
 func BACnetTimeStampEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetTimeStampEnclosed, error) {
-	v, err := (&_BACnetTimeStampEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetTimeStampEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_BACnetTimeStampEnclosed) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetTimeStampEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetTimeStampEnclosed) IsBACnetTimeStampEnclosed() {}
 
 func (m *_BACnetTimeStampEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_BACnetTimeStampEnclosed) deepCopy() *_BACnetTimeStampEnclosed {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[BACnetTimeStamp](m.Timestamp),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetTimeStampEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampsEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampsEnclosed.go
index 08c865abf94..536bf3e0ffa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampsEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampsEnclosed.go
@@ -57,22 +57,19 @@ type _BACnetTimeStampsEnclosed struct {
 	OpeningTag BACnetOpeningTag
 	Timestamps []BACnetTimeStamp
 	ClosingTag BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ BACnetTimeStampsEnclosed = (*_BACnetTimeStampsEnclosed)(nil)
 
 // NewBACnetTimeStampsEnclosed factory function for _BACnetTimeStampsEnclosed
-func NewBACnetTimeStampsEnclosed(openingTag BACnetOpeningTag, timestamps []BACnetTimeStamp, closingTag BACnetClosingTag, tagNumber uint8) *_BACnetTimeStampsEnclosed {
+func NewBACnetTimeStampsEnclosed(openingTag BACnetOpeningTag, timestamps []BACnetTimeStamp, closingTag BACnetClosingTag) *_BACnetTimeStampsEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for BACnetTimeStampsEnclosed must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for BACnetTimeStampsEnclosed must not be nil")
 	}
-	return &_BACnetTimeStampsEnclosed{OpeningTag: openingTag, Timestamps: timestamps, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_BACnetTimeStampsEnclosed{OpeningTag: openingTag, Timestamps: timestamps, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type BACnetTimeStampsEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) BACnetTimeStampsEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) BACnetTimeStampsEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetTimeStampsEnclosedBuilder
 	// Build builds the BACnetTimeStampsEnclosed or returns an error if something is wrong
 	Build() (BACnetTimeStampsEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_BACnetTimeStampsEnclosedBuilder) WithClosingTagBuilder(builderSupplier
 	return b
 }
 
-func (b *_BACnetTimeStampsEnclosedBuilder) WithArgTagNumber(tagNumber uint8) BACnetTimeStampsEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_BACnetTimeStampsEnclosedBuilder) Build() (BACnetTimeStampsEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func BACnetTimeStampsEnclosedParseWithBufferProducer(tagNumber uint8) func(ctx c
 }
 
 func BACnetTimeStampsEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (BACnetTimeStampsEnclosed, error) {
-	v, err := (&_BACnetTimeStampsEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_BACnetTimeStampsEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_BACnetTimeStampsEnclosed) SerializeWithWriteBuffer(ctx context.Context
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetTimeStampsEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_BACnetTimeStampsEnclosed) IsBACnetTimeStampsEnclosed() {}
 
 func (m *_BACnetTimeStampsEnclosed) DeepCopy() any {
@@ -373,7 +353,6 @@ func (m *_BACnetTimeStampsEnclosed) deepCopy() *_BACnetTimeStampsEnclosed {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetTimeStamp, BACnetTimeStamp](m.Timestamps),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _BACnetTimeStampsEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeValue.go
index 3f3916ed764..4590f44d6f0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeValue.go
@@ -242,7 +242,7 @@ func BACnetTimeValueParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func BACnetTimeValueParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetTimeValue, error) {
-	v, err := (&_BACnetTimeValue{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetTimeValue)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValue.go
index 5791cb9b904..e2518fc69b2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValue.go
@@ -56,8 +56,6 @@ type BACnetTimerStateChangeValueContract interface {
 	GetPeekedTagNumber() uint8
 	// GetPeekedIsContextTag returns PeekedIsContextTag (virtual field)
 	GetPeekedIsContextTag() bool
-	// GetObjectTypeArgument() returns a parser argument
-	GetObjectTypeArgument() BACnetObjectType
 	// IsBACnetTimerStateChangeValue is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetTimerStateChangeValue()
 	// CreateBuilder creates a BACnetTimerStateChangeValueBuilder
@@ -81,19 +79,16 @@ type _BACnetTimerStateChangeValue struct {
 		BACnetTimerStateChangeValueRequirements
 	}
 	PeekedTagHeader BACnetTagHeader
-
-	// Arguments.
-	ObjectTypeArgument BACnetObjectType
 }
 
 var _ BACnetTimerStateChangeValueContract = (*_BACnetTimerStateChangeValue)(nil)
 
 // NewBACnetTimerStateChangeValue factory function for _BACnetTimerStateChangeValue
-func NewBACnetTimerStateChangeValue(peekedTagHeader BACnetTagHeader, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValue {
+func NewBACnetTimerStateChangeValue(peekedTagHeader BACnetTagHeader) *_BACnetTimerStateChangeValue {
 	if peekedTagHeader == nil {
 		panic("peekedTagHeader of type BACnetTagHeader for BACnetTimerStateChangeValue must not be nil")
 	}
-	return &_BACnetTimerStateChangeValue{PeekedTagHeader: peekedTagHeader, ObjectTypeArgument: objectTypeArgument}
+	return &_BACnetTimerStateChangeValue{PeekedTagHeader: peekedTagHeader}
 }
 
 ///////////////////////////////////////////////////////////
@@ -110,8 +105,6 @@ type BACnetTimerStateChangeValueBuilder interface {
 	WithPeekedTagHeader(BACnetTagHeader) BACnetTimerStateChangeValueBuilder
 	// WithPeekedTagHeaderBuilder adds PeekedTagHeader (property field) which is build by the builder
 	WithPeekedTagHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetTimerStateChangeValueBuilder
-	// WithArgObjectTypeArgument sets a parser argument
-	WithArgObjectTypeArgument(BACnetObjectType) BACnetTimerStateChangeValueBuilder
 	// AsBACnetTimerStateChangeValueNull converts this build to a subType of BACnetTimerStateChangeValue. It is always possible to return to current builder using Done()
 	AsBACnetTimerStateChangeValueNull() BACnetTimerStateChangeValueNullBuilder
 	// AsBACnetTimerStateChangeValueBoolean converts this build to a subType of BACnetTimerStateChangeValue. It is always possible to return to current builder using Done()
@@ -196,11 +189,6 @@ func (b *_BACnetTimerStateChangeValueBuilder) WithPeekedTagHeaderBuilder(builder
 	return b
 }
 
-func (b *_BACnetTimerStateChangeValueBuilder) WithArgObjectTypeArgument(objectTypeArgument BACnetObjectType) BACnetTimerStateChangeValueBuilder {
-	b.ObjectTypeArgument = objectTypeArgument
-	return b
-}
-
 func (b *_BACnetTimerStateChangeValueBuilder) PartialBuild() (BACnetTimerStateChangeValueContract, error) {
 	if b.PeekedTagHeader == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'peekedTagHeader' not set"))
@@ -518,7 +506,7 @@ func BACnetTimerStateChangeValueParseWithBufferProducer[T BACnetTimerStateChange
 }
 
 func BACnetTimerStateChangeValueParseWithBuffer[T BACnetTimerStateChangeValue](ctx context.Context, readBuffer utils.ReadBuffer, objectTypeArgument BACnetObjectType) (T, error) {
-	v, err := (&_BACnetTimerStateChangeValue{ObjectTypeArgument: objectTypeArgument}).parse(ctx, readBuffer, objectTypeArgument)
+	v, err := (new(_BACnetTimerStateChangeValue)).parse(ctx, readBuffer, objectTypeArgument)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -680,16 +668,6 @@ func (pm *_BACnetTimerStateChangeValue) serializeParent(ctx context.Context, wri
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetTimerStateChangeValue) GetObjectTypeArgument() BACnetObjectType {
-	return m.ObjectTypeArgument
-}
-
-//
-////
-
 func (m *_BACnetTimerStateChangeValue) IsBACnetTimerStateChangeValue() {}
 
 func (m *_BACnetTimerStateChangeValue) DeepCopy() any {
@@ -703,7 +681,6 @@ func (m *_BACnetTimerStateChangeValue) deepCopy() *_BACnetTimerStateChangeValue
 	_BACnetTimerStateChangeValueCopy := &_BACnetTimerStateChangeValue{
 		nil, // will be set by child
 		utils.DeepCopy[BACnetTagHeader](m.PeekedTagHeader),
-		m.ObjectTypeArgument,
 	}
 	return _BACnetTimerStateChangeValueCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBitString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBitString.go
index 5ee03a78d4a..0ea9c418281 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBitString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBitString.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueBitString = (*_BACnetTimerStateChangeValueBitSt
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueBitString)(nil)
 
 // NewBACnetTimerStateChangeValueBitString factory function for _BACnetTimerStateChangeValueBitString
-func NewBACnetTimerStateChangeValueBitString(peekedTagHeader BACnetTagHeader, bitStringValue BACnetApplicationTagBitString, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueBitString {
+func NewBACnetTimerStateChangeValueBitString(peekedTagHeader BACnetTagHeader, bitStringValue BACnetApplicationTagBitString) *_BACnetTimerStateChangeValueBitString {
 	if bitStringValue == nil {
 		panic("bitStringValue of type BACnetApplicationTagBitString for BACnetTimerStateChangeValueBitString must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueBitString{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		BitStringValue:                      bitStringValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBoolean.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBoolean.go
index 74a37d46e9b..70d6065b0ad 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBoolean.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBoolean.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueBoolean = (*_BACnetTimerStateChangeValueBoolean
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueBoolean)(nil)
 
 // NewBACnetTimerStateChangeValueBoolean factory function for _BACnetTimerStateChangeValueBoolean
-func NewBACnetTimerStateChangeValueBoolean(peekedTagHeader BACnetTagHeader, booleanValue BACnetApplicationTagBoolean, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueBoolean {
+func NewBACnetTimerStateChangeValueBoolean(peekedTagHeader BACnetTagHeader, booleanValue BACnetApplicationTagBoolean) *_BACnetTimerStateChangeValueBoolean {
 	if booleanValue == nil {
 		panic("booleanValue of type BACnetApplicationTagBoolean for BACnetTimerStateChangeValueBoolean must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueBoolean{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		BooleanValue:                        booleanValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueCharacterString.go
index 872b5c2ba9a..6f2038da605 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueCharacterString.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueCharacterString = (*_BACnetTimerStateChangeValu
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueCharacterString)(nil)
 
 // NewBACnetTimerStateChangeValueCharacterString factory function for _BACnetTimerStateChangeValueCharacterString
-func NewBACnetTimerStateChangeValueCharacterString(peekedTagHeader BACnetTagHeader, characterStringValue BACnetApplicationTagCharacterString, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueCharacterString {
+func NewBACnetTimerStateChangeValueCharacterString(peekedTagHeader BACnetTagHeader, characterStringValue BACnetApplicationTagCharacterString) *_BACnetTimerStateChangeValueCharacterString {
 	if characterStringValue == nil {
 		panic("characterStringValue of type BACnetApplicationTagCharacterString for BACnetTimerStateChangeValueCharacterString must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueCharacterString{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		CharacterStringValue:                characterStringValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueConstructedValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueConstructedValue.go
index 575f68001ad..26d9cbd509b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueConstructedValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueConstructedValue.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueConstructedValue = (*_BACnetTimerStateChangeVal
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueConstructedValue)(nil)
 
 // NewBACnetTimerStateChangeValueConstructedValue factory function for _BACnetTimerStateChangeValueConstructedValue
-func NewBACnetTimerStateChangeValueConstructedValue(peekedTagHeader BACnetTagHeader, constructedValue BACnetConstructedData, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueConstructedValue {
+func NewBACnetTimerStateChangeValueConstructedValue(peekedTagHeader BACnetTagHeader, constructedValue BACnetConstructedData) *_BACnetTimerStateChangeValueConstructedValue {
 	if constructedValue == nil {
 		panic("constructedValue of type BACnetConstructedData for BACnetTimerStateChangeValueConstructedValue must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueConstructedValue{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		ConstructedValue:                    constructedValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDate.go
index e15529996e6..3446b44c406 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDate.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueDate = (*_BACnetTimerStateChangeValueDate)(nil)
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueDate)(nil)
 
 // NewBACnetTimerStateChangeValueDate factory function for _BACnetTimerStateChangeValueDate
-func NewBACnetTimerStateChangeValueDate(peekedTagHeader BACnetTagHeader, dateValue BACnetApplicationTagDate, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueDate {
+func NewBACnetTimerStateChangeValueDate(peekedTagHeader BACnetTagHeader, dateValue BACnetApplicationTagDate) *_BACnetTimerStateChangeValueDate {
 	if dateValue == nil {
 		panic("dateValue of type BACnetApplicationTagDate for BACnetTimerStateChangeValueDate must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueDate{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		DateValue:                           dateValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDateTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDateTime.go
index ff97c0d4df8..cfccf4f6057 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDateTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDateTime.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueDateTime = (*_BACnetTimerStateChangeValueDateTi
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueDateTime)(nil)
 
 // NewBACnetTimerStateChangeValueDateTime factory function for _BACnetTimerStateChangeValueDateTime
-func NewBACnetTimerStateChangeValueDateTime(peekedTagHeader BACnetTagHeader, dateTimeValue BACnetDateTimeEnclosed, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueDateTime {
+func NewBACnetTimerStateChangeValueDateTime(peekedTagHeader BACnetTagHeader, dateTimeValue BACnetDateTimeEnclosed) *_BACnetTimerStateChangeValueDateTime {
 	if dateTimeValue == nil {
 		panic("dateTimeValue of type BACnetDateTimeEnclosed for BACnetTimerStateChangeValueDateTime must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueDateTime{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		DateTimeValue:                       dateTimeValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDouble.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDouble.go
index 4f7b9390abe..f310c87238e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDouble.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDouble.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueDouble = (*_BACnetTimerStateChangeValueDouble)(
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueDouble)(nil)
 
 // NewBACnetTimerStateChangeValueDouble factory function for _BACnetTimerStateChangeValueDouble
-func NewBACnetTimerStateChangeValueDouble(peekedTagHeader BACnetTagHeader, doubleValue BACnetApplicationTagDouble, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueDouble {
+func NewBACnetTimerStateChangeValueDouble(peekedTagHeader BACnetTagHeader, doubleValue BACnetApplicationTagDouble) *_BACnetTimerStateChangeValueDouble {
 	if doubleValue == nil {
 		panic("doubleValue of type BACnetApplicationTagDouble for BACnetTimerStateChangeValueDouble must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueDouble{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		DoubleValue:                         doubleValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueEnumerated.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueEnumerated.go
index dab65d7cc32..82c796f2f11 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueEnumerated.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueEnumerated.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueEnumerated = (*_BACnetTimerStateChangeValueEnum
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueEnumerated)(nil)
 
 // NewBACnetTimerStateChangeValueEnumerated factory function for _BACnetTimerStateChangeValueEnumerated
-func NewBACnetTimerStateChangeValueEnumerated(peekedTagHeader BACnetTagHeader, enumeratedValue BACnetApplicationTagEnumerated, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueEnumerated {
+func NewBACnetTimerStateChangeValueEnumerated(peekedTagHeader BACnetTagHeader, enumeratedValue BACnetApplicationTagEnumerated) *_BACnetTimerStateChangeValueEnumerated {
 	if enumeratedValue == nil {
 		panic("enumeratedValue of type BACnetApplicationTagEnumerated for BACnetTimerStateChangeValueEnumerated must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueEnumerated{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		EnumeratedValue:                     enumeratedValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueInteger.go
index e94fabd5100..cc405110c51 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueInteger.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueInteger = (*_BACnetTimerStateChangeValueInteger
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueInteger)(nil)
 
 // NewBACnetTimerStateChangeValueInteger factory function for _BACnetTimerStateChangeValueInteger
-func NewBACnetTimerStateChangeValueInteger(peekedTagHeader BACnetTagHeader, integerValue BACnetApplicationTagSignedInteger, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueInteger {
+func NewBACnetTimerStateChangeValueInteger(peekedTagHeader BACnetTagHeader, integerValue BACnetApplicationTagSignedInteger) *_BACnetTimerStateChangeValueInteger {
 	if integerValue == nil {
 		panic("integerValue of type BACnetApplicationTagSignedInteger for BACnetTimerStateChangeValueInteger must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueInteger{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		IntegerValue:                        integerValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueLightingCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueLightingCommand.go
index eb427a833c1..fcbd520f0e3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueLightingCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueLightingCommand.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueLightingCommand = (*_BACnetTimerStateChangeValu
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueLightingCommand)(nil)
 
 // NewBACnetTimerStateChangeValueLightingCommand factory function for _BACnetTimerStateChangeValueLightingCommand
-func NewBACnetTimerStateChangeValueLightingCommand(peekedTagHeader BACnetTagHeader, ligthingCommandValue BACnetLightingCommandEnclosed, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueLightingCommand {
+func NewBACnetTimerStateChangeValueLightingCommand(peekedTagHeader BACnetTagHeader, ligthingCommandValue BACnetLightingCommandEnclosed) *_BACnetTimerStateChangeValueLightingCommand {
 	if ligthingCommandValue == nil {
 		panic("ligthingCommandValue of type BACnetLightingCommandEnclosed for BACnetTimerStateChangeValueLightingCommand must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueLightingCommand{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		LigthingCommandValue:                ligthingCommandValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNoValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNoValue.go
index 72fca5c7a0e..ee341c45f6a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNoValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNoValue.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueNoValue = (*_BACnetTimerStateChangeValueNoValue
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueNoValue)(nil)
 
 // NewBACnetTimerStateChangeValueNoValue factory function for _BACnetTimerStateChangeValueNoValue
-func NewBACnetTimerStateChangeValueNoValue(peekedTagHeader BACnetTagHeader, noValue BACnetContextTagNull, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueNoValue {
+func NewBACnetTimerStateChangeValueNoValue(peekedTagHeader BACnetTagHeader, noValue BACnetContextTagNull) *_BACnetTimerStateChangeValueNoValue {
 	if noValue == nil {
 		panic("noValue of type BACnetContextTagNull for BACnetTimerStateChangeValueNoValue must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueNoValue{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		NoValue:                             noValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNull.go
index d94caae3fea..4ef51956a4d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNull.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueNull = (*_BACnetTimerStateChangeValueNull)(nil)
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueNull)(nil)
 
 // NewBACnetTimerStateChangeValueNull factory function for _BACnetTimerStateChangeValueNull
-func NewBACnetTimerStateChangeValueNull(peekedTagHeader BACnetTagHeader, nullValue BACnetApplicationTagNull, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueNull {
+func NewBACnetTimerStateChangeValueNull(peekedTagHeader BACnetTagHeader, nullValue BACnetApplicationTagNull) *_BACnetTimerStateChangeValueNull {
 	if nullValue == nil {
 		panic("nullValue of type BACnetApplicationTagNull for BACnetTimerStateChangeValueNull must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueNull{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		NullValue:                           nullValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueObjectidentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueObjectidentifier.go
index 377c6d37736..83759f7b123 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueObjectidentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueObjectidentifier.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueObjectidentifier = (*_BACnetTimerStateChangeVal
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueObjectidentifier)(nil)
 
 // NewBACnetTimerStateChangeValueObjectidentifier factory function for _BACnetTimerStateChangeValueObjectidentifier
-func NewBACnetTimerStateChangeValueObjectidentifier(peekedTagHeader BACnetTagHeader, objectidentifierValue BACnetApplicationTagObjectIdentifier, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueObjectidentifier {
+func NewBACnetTimerStateChangeValueObjectidentifier(peekedTagHeader BACnetTagHeader, objectidentifierValue BACnetApplicationTagObjectIdentifier) *_BACnetTimerStateChangeValueObjectidentifier {
 	if objectidentifierValue == nil {
 		panic("objectidentifierValue of type BACnetApplicationTagObjectIdentifier for BACnetTimerStateChangeValueObjectidentifier must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueObjectidentifier{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		ObjectidentifierValue:               objectidentifierValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueOctetString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueOctetString.go
index db8d994f47e..4060886aedc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueOctetString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueOctetString.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueOctetString = (*_BACnetTimerStateChangeValueOct
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueOctetString)(nil)
 
 // NewBACnetTimerStateChangeValueOctetString factory function for _BACnetTimerStateChangeValueOctetString
-func NewBACnetTimerStateChangeValueOctetString(peekedTagHeader BACnetTagHeader, octetStringValue BACnetApplicationTagOctetString, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueOctetString {
+func NewBACnetTimerStateChangeValueOctetString(peekedTagHeader BACnetTagHeader, octetStringValue BACnetApplicationTagOctetString) *_BACnetTimerStateChangeValueOctetString {
 	if octetStringValue == nil {
 		panic("octetStringValue of type BACnetApplicationTagOctetString for BACnetTimerStateChangeValueOctetString must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueOctetString{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		OctetStringValue:                    octetStringValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueReal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueReal.go
index 64415366305..c6db55acb39 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueReal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueReal.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueReal = (*_BACnetTimerStateChangeValueReal)(nil)
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueReal)(nil)
 
 // NewBACnetTimerStateChangeValueReal factory function for _BACnetTimerStateChangeValueReal
-func NewBACnetTimerStateChangeValueReal(peekedTagHeader BACnetTagHeader, realValue BACnetApplicationTagReal, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueReal {
+func NewBACnetTimerStateChangeValueReal(peekedTagHeader BACnetTagHeader, realValue BACnetApplicationTagReal) *_BACnetTimerStateChangeValueReal {
 	if realValue == nil {
 		panic("realValue of type BACnetApplicationTagReal for BACnetTimerStateChangeValueReal must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueReal{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		RealValue:                           realValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueTime.go
index b60efb5e819..e2f0cf9df67 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueTime.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueTime = (*_BACnetTimerStateChangeValueTime)(nil)
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueTime)(nil)
 
 // NewBACnetTimerStateChangeValueTime factory function for _BACnetTimerStateChangeValueTime
-func NewBACnetTimerStateChangeValueTime(peekedTagHeader BACnetTagHeader, timeValue BACnetApplicationTagTime, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueTime {
+func NewBACnetTimerStateChangeValueTime(peekedTagHeader BACnetTagHeader, timeValue BACnetApplicationTagTime) *_BACnetTimerStateChangeValueTime {
 	if timeValue == nil {
 		panic("timeValue of type BACnetApplicationTagTime for BACnetTimerStateChangeValueTime must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueTime{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		TimeValue:                           timeValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueUnsigned.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueUnsigned.go
index 17944a1a86a..794af0ffbd7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueUnsigned.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueUnsigned.go
@@ -59,12 +59,12 @@ var _ BACnetTimerStateChangeValueUnsigned = (*_BACnetTimerStateChangeValueUnsign
 var _ BACnetTimerStateChangeValueRequirements = (*_BACnetTimerStateChangeValueUnsigned)(nil)
 
 // NewBACnetTimerStateChangeValueUnsigned factory function for _BACnetTimerStateChangeValueUnsigned
-func NewBACnetTimerStateChangeValueUnsigned(peekedTagHeader BACnetTagHeader, unsignedValue BACnetApplicationTagUnsignedInteger, objectTypeArgument BACnetObjectType) *_BACnetTimerStateChangeValueUnsigned {
+func NewBACnetTimerStateChangeValueUnsigned(peekedTagHeader BACnetTagHeader, unsignedValue BACnetApplicationTagUnsignedInteger) *_BACnetTimerStateChangeValueUnsigned {
 	if unsignedValue == nil {
 		panic("unsignedValue of type BACnetApplicationTagUnsignedInteger for BACnetTimerStateChangeValueUnsigned must not be nil")
 	}
 	_result := &_BACnetTimerStateChangeValueUnsigned{
-		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader, objectTypeArgument),
+		BACnetTimerStateChangeValueContract: NewBACnetTimerStateChangeValue(peekedTagHeader),
 		UnsignedValue:                       unsignedValue,
 	}
 	_result.BACnetTimerStateChangeValueContract.(*_BACnetTimerStateChangeValue)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateTagged.go
index 80a471cd116..1a3d1b89398 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateTagged.go
@@ -54,20 +54,16 @@ type BACnetTimerStateTagged interface {
 type _BACnetTimerStateTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetTimerState
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetTimerStateTagged = (*_BACnetTimerStateTagged)(nil)
 
 // NewBACnetTimerStateTagged factory function for _BACnetTimerStateTagged
-func NewBACnetTimerStateTagged(header BACnetTagHeader, value BACnetTimerState, tagNumber uint8, tagClass TagClass) *_BACnetTimerStateTagged {
+func NewBACnetTimerStateTagged(header BACnetTagHeader, value BACnetTimerState) *_BACnetTimerStateTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetTimerStateTagged must not be nil")
 	}
-	return &_BACnetTimerStateTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetTimerStateTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetTimerStateTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetTimerStateTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetTimerState) BACnetTimerStateTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetTimerStateTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetTimerStateTaggedBuilder
 	// Build builds the BACnetTimerStateTagged or returns an error if something is wrong
 	Build() (BACnetTimerStateTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetTimerStateTaggedBuilder) WithValue(value BACnetTimerState) BACne
 	return b
 }
 
-func (b *_BACnetTimerStateTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetTimerStateTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetTimerStateTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetTimerStateTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetTimerStateTaggedBuilder) Build() (BACnetTimerStateTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetTimerStateTaggedParseWithBufferProducer(tagNumber uint8, tagClass Tag
 }
 
 func BACnetTimerStateTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetTimerStateTagged, error) {
-	v, err := (&_BACnetTimerStateTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetTimerStateTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetTimerStateTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetTimerStateTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetTimerStateTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetTimerStateTagged) IsBACnetTimerStateTagged() {}
 
 func (m *_BACnetTimerStateTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetTimerStateTagged) deepCopy() *_BACnetTimerStateTagged {
 	_BACnetTimerStateTaggedCopy := &_BACnetTimerStateTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetTimerStateTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransitionTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransitionTagged.go
index 66c771425b0..cb02dc71016 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransitionTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransitionTagged.go
@@ -54,20 +54,16 @@ type BACnetTimerTransitionTagged interface {
 type _BACnetTimerTransitionTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetTimerTransition
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetTimerTransitionTagged = (*_BACnetTimerTransitionTagged)(nil)
 
 // NewBACnetTimerTransitionTagged factory function for _BACnetTimerTransitionTagged
-func NewBACnetTimerTransitionTagged(header BACnetTagHeader, value BACnetTimerTransition, tagNumber uint8, tagClass TagClass) *_BACnetTimerTransitionTagged {
+func NewBACnetTimerTransitionTagged(header BACnetTagHeader, value BACnetTimerTransition) *_BACnetTimerTransitionTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetTimerTransitionTagged must not be nil")
 	}
-	return &_BACnetTimerTransitionTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetTimerTransitionTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetTimerTransitionTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetTimerTransitionTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetTimerTransition) BACnetTimerTransitionTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetTimerTransitionTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetTimerTransitionTaggedBuilder
 	// Build builds the BACnetTimerTransitionTagged or returns an error if something is wrong
 	Build() (BACnetTimerTransitionTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetTimerTransitionTaggedBuilder) WithValue(value BACnetTimerTransit
 	return b
 }
 
-func (b *_BACnetTimerTransitionTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetTimerTransitionTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetTimerTransitionTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetTimerTransitionTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetTimerTransitionTaggedBuilder) Build() (BACnetTimerTransitionTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetTimerTransitionTaggedParseWithBufferProducer(tagNumber uint8, tagClas
 }
 
 func BACnetTimerTransitionTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetTimerTransitionTagged, error) {
-	v, err := (&_BACnetTimerTransitionTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetTimerTransitionTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetTimerTransitionTagged) SerializeWithWriteBuffer(ctx context.Cont
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetTimerTransitionTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetTimerTransitionTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetTimerTransitionTagged) IsBACnetTimerTransitionTagged() {}
 
 func (m *_BACnetTimerTransitionTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetTimerTransitionTagged) deepCopy() *_BACnetTimerTransitionTagged
 	_BACnetTimerTransitionTaggedCopy := &_BACnetTimerTransitionTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetTimerTransitionTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoiceTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoiceTagged.go
index 3ef02d20909..b95769e7d77 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoiceTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoiceTagged.go
@@ -54,20 +54,16 @@ type BACnetUnconfirmedServiceChoiceTagged interface {
 type _BACnetUnconfirmedServiceChoiceTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetUnconfirmedServiceChoice
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetUnconfirmedServiceChoiceTagged = (*_BACnetUnconfirmedServiceChoiceTagged)(nil)
 
 // NewBACnetUnconfirmedServiceChoiceTagged factory function for _BACnetUnconfirmedServiceChoiceTagged
-func NewBACnetUnconfirmedServiceChoiceTagged(header BACnetTagHeader, value BACnetUnconfirmedServiceChoice, tagNumber uint8, tagClass TagClass) *_BACnetUnconfirmedServiceChoiceTagged {
+func NewBACnetUnconfirmedServiceChoiceTagged(header BACnetTagHeader, value BACnetUnconfirmedServiceChoice) *_BACnetUnconfirmedServiceChoiceTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetUnconfirmedServiceChoiceTagged must not be nil")
 	}
-	return &_BACnetUnconfirmedServiceChoiceTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetUnconfirmedServiceChoiceTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetUnconfirmedServiceChoiceTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetUnconfirmedServiceChoiceTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetUnconfirmedServiceChoice) BACnetUnconfirmedServiceChoiceTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetUnconfirmedServiceChoiceTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetUnconfirmedServiceChoiceTaggedBuilder
 	// Build builds the BACnetUnconfirmedServiceChoiceTagged or returns an error if something is wrong
 	Build() (BACnetUnconfirmedServiceChoiceTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetUnconfirmedServiceChoiceTaggedBuilder) WithValue(value BACnetUnc
 	return b
 }
 
-func (b *_BACnetUnconfirmedServiceChoiceTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetUnconfirmedServiceChoiceTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetUnconfirmedServiceChoiceTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetUnconfirmedServiceChoiceTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetUnconfirmedServiceChoiceTaggedBuilder) Build() (BACnetUnconfirmedServiceChoiceTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetUnconfirmedServiceChoiceTaggedParseWithBufferProducer(tagNumber uint8
 }
 
 func BACnetUnconfirmedServiceChoiceTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetUnconfirmedServiceChoiceTagged, error) {
-	v, err := (&_BACnetUnconfirmedServiceChoiceTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetUnconfirmedServiceChoiceTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetUnconfirmedServiceChoiceTagged) SerializeWithWriteBuffer(ctx con
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetUnconfirmedServiceChoiceTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetUnconfirmedServiceChoiceTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetUnconfirmedServiceChoiceTagged) IsBACnetUnconfirmedServiceChoiceTagged() {}
 
 func (m *_BACnetUnconfirmedServiceChoiceTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetUnconfirmedServiceChoiceTagged) deepCopy() *_BACnetUnconfirmedSe
 	_BACnetUnconfirmedServiceChoiceTaggedCopy := &_BACnetUnconfirmedServiceChoiceTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetUnconfirmedServiceChoiceTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go
index 0ae40d319ed..6908d86a847 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go
@@ -50,8 +50,6 @@ type BACnetUnconfirmedServiceRequest interface {
 
 // BACnetUnconfirmedServiceRequestContract provides a set of functions which can be overwritten by a sub struct
 type BACnetUnconfirmedServiceRequestContract interface {
-	// GetServiceRequestLength() returns a parser argument
-	GetServiceRequestLength() uint16
 	// IsBACnetUnconfirmedServiceRequest is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsBACnetUnconfirmedServiceRequest()
 	// CreateBuilder creates a BACnetUnconfirmedServiceRequestBuilder
@@ -72,16 +70,13 @@ type _BACnetUnconfirmedServiceRequest struct {
 		BACnetUnconfirmedServiceRequestContract
 		BACnetUnconfirmedServiceRequestRequirements
 	}
-
-	// Arguments.
-	ServiceRequestLength uint16
 }
 
 var _ BACnetUnconfirmedServiceRequestContract = (*_BACnetUnconfirmedServiceRequest)(nil)
 
 // NewBACnetUnconfirmedServiceRequest factory function for _BACnetUnconfirmedServiceRequest
-func NewBACnetUnconfirmedServiceRequest(serviceRequestLength uint16) *_BACnetUnconfirmedServiceRequest {
-	return &_BACnetUnconfirmedServiceRequest{ServiceRequestLength: serviceRequestLength}
+func NewBACnetUnconfirmedServiceRequest() *_BACnetUnconfirmedServiceRequest {
+	return &_BACnetUnconfirmedServiceRequest{}
 }
 
 ///////////////////////////////////////////////////////////
@@ -94,8 +89,6 @@ type BACnetUnconfirmedServiceRequestBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
 	WithMandatoryFields() BACnetUnconfirmedServiceRequestBuilder
-	// WithArgServiceRequestLength sets a parser argument
-	WithArgServiceRequestLength(uint16) BACnetUnconfirmedServiceRequestBuilder
 	// AsBACnetUnconfirmedServiceRequestIAm converts this build to a subType of BACnetUnconfirmedServiceRequest. It is always possible to return to current builder using Done()
 	AsBACnetUnconfirmedServiceRequestIAm() BACnetUnconfirmedServiceRequestIAmBuilder
 	// AsBACnetUnconfirmedServiceRequestIHave converts this build to a subType of BACnetUnconfirmedServiceRequest. It is always possible to return to current builder using Done()
@@ -157,11 +150,6 @@ func (b *_BACnetUnconfirmedServiceRequestBuilder) WithMandatoryFields() BACnetUn
 	return b
 }
 
-func (b *_BACnetUnconfirmedServiceRequestBuilder) WithArgServiceRequestLength(serviceRequestLength uint16) BACnetUnconfirmedServiceRequestBuilder {
-	b.ServiceRequestLength = serviceRequestLength
-	return b
-}
-
 func (b *_BACnetUnconfirmedServiceRequestBuilder) PartialBuild() (BACnetUnconfirmedServiceRequestContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -397,7 +385,7 @@ func BACnetUnconfirmedServiceRequestParseWithBufferProducer[T BACnetUnconfirmedS
 }
 
 func BACnetUnconfirmedServiceRequestParseWithBuffer[T BACnetUnconfirmedServiceRequest](ctx context.Context, readBuffer utils.ReadBuffer, serviceRequestLength uint16) (T, error) {
-	v, err := (&_BACnetUnconfirmedServiceRequest{ServiceRequestLength: serviceRequestLength}).parse(ctx, readBuffer, serviceRequestLength)
+	v, err := (new(_BACnetUnconfirmedServiceRequest)).parse(ctx, readBuffer, serviceRequestLength)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -517,16 +505,6 @@ func (pm *_BACnetUnconfirmedServiceRequest) serializeParent(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetUnconfirmedServiceRequest) GetServiceRequestLength() uint16 {
-	return m.ServiceRequestLength
-}
-
-//
-////
-
 func (m *_BACnetUnconfirmedServiceRequest) IsBACnetUnconfirmedServiceRequest() {}
 
 func (m *_BACnetUnconfirmedServiceRequest) DeepCopy() any {
@@ -539,7 +517,6 @@ func (m *_BACnetUnconfirmedServiceRequest) deepCopy() *_BACnetUnconfirmedService
 	}
 	_BACnetUnconfirmedServiceRequestCopy := &_BACnetUnconfirmedServiceRequest{
 		nil, // will be set by child
-		m.ServiceRequestLength,
 	}
 	return _BACnetUnconfirmedServiceRequestCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
index a7bb1db6ed0..afb02e98f0c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
@@ -68,7 +68,7 @@ var _ BACnetUnconfirmedServiceRequestIAm = (*_BACnetUnconfirmedServiceRequestIAm
 var _ BACnetUnconfirmedServiceRequestRequirements = (*_BACnetUnconfirmedServiceRequestIAm)(nil)
 
 // NewBACnetUnconfirmedServiceRequestIAm factory function for _BACnetUnconfirmedServiceRequestIAm
-func NewBACnetUnconfirmedServiceRequestIAm(deviceIdentifier BACnetApplicationTagObjectIdentifier, maximumApduLengthAcceptedLength BACnetApplicationTagUnsignedInteger, segmentationSupported BACnetSegmentationTagged, vendorId BACnetVendorIdTagged, serviceRequestLength uint16) *_BACnetUnconfirmedServiceRequestIAm {
+func NewBACnetUnconfirmedServiceRequestIAm(deviceIdentifier BACnetApplicationTagObjectIdentifier, maximumApduLengthAcceptedLength BACnetApplicationTagUnsignedInteger, segmentationSupported BACnetSegmentationTagged, vendorId BACnetVendorIdTagged) *_BACnetUnconfirmedServiceRequestIAm {
 	if deviceIdentifier == nil {
 		panic("deviceIdentifier of type BACnetApplicationTagObjectIdentifier for BACnetUnconfirmedServiceRequestIAm must not be nil")
 	}
@@ -82,7 +82,7 @@ func NewBACnetUnconfirmedServiceRequestIAm(deviceIdentifier BACnetApplicationTag
 		panic("vendorId of type BACnetVendorIdTagged for BACnetUnconfirmedServiceRequestIAm must not be nil")
 	}
 	_result := &_BACnetUnconfirmedServiceRequestIAm{
-		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(serviceRequestLength),
+		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(),
 		DeviceIdentifier:                        deviceIdentifier,
 		MaximumApduLengthAcceptedLength:         maximumApduLengthAcceptedLength,
 		SegmentationSupported:                   segmentationSupported,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go
index 7dbdf31a1c8..dfa03ae9ad7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go
@@ -65,7 +65,7 @@ var _ BACnetUnconfirmedServiceRequestIHave = (*_BACnetUnconfirmedServiceRequestI
 var _ BACnetUnconfirmedServiceRequestRequirements = (*_BACnetUnconfirmedServiceRequestIHave)(nil)
 
 // NewBACnetUnconfirmedServiceRequestIHave factory function for _BACnetUnconfirmedServiceRequestIHave
-func NewBACnetUnconfirmedServiceRequestIHave(deviceIdentifier BACnetApplicationTagObjectIdentifier, objectIdentifier BACnetApplicationTagObjectIdentifier, objectName BACnetApplicationTagCharacterString, serviceRequestLength uint16) *_BACnetUnconfirmedServiceRequestIHave {
+func NewBACnetUnconfirmedServiceRequestIHave(deviceIdentifier BACnetApplicationTagObjectIdentifier, objectIdentifier BACnetApplicationTagObjectIdentifier, objectName BACnetApplicationTagCharacterString) *_BACnetUnconfirmedServiceRequestIHave {
 	if deviceIdentifier == nil {
 		panic("deviceIdentifier of type BACnetApplicationTagObjectIdentifier for BACnetUnconfirmedServiceRequestIHave must not be nil")
 	}
@@ -76,7 +76,7 @@ func NewBACnetUnconfirmedServiceRequestIHave(deviceIdentifier BACnetApplicationT
 		panic("objectName of type BACnetApplicationTagCharacterString for BACnetUnconfirmedServiceRequestIHave must not be nil")
 	}
 	_result := &_BACnetUnconfirmedServiceRequestIHave{
-		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(serviceRequestLength),
+		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(),
 		DeviceIdentifier:                        deviceIdentifier,
 		ObjectIdentifier:                        objectIdentifier,
 		ObjectName:                              objectName,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go
index b68a8b74364..43963c7ced9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go
@@ -62,7 +62,7 @@ var _ BACnetUnconfirmedServiceRequestTimeSynchronization = (*_BACnetUnconfirmedS
 var _ BACnetUnconfirmedServiceRequestRequirements = (*_BACnetUnconfirmedServiceRequestTimeSynchronization)(nil)
 
 // NewBACnetUnconfirmedServiceRequestTimeSynchronization factory function for _BACnetUnconfirmedServiceRequestTimeSynchronization
-func NewBACnetUnconfirmedServiceRequestTimeSynchronization(synchronizedDate BACnetApplicationTagDate, synchronizedTime BACnetApplicationTagTime, serviceRequestLength uint16) *_BACnetUnconfirmedServiceRequestTimeSynchronization {
+func NewBACnetUnconfirmedServiceRequestTimeSynchronization(synchronizedDate BACnetApplicationTagDate, synchronizedTime BACnetApplicationTagTime) *_BACnetUnconfirmedServiceRequestTimeSynchronization {
 	if synchronizedDate == nil {
 		panic("synchronizedDate of type BACnetApplicationTagDate for BACnetUnconfirmedServiceRequestTimeSynchronization must not be nil")
 	}
@@ -70,7 +70,7 @@ func NewBACnetUnconfirmedServiceRequestTimeSynchronization(synchronizedDate BACn
 		panic("synchronizedTime of type BACnetApplicationTagTime for BACnetUnconfirmedServiceRequestTimeSynchronization must not be nil")
 	}
 	_result := &_BACnetUnconfirmedServiceRequestTimeSynchronization{
-		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(serviceRequestLength),
+		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(),
 		SynchronizedDate:                        synchronizedDate,
 		SynchronizedTime:                        synchronizedTime,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go
index 091641678b3..fa39184fbe5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go
@@ -62,7 +62,7 @@ var _ BACnetUnconfirmedServiceRequestUTCTimeSynchronization = (*_BACnetUnconfirm
 var _ BACnetUnconfirmedServiceRequestRequirements = (*_BACnetUnconfirmedServiceRequestUTCTimeSynchronization)(nil)
 
 // NewBACnetUnconfirmedServiceRequestUTCTimeSynchronization factory function for _BACnetUnconfirmedServiceRequestUTCTimeSynchronization
-func NewBACnetUnconfirmedServiceRequestUTCTimeSynchronization(synchronizedDate BACnetApplicationTagDate, synchronizedTime BACnetApplicationTagTime, serviceRequestLength uint16) *_BACnetUnconfirmedServiceRequestUTCTimeSynchronization {
+func NewBACnetUnconfirmedServiceRequestUTCTimeSynchronization(synchronizedDate BACnetApplicationTagDate, synchronizedTime BACnetApplicationTagTime) *_BACnetUnconfirmedServiceRequestUTCTimeSynchronization {
 	if synchronizedDate == nil {
 		panic("synchronizedDate of type BACnetApplicationTagDate for BACnetUnconfirmedServiceRequestUTCTimeSynchronization must not be nil")
 	}
@@ -70,7 +70,7 @@ func NewBACnetUnconfirmedServiceRequestUTCTimeSynchronization(synchronizedDate B
 		panic("synchronizedTime of type BACnetApplicationTagTime for BACnetUnconfirmedServiceRequestUTCTimeSynchronization must not be nil")
 	}
 	_result := &_BACnetUnconfirmedServiceRequestUTCTimeSynchronization{
-		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(serviceRequestLength),
+		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(),
 		SynchronizedDate:                        synchronizedDate,
 		SynchronizedTime:                        synchronizedTime,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
index 8a4dee8602f..4574744f607 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
@@ -71,7 +71,7 @@ var _ BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification = (*_BACnetUncon
 var _ BACnetUnconfirmedServiceRequestRequirements = (*_BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification)(nil)
 
 // NewBACnetUnconfirmedServiceRequestUnconfirmedCOVNotification factory function for _BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification
-func NewBACnetUnconfirmedServiceRequestUnconfirmedCOVNotification(subscriberProcessIdentifier BACnetContextTagUnsignedInteger, initiatingDeviceIdentifier BACnetContextTagObjectIdentifier, monitoredObjectIdentifier BACnetContextTagObjectIdentifier, lifetimeInSeconds BACnetContextTagUnsignedInteger, listOfValues BACnetPropertyValues, serviceRequestLength uint16) *_BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification {
+func NewBACnetUnconfirmedServiceRequestUnconfirmedCOVNotification(subscriberProcessIdentifier BACnetContextTagUnsignedInteger, initiatingDeviceIdentifier BACnetContextTagObjectIdentifier, monitoredObjectIdentifier BACnetContextTagObjectIdentifier, lifetimeInSeconds BACnetContextTagUnsignedInteger, listOfValues BACnetPropertyValues) *_BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification {
 	if subscriberProcessIdentifier == nil {
 		panic("subscriberProcessIdentifier of type BACnetContextTagUnsignedInteger for BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification must not be nil")
 	}
@@ -88,7 +88,7 @@ func NewBACnetUnconfirmedServiceRequestUnconfirmedCOVNotification(subscriberProc
 		panic("listOfValues of type BACnetPropertyValues for BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification must not be nil")
 	}
 	_result := &_BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification{
-		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(serviceRequestLength),
+		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(),
 		SubscriberProcessIdentifier:             subscriberProcessIdentifier,
 		InitiatingDeviceIdentifier:              initiatingDeviceIdentifier,
 		MonitoredObjectIdentifier:               monitoredObjectIdentifier,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go
index 76420535e2d..5e46ad058f6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go
@@ -71,7 +71,7 @@ var _ BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple = (*_BAC
 var _ BACnetUnconfirmedServiceRequestRequirements = (*_BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple)(nil)
 
 // NewBACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple factory function for _BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple
-func NewBACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple(subscriberProcessIdentifier BACnetContextTagUnsignedInteger, initiatingDeviceIdentifier BACnetContextTagObjectIdentifier, timeRemaining BACnetContextTagUnsignedInteger, timestamp BACnetTimeStampEnclosed, listOfCovNotifications ListOfCovNotificationsList, serviceRequestLength uint16) *_BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple {
+func NewBACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple(subscriberProcessIdentifier BACnetContextTagUnsignedInteger, initiatingDeviceIdentifier BACnetContextTagObjectIdentifier, timeRemaining BACnetContextTagUnsignedInteger, timestamp BACnetTimeStampEnclosed, listOfCovNotifications ListOfCovNotificationsList) *_BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple {
 	if subscriberProcessIdentifier == nil {
 		panic("subscriberProcessIdentifier of type BACnetContextTagUnsignedInteger for BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple must not be nil")
 	}
@@ -85,7 +85,7 @@ func NewBACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple(subscr
 		panic("listOfCovNotifications of type ListOfCovNotificationsList for BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple must not be nil")
 	}
 	_result := &_BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple{
-		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(serviceRequestLength),
+		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(),
 		SubscriberProcessIdentifier:             subscriberProcessIdentifier,
 		InitiatingDeviceIdentifier:              initiatingDeviceIdentifier,
 		TimeRemaining:                           timeRemaining,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go
index 72b140c638a..95a0f2a35c0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go
@@ -95,7 +95,7 @@ var _ BACnetUnconfirmedServiceRequestUnconfirmedEventNotification = (*_BACnetUnc
 var _ BACnetUnconfirmedServiceRequestRequirements = (*_BACnetUnconfirmedServiceRequestUnconfirmedEventNotification)(nil)
 
 // NewBACnetUnconfirmedServiceRequestUnconfirmedEventNotification factory function for _BACnetUnconfirmedServiceRequestUnconfirmedEventNotification
-func NewBACnetUnconfirmedServiceRequestUnconfirmedEventNotification(processIdentifier BACnetContextTagUnsignedInteger, initiatingDeviceIdentifier BACnetContextTagObjectIdentifier, eventObjectIdentifier BACnetContextTagObjectIdentifier, timestamp BACnetTimeStampEnclosed, notificationClass BACnetContextTagUnsignedInteger, priority BACnetContextTagUnsignedInteger, eventType BACnetEventTypeTagged, messageText BACnetContextTagCharacterString, notifyType BACnetNotifyTypeTagged, ackRequired BACnetContextTagBoolean, fromState BACnetEventStateTagged, toState BACnetEventStateTagged, eventValues BACnetNotificationParameters, serviceRequestLength uint16) *_BACnetUnconfirmedServiceRequestUnconfirmedEventNotification {
+func NewBACnetUnconfirmedServiceRequestUnconfirmedEventNotification(processIdentifier BACnetContextTagUnsignedInteger, initiatingDeviceIdentifier BACnetContextTagObjectIdentifier, eventObjectIdentifier BACnetContextTagObjectIdentifier, timestamp BACnetTimeStampEnclosed, notificationClass BACnetContextTagUnsignedInteger, priority BACnetContextTagUnsignedInteger, eventType BACnetEventTypeTagged, messageText BACnetContextTagCharacterString, notifyType BACnetNotifyTypeTagged, ackRequired BACnetContextTagBoolean, fromState BACnetEventStateTagged, toState BACnetEventStateTagged, eventValues BACnetNotificationParameters) *_BACnetUnconfirmedServiceRequestUnconfirmedEventNotification {
 	if processIdentifier == nil {
 		panic("processIdentifier of type BACnetContextTagUnsignedInteger for BACnetUnconfirmedServiceRequestUnconfirmedEventNotification must not be nil")
 	}
@@ -124,7 +124,7 @@ func NewBACnetUnconfirmedServiceRequestUnconfirmedEventNotification(processIdent
 		panic("toState of type BACnetEventStateTagged for BACnetUnconfirmedServiceRequestUnconfirmedEventNotification must not be nil")
 	}
 	_result := &_BACnetUnconfirmedServiceRequestUnconfirmedEventNotification{
-		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(serviceRequestLength),
+		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(),
 		ProcessIdentifier:                       processIdentifier,
 		InitiatingDeviceIdentifier:              initiatingDeviceIdentifier,
 		EventObjectIdentifier:                   eventObjectIdentifier,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
index ffefdc9054f..df1e1813f00 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
@@ -65,7 +65,7 @@ var _ BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer = (*_BACnetUncon
 var _ BACnetUnconfirmedServiceRequestRequirements = (*_BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer)(nil)
 
 // NewBACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer factory function for _BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer
-func NewBACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer(vendorId BACnetVendorIdTagged, serviceNumber BACnetContextTagUnsignedInteger, serviceParameters BACnetConstructedData, serviceRequestLength uint16) *_BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer {
+func NewBACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer(vendorId BACnetVendorIdTagged, serviceNumber BACnetContextTagUnsignedInteger, serviceParameters BACnetConstructedData) *_BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer {
 	if vendorId == nil {
 		panic("vendorId of type BACnetVendorIdTagged for BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer must not be nil")
 	}
@@ -73,7 +73,7 @@ func NewBACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer(vendorId BACne
 		panic("serviceNumber of type BACnetContextTagUnsignedInteger for BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer must not be nil")
 	}
 	_result := &_BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer{
-		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(serviceRequestLength),
+		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(),
 		VendorId:                                vendorId,
 		ServiceNumber:                           serviceNumber,
 		ServiceParameters:                       serviceParameters,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go
index 370552e2ae3..55b677cfeb8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go
@@ -68,7 +68,7 @@ var _ BACnetUnconfirmedServiceRequestUnconfirmedTextMessage = (*_BACnetUnconfirm
 var _ BACnetUnconfirmedServiceRequestRequirements = (*_BACnetUnconfirmedServiceRequestUnconfirmedTextMessage)(nil)
 
 // NewBACnetUnconfirmedServiceRequestUnconfirmedTextMessage factory function for _BACnetUnconfirmedServiceRequestUnconfirmedTextMessage
-func NewBACnetUnconfirmedServiceRequestUnconfirmedTextMessage(textMessageSourceDevice BACnetContextTagObjectIdentifier, messageClass BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass, messagePriority BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged, message BACnetContextTagCharacterString, serviceRequestLength uint16) *_BACnetUnconfirmedServiceRequestUnconfirmedTextMessage {
+func NewBACnetUnconfirmedServiceRequestUnconfirmedTextMessage(textMessageSourceDevice BACnetContextTagObjectIdentifier, messageClass BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass, messagePriority BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged, message BACnetContextTagCharacterString) *_BACnetUnconfirmedServiceRequestUnconfirmedTextMessage {
 	if textMessageSourceDevice == nil {
 		panic("textMessageSourceDevice of type BACnetContextTagObjectIdentifier for BACnetUnconfirmedServiceRequestUnconfirmedTextMessage must not be nil")
 	}
@@ -79,7 +79,7 @@ func NewBACnetUnconfirmedServiceRequestUnconfirmedTextMessage(textMessageSourceD
 		panic("message of type BACnetContextTagCharacterString for BACnetUnconfirmedServiceRequestUnconfirmedTextMessage must not be nil")
 	}
 	_result := &_BACnetUnconfirmedServiceRequestUnconfirmedTextMessage{
-		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(serviceRequestLength),
+		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(),
 		TextMessageSourceDevice:                 textMessageSourceDevice,
 		MessageClass:                            messageClass,
 		MessagePriority:                         messagePriority,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnknown.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnknown.go
index f686357ab53..6136f62dace 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnknown.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnknown.go
@@ -59,9 +59,9 @@ var _ BACnetUnconfirmedServiceRequestUnknown = (*_BACnetUnconfirmedServiceReques
 var _ BACnetUnconfirmedServiceRequestRequirements = (*_BACnetUnconfirmedServiceRequestUnknown)(nil)
 
 // NewBACnetUnconfirmedServiceRequestUnknown factory function for _BACnetUnconfirmedServiceRequestUnknown
-func NewBACnetUnconfirmedServiceRequestUnknown(unknownBytes []byte, serviceRequestLength uint16) *_BACnetUnconfirmedServiceRequestUnknown {
+func NewBACnetUnconfirmedServiceRequestUnknown(unknownBytes []byte) *_BACnetUnconfirmedServiceRequestUnknown {
 	_result := &_BACnetUnconfirmedServiceRequestUnknown{
-		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(serviceRequestLength),
+		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(),
 		UnknownBytes:                            unknownBytes,
 	}
 	_result.BACnetUnconfirmedServiceRequestContract.(*_BACnetUnconfirmedServiceRequest)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
index e77c108c2e3..80920c29d96 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
@@ -65,12 +65,12 @@ var _ BACnetUnconfirmedServiceRequestWhoHas = (*_BACnetUnconfirmedServiceRequest
 var _ BACnetUnconfirmedServiceRequestRequirements = (*_BACnetUnconfirmedServiceRequestWhoHas)(nil)
 
 // NewBACnetUnconfirmedServiceRequestWhoHas factory function for _BACnetUnconfirmedServiceRequestWhoHas
-func NewBACnetUnconfirmedServiceRequestWhoHas(deviceInstanceRangeLowLimit BACnetContextTagUnsignedInteger, deviceInstanceRangeHighLimit BACnetContextTagUnsignedInteger, object BACnetUnconfirmedServiceRequestWhoHasObject, serviceRequestLength uint16) *_BACnetUnconfirmedServiceRequestWhoHas {
+func NewBACnetUnconfirmedServiceRequestWhoHas(deviceInstanceRangeLowLimit BACnetContextTagUnsignedInteger, deviceInstanceRangeHighLimit BACnetContextTagUnsignedInteger, object BACnetUnconfirmedServiceRequestWhoHasObject) *_BACnetUnconfirmedServiceRequestWhoHas {
 	if object == nil {
 		panic("object of type BACnetUnconfirmedServiceRequestWhoHasObject for BACnetUnconfirmedServiceRequestWhoHas must not be nil")
 	}
 	_result := &_BACnetUnconfirmedServiceRequestWhoHas{
-		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(serviceRequestLength),
+		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(),
 		DeviceInstanceRangeLowLimit:             deviceInstanceRangeLowLimit,
 		DeviceInstanceRangeHighLimit:            deviceInstanceRangeHighLimit,
 		Object:                                  object,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObject.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObject.go
index a34111060af..5287ba18bb0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObject.go
@@ -313,7 +313,7 @@ func BACnetUnconfirmedServiceRequestWhoHasObjectParseWithBufferProducer[T BACnet
 }
 
 func BACnetUnconfirmedServiceRequestWhoHasObjectParseWithBuffer[T BACnetUnconfirmedServiceRequestWhoHasObject](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetUnconfirmedServiceRequestWhoHasObject{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetUnconfirmedServiceRequestWhoHasObject)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
index af9098d7d68..efc8223fec7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
@@ -62,9 +62,9 @@ var _ BACnetUnconfirmedServiceRequestWhoIs = (*_BACnetUnconfirmedServiceRequestW
 var _ BACnetUnconfirmedServiceRequestRequirements = (*_BACnetUnconfirmedServiceRequestWhoIs)(nil)
 
 // NewBACnetUnconfirmedServiceRequestWhoIs factory function for _BACnetUnconfirmedServiceRequestWhoIs
-func NewBACnetUnconfirmedServiceRequestWhoIs(deviceInstanceRangeLowLimit BACnetContextTagUnsignedInteger, deviceInstanceRangeHighLimit BACnetContextTagUnsignedInteger, serviceRequestLength uint16) *_BACnetUnconfirmedServiceRequestWhoIs {
+func NewBACnetUnconfirmedServiceRequestWhoIs(deviceInstanceRangeLowLimit BACnetContextTagUnsignedInteger, deviceInstanceRangeHighLimit BACnetContextTagUnsignedInteger) *_BACnetUnconfirmedServiceRequestWhoIs {
 	_result := &_BACnetUnconfirmedServiceRequestWhoIs{
-		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(serviceRequestLength),
+		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(),
 		DeviceInstanceRangeLowLimit:             deviceInstanceRangeLowLimit,
 		DeviceInstanceRangeHighLimit:            deviceInstanceRangeHighLimit,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go
index 2ff4095e1a1..4ac3d2c344b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go
@@ -68,7 +68,7 @@ var _ BACnetUnconfirmedServiceRequestWriteGroup = (*_BACnetUnconfirmedServiceReq
 var _ BACnetUnconfirmedServiceRequestRequirements = (*_BACnetUnconfirmedServiceRequestWriteGroup)(nil)
 
 // NewBACnetUnconfirmedServiceRequestWriteGroup factory function for _BACnetUnconfirmedServiceRequestWriteGroup
-func NewBACnetUnconfirmedServiceRequestWriteGroup(groupNumber BACnetContextTagUnsignedInteger, writePriority BACnetContextTagUnsignedInteger, changeList BACnetGroupChannelValueList, inhibitDelay BACnetContextTagUnsignedInteger, serviceRequestLength uint16) *_BACnetUnconfirmedServiceRequestWriteGroup {
+func NewBACnetUnconfirmedServiceRequestWriteGroup(groupNumber BACnetContextTagUnsignedInteger, writePriority BACnetContextTagUnsignedInteger, changeList BACnetGroupChannelValueList, inhibitDelay BACnetContextTagUnsignedInteger) *_BACnetUnconfirmedServiceRequestWriteGroup {
 	if groupNumber == nil {
 		panic("groupNumber of type BACnetContextTagUnsignedInteger for BACnetUnconfirmedServiceRequestWriteGroup must not be nil")
 	}
@@ -79,7 +79,7 @@ func NewBACnetUnconfirmedServiceRequestWriteGroup(groupNumber BACnetContextTagUn
 		panic("changeList of type BACnetGroupChannelValueList for BACnetUnconfirmedServiceRequestWriteGroup must not be nil")
 	}
 	_result := &_BACnetUnconfirmedServiceRequestWriteGroup{
-		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(serviceRequestLength),
+		BACnetUnconfirmedServiceRequestContract: NewBACnetUnconfirmedServiceRequest(),
 		GroupNumber:                             groupNumber,
 		WritePriority:                           writePriority,
 		ChangeList:                              changeList,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVMACEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVMACEntry.go
index e96624ec2eb..e24346ad4e8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVMACEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVMACEntry.go
@@ -234,7 +234,7 @@ func BACnetVMACEntryParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func BACnetVMACEntryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetVMACEntry, error) {
-	v, err := (&_BACnetVMACEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetVMACEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClassTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClassTagged.go
index c39d304a6eb..81767d3f90e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClassTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClassTagged.go
@@ -59,20 +59,16 @@ type _BACnetVTClassTagged struct {
 	Header           BACnetTagHeader
 	Value            BACnetVTClass
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetVTClassTagged = (*_BACnetVTClassTagged)(nil)
 
 // NewBACnetVTClassTagged factory function for _BACnetVTClassTagged
-func NewBACnetVTClassTagged(header BACnetTagHeader, value BACnetVTClass, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_BACnetVTClassTagged {
+func NewBACnetVTClassTagged(header BACnetTagHeader, value BACnetVTClass, proprietaryValue uint32) *_BACnetVTClassTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetVTClassTagged must not be nil")
 	}
-	return &_BACnetVTClassTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetVTClassTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetVTClassTaggedBuilder interface {
 	WithValue(BACnetVTClass) BACnetVTClassTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) BACnetVTClassTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetVTClassTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetVTClassTaggedBuilder
 	// Build builds the BACnetVTClassTagged or returns an error if something is wrong
 	Build() (BACnetVTClassTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetVTClassTaggedBuilder) WithProprietaryValue(proprietaryValue uint
 	return b
 }
 
-func (b *_BACnetVTClassTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetVTClassTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetVTClassTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetVTClassTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetVTClassTaggedBuilder) Build() (BACnetVTClassTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetVTClassTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagCla
 }
 
 func BACnetVTClassTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetVTClassTagged, error) {
-	v, err := (&_BACnetVTClassTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetVTClassTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetVTClassTagged) SerializeWithWriteBuffer(ctx context.Context, wri
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetVTClassTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetVTClassTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetVTClassTagged) IsBACnetVTClassTagged() {}
 
 func (m *_BACnetVTClassTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetVTClassTagged) deepCopy() *_BACnetVTClassTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetVTClassTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVTSession.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVTSession.go
index 2250924542c..2d397ea06c0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVTSession.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVTSession.go
@@ -277,7 +277,7 @@ func BACnetVTSessionParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func BACnetVTSessionParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetVTSession, error) {
-	v, err := (&_BACnetVTSession{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetVTSession)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSource.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSource.go
index 2008af973dd..c591ef59f72 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSource.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSource.go
@@ -325,7 +325,7 @@ func BACnetValueSourceParseWithBufferProducer[T BACnetValueSource]() func(ctx co
 }
 
 func BACnetValueSourceParseWithBuffer[T BACnetValueSource](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BACnetValueSource{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetValueSource)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
index eebcb62df64..22286646fd2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
@@ -1593,6 +1593,13 @@ const (
 	BACnetVendorId_ZAPHIREAS                                                                    BACnetVendorId = 1557
 	BACnetVendorId_AJ_MANUFACTURING                                                             BACnetVendorId = 1558
 	BACnetVendorId_FUTURE_MOTORS_LTD                                                            BACnetVendorId = 1559
+	BACnetVendorId_HIMEL_HONG_KONG_LIMITED                                                      BACnetVendorId = 1560
+	BACnetVendorId_SHENZHEN_SUNRICHER_TECHNOLOGY_CO_LTD                                         BACnetVendorId = 1561
+	BACnetVendorId_ACTILITYSA                                                                   BACnetVendorId = 1562
+	BACnetVendorId_OY_HALTON_GROUP_LTD                                                          BACnetVendorId = 1563
+	BACnetVendorId_AVTECH_SOFTWARE_INC                                                          BACnetVendorId = 1564
+	BACnetVendorId_IN_CONTROL_ENGINEERINGLLC                                                    BACnetVendorId = 1565
+	BACnetVendorId_SOUND_WATER_TECHNOLOGIESLLC                                                  BACnetVendorId = 1566
 	BACnetVendorId_UNKNOWN_VENDOR                                                               BACnetVendorId = 0xFFFF
 )
 
@@ -3151,6 +3158,13 @@ func init() {
 		BACnetVendorId_ZAPHIREAS,
 		BACnetVendorId_AJ_MANUFACTURING,
 		BACnetVendorId_FUTURE_MOTORS_LTD,
+		BACnetVendorId_HIMEL_HONG_KONG_LIMITED,
+		BACnetVendorId_SHENZHEN_SUNRICHER_TECHNOLOGY_CO_LTD,
+		BACnetVendorId_ACTILITYSA,
+		BACnetVendorId_OY_HALTON_GROUP_LTD,
+		BACnetVendorId_AVTECH_SOFTWARE_INC,
+		BACnetVendorId_IN_CONTROL_ENGINEERINGLLC,
+		BACnetVendorId_SOUND_WATER_TECHNOLOGIESLLC,
 		BACnetVendorId_UNKNOWN_VENDOR,
 	}
 }
@@ -5645,6 +5659,34 @@ func (e BACnetVendorId) VendorId() uint16 {
 		{ /* '156' */
 			return 156
 		}
+	case 1560:
+		{ /* '1560' */
+			return 1560
+		}
+	case 1561:
+		{ /* '1561' */
+			return 1561
+		}
+	case 1562:
+		{ /* '1562' */
+			return 1562
+		}
+	case 1563:
+		{ /* '1563' */
+			return 1563
+		}
+	case 1564:
+		{ /* '1564' */
+			return 1564
+		}
+	case 1565:
+		{ /* '1565' */
+			return 1565
+		}
+	case 1566:
+		{ /* '1566' */
+			return 1566
+		}
 	case 157:
 		{ /* '157' */
 			return 157
@@ -11867,6 +11909,34 @@ func (e BACnetVendorId) VendorName() string {
 		{ /* '156' */
 			return "Messner Gebäudetechnik GmbH"
 		}
+	case 1560:
+		{ /* '1560' */
+			return "Himel Hong Kong Limited"
+		}
+	case 1561:
+		{ /* '1561' */
+			return "Shenzhen Sunricher Technology Co., Ltd."
+		}
+	case 1562:
+		{ /* '1562' */
+			return "Actility S.A."
+		}
+	case 1563:
+		{ /* '1563' */
+			return "Oy Halton Group Ltd."
+		}
+	case 1564:
+		{ /* '1564' */
+			return "AVTECH Software, Inc."
+		}
+	case 1565:
+		{ /* '1565' */
+			return "InControl Engineering LLC"
+		}
+	case 1566:
+		{ /* '1566' */
+			return "SoundWater Technologies LLC"
+		}
 	case 157:
 		{ /* '157' */
 			return "Integrated.CH"
@@ -16844,6 +16914,20 @@ func BACnetVendorIdByValue(value uint16) (enum BACnetVendorId, ok bool) {
 		return BACnetVendorId_FUTURE_MOTORS_LTD, true
 	case 156:
 		return BACnetVendorId_MESSNER_GEBUDETECHNIK_GMBH, true
+	case 1560:
+		return BACnetVendorId_HIMEL_HONG_KONG_LIMITED, true
+	case 1561:
+		return BACnetVendorId_SHENZHEN_SUNRICHER_TECHNOLOGY_CO_LTD, true
+	case 1562:
+		return BACnetVendorId_ACTILITYSA, true
+	case 1563:
+		return BACnetVendorId_OY_HALTON_GROUP_LTD, true
+	case 1564:
+		return BACnetVendorId_AVTECH_SOFTWARE_INC, true
+	case 1565:
+		return BACnetVendorId_IN_CONTROL_ENGINEERINGLLC, true
+	case 1566:
+		return BACnetVendorId_SOUND_WATER_TECHNOLOGIESLLC, true
 	case 157:
 		return BACnetVendorId_INTEGRATEDCH, true
 	case 158:
@@ -19952,6 +20036,20 @@ func BACnetVendorIdByName(value string) (enum BACnetVendorId, ok bool) {
 		return BACnetVendorId_FUTURE_MOTORS_LTD, true
 	case "MESSNER_GEBUDETECHNIK_GMBH":
 		return BACnetVendorId_MESSNER_GEBUDETECHNIK_GMBH, true
+	case "HIMEL_HONG_KONG_LIMITED":
+		return BACnetVendorId_HIMEL_HONG_KONG_LIMITED, true
+	case "SHENZHEN_SUNRICHER_TECHNOLOGY_CO_LTD":
+		return BACnetVendorId_SHENZHEN_SUNRICHER_TECHNOLOGY_CO_LTD, true
+	case "ACTILITYSA":
+		return BACnetVendorId_ACTILITYSA, true
+	case "OY_HALTON_GROUP_LTD":
+		return BACnetVendorId_OY_HALTON_GROUP_LTD, true
+	case "AVTECH_SOFTWARE_INC":
+		return BACnetVendorId_AVTECH_SOFTWARE_INC, true
+	case "IN_CONTROL_ENGINEERINGLLC":
+		return BACnetVendorId_IN_CONTROL_ENGINEERINGLLC, true
+	case "SOUND_WATER_TECHNOLOGIESLLC":
+		return BACnetVendorId_SOUND_WATER_TECHNOLOGIESLLC, true
 	case "INTEGRATEDCH":
 		return BACnetVendorId_INTEGRATEDCH, true
 	case "PRICE_INDUSTRIES":
@@ -23132,6 +23230,20 @@ func (e BACnetVendorId) PLC4XEnumName() string {
 		return "FUTURE_MOTORS_LTD"
 	case BACnetVendorId_MESSNER_GEBUDETECHNIK_GMBH:
 		return "MESSNER_GEBUDETECHNIK_GMBH"
+	case BACnetVendorId_HIMEL_HONG_KONG_LIMITED:
+		return "HIMEL_HONG_KONG_LIMITED"
+	case BACnetVendorId_SHENZHEN_SUNRICHER_TECHNOLOGY_CO_LTD:
+		return "SHENZHEN_SUNRICHER_TECHNOLOGY_CO_LTD"
+	case BACnetVendorId_ACTILITYSA:
+		return "ACTILITYSA"
+	case BACnetVendorId_OY_HALTON_GROUP_LTD:
+		return "OY_HALTON_GROUP_LTD"
+	case BACnetVendorId_AVTECH_SOFTWARE_INC:
+		return "AVTECH_SOFTWARE_INC"
+	case BACnetVendorId_IN_CONTROL_ENGINEERINGLLC:
+		return "IN_CONTROL_ENGINEERINGLLC"
+	case BACnetVendorId_SOUND_WATER_TECHNOLOGIESLLC:
+		return "SOUND_WATER_TECHNOLOGIESLLC"
 	case BACnetVendorId_INTEGRATEDCH:
 		return "INTEGRATEDCH"
 	case BACnetVendorId_PRICE_INDUSTRIES:
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorIdTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorIdTagged.go
index 5286af970dd..7a0fe6071e3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorIdTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorIdTagged.go
@@ -59,20 +59,16 @@ type _BACnetVendorIdTagged struct {
 	Header    BACnetTagHeader
 	Value     BACnetVendorId
 	UnknownId uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetVendorIdTagged = (*_BACnetVendorIdTagged)(nil)
 
 // NewBACnetVendorIdTagged factory function for _BACnetVendorIdTagged
-func NewBACnetVendorIdTagged(header BACnetTagHeader, value BACnetVendorId, unknownId uint32, tagNumber uint8, tagClass TagClass) *_BACnetVendorIdTagged {
+func NewBACnetVendorIdTagged(header BACnetTagHeader, value BACnetVendorId, unknownId uint32) *_BACnetVendorIdTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetVendorIdTagged must not be nil")
 	}
-	return &_BACnetVendorIdTagged{Header: header, Value: value, UnknownId: unknownId, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetVendorIdTagged{Header: header, Value: value, UnknownId: unknownId}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type BACnetVendorIdTaggedBuilder interface {
 	WithValue(BACnetVendorId) BACnetVendorIdTaggedBuilder
 	// WithUnknownId adds UnknownId (property field)
 	WithUnknownId(uint32) BACnetVendorIdTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetVendorIdTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetVendorIdTaggedBuilder
 	// Build builds the BACnetVendorIdTagged or returns an error if something is wrong
 	Build() (BACnetVendorIdTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_BACnetVendorIdTaggedBuilder) WithUnknownId(unknownId uint32) BACnetVen
 	return b
 }
 
-func (b *_BACnetVendorIdTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetVendorIdTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetVendorIdTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetVendorIdTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetVendorIdTaggedBuilder) Build() (BACnetVendorIdTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func BACnetVendorIdTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagCl
 }
 
 func BACnetVendorIdTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetVendorIdTagged, error) {
-	v, err := (&_BACnetVendorIdTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetVendorIdTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_BACnetVendorIdTagged) SerializeWithWriteBuffer(ctx context.Context, wr
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetVendorIdTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetVendorIdTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetVendorIdTagged) IsBACnetVendorIdTagged() {}
 
 func (m *_BACnetVendorIdTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_BACnetVendorIdTagged) deepCopy() *_BACnetVendorIdTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.UnknownId,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetVendorIdTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDay.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDay.go
index c22ed6b332f..0fe3b732968 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDay.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDay.go
@@ -160,7 +160,7 @@ func BACnetWeekNDayParseWithBufferProducer() func(ctx context.Context, readBuffe
 }
 
 func BACnetWeekNDayParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetWeekNDay, error) {
-	v, err := (&_BACnetWeekNDay{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetWeekNDay)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDayTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDayTagged.go
index fd482355ebf..89c3582844c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDayTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDayTagged.go
@@ -88,20 +88,16 @@ type _BACnetWeekNDayTagged struct {
 	Month       uint8
 	WeekOfMonth uint8
 	DayOfWeek   uint8
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetWeekNDayTagged = (*_BACnetWeekNDayTagged)(nil)
 
 // NewBACnetWeekNDayTagged factory function for _BACnetWeekNDayTagged
-func NewBACnetWeekNDayTagged(header BACnetTagHeader, month uint8, weekOfMonth uint8, dayOfWeek uint8, tagNumber uint8, tagClass TagClass) *_BACnetWeekNDayTagged {
+func NewBACnetWeekNDayTagged(header BACnetTagHeader, month uint8, weekOfMonth uint8, dayOfWeek uint8) *_BACnetWeekNDayTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetWeekNDayTagged must not be nil")
 	}
-	return &_BACnetWeekNDayTagged{Header: header, Month: month, WeekOfMonth: weekOfMonth, DayOfWeek: dayOfWeek, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetWeekNDayTagged{Header: header, Month: month, WeekOfMonth: weekOfMonth, DayOfWeek: dayOfWeek}
 }
 
 ///////////////////////////////////////////////////////////
@@ -124,10 +120,6 @@ type BACnetWeekNDayTaggedBuilder interface {
 	WithWeekOfMonth(uint8) BACnetWeekNDayTaggedBuilder
 	// WithDayOfWeek adds DayOfWeek (property field)
 	WithDayOfWeek(uint8) BACnetWeekNDayTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetWeekNDayTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetWeekNDayTaggedBuilder
 	// Build builds the BACnetWeekNDayTagged or returns an error if something is wrong
 	Build() (BACnetWeekNDayTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -181,15 +173,6 @@ func (b *_BACnetWeekNDayTaggedBuilder) WithDayOfWeek(dayOfWeek uint8) BACnetWeek
 	return b
 }
 
-func (b *_BACnetWeekNDayTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetWeekNDayTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetWeekNDayTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetWeekNDayTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetWeekNDayTaggedBuilder) Build() (BACnetWeekNDayTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -424,7 +407,7 @@ func BACnetWeekNDayTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagCl
 }
 
 func BACnetWeekNDayTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetWeekNDayTagged, error) {
-	v, err := (&_BACnetWeekNDayTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetWeekNDayTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -693,19 +676,6 @@ func (m *_BACnetWeekNDayTagged) SerializeWithWriteBuffer(ctx context.Context, wr
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetWeekNDayTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetWeekNDayTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetWeekNDayTagged) IsBACnetWeekNDayTagged() {}
 
 func (m *_BACnetWeekNDayTagged) DeepCopy() any {
@@ -721,8 +691,6 @@ func (m *_BACnetWeekNDayTagged) deepCopy() *_BACnetWeekNDayTagged {
 		m.Month,
 		m.WeekOfMonth,
 		m.DayOfWeek,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetWeekNDayTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteAccessSpecification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteAccessSpecification.go
index 222b601cd0c..f9dfb931b64 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteAccessSpecification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteAccessSpecification.go
@@ -298,7 +298,7 @@ func BACnetWriteAccessSpecificationParseWithBufferProducer() func(ctx context.Co
 }
 
 func BACnetWriteAccessSpecificationParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BACnetWriteAccessSpecification, error) {
-	v, err := (&_BACnetWriteAccessSpecification{}).parse(ctx, readBuffer)
+	v, err := (new(_BACnetWriteAccessSpecification)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatusTagged.go
index 760dba9dd16..7c9b3ff1d52 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatusTagged.go
@@ -54,20 +54,16 @@ type BACnetWriteStatusTagged interface {
 type _BACnetWriteStatusTagged struct {
 	Header BACnetTagHeader
 	Value  BACnetWriteStatus
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BACnetWriteStatusTagged = (*_BACnetWriteStatusTagged)(nil)
 
 // NewBACnetWriteStatusTagged factory function for _BACnetWriteStatusTagged
-func NewBACnetWriteStatusTagged(header BACnetTagHeader, value BACnetWriteStatus, tagNumber uint8, tagClass TagClass) *_BACnetWriteStatusTagged {
+func NewBACnetWriteStatusTagged(header BACnetTagHeader, value BACnetWriteStatus) *_BACnetWriteStatusTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BACnetWriteStatusTagged must not be nil")
 	}
-	return &_BACnetWriteStatusTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BACnetWriteStatusTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BACnetWriteStatusTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetWriteStatusTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetWriteStatus) BACnetWriteStatusTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BACnetWriteStatusTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BACnetWriteStatusTaggedBuilder
 	// Build builds the BACnetWriteStatusTagged or returns an error if something is wrong
 	Build() (BACnetWriteStatusTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BACnetWriteStatusTaggedBuilder) WithValue(value BACnetWriteStatus) BAC
 	return b
 }
 
-func (b *_BACnetWriteStatusTaggedBuilder) WithArgTagNumber(tagNumber uint8) BACnetWriteStatusTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BACnetWriteStatusTaggedBuilder) WithArgTagClass(tagClass TagClass) BACnetWriteStatusTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BACnetWriteStatusTaggedBuilder) Build() (BACnetWriteStatusTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BACnetWriteStatusTaggedParseWithBufferProducer(tagNumber uint8, tagClass Ta
 }
 
 func BACnetWriteStatusTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BACnetWriteStatusTagged, error) {
-	v, err := (&_BACnetWriteStatusTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BACnetWriteStatusTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BACnetWriteStatusTagged) SerializeWithWriteBuffer(ctx context.Context,
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BACnetWriteStatusTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BACnetWriteStatusTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BACnetWriteStatusTagged) IsBACnetWriteStatusTagged() {}
 
 func (m *_BACnetWriteStatusTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BACnetWriteStatusTagged) deepCopy() *_BACnetWriteStatusTagged {
 	_BACnetWriteStatusTaggedCopy := &_BACnetWriteStatusTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BACnetWriteStatusTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLC.go b/plc4go/protocols/bacnetip/readwrite/model/BVLC.go
index 81920350ca2..baa5210b2e4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLC.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLC.go
@@ -430,7 +430,7 @@ func BVLCParseWithBufferProducer[T BVLC]() func(ctx context.Context, readBuffer
 }
 
 func BVLCParseWithBuffer[T BVLC](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_BVLC{}).parse(ctx, readBuffer)
+	v, err := (new(_BVLC)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCBroadcastDistributionTableEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCBroadcastDistributionTableEntry.go
index 8a2ce4c5a48..f349d95886f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCBroadcastDistributionTableEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCBroadcastDistributionTableEntry.go
@@ -227,7 +227,7 @@ func BVLCBroadcastDistributionTableEntryParseWithBufferProducer() func(ctx conte
 }
 
 func BVLCBroadcastDistributionTableEntryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BVLCBroadcastDistributionTableEntry, error) {
-	v, err := (&_BVLCBroadcastDistributionTableEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_BVLCBroadcastDistributionTableEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go
index 39fc469248c..cc7e519c2c7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go
@@ -55,16 +55,13 @@ type BVLCDistributeBroadcastToNetwork interface {
 type _BVLCDistributeBroadcastToNetwork struct {
 	BVLCContract
 	Npdu NPDU
-
-	// Arguments.
-	BvlcPayloadLength uint16
 }
 
 var _ BVLCDistributeBroadcastToNetwork = (*_BVLCDistributeBroadcastToNetwork)(nil)
 var _ BVLCRequirements = (*_BVLCDistributeBroadcastToNetwork)(nil)
 
 // NewBVLCDistributeBroadcastToNetwork factory function for _BVLCDistributeBroadcastToNetwork
-func NewBVLCDistributeBroadcastToNetwork(npdu NPDU, bvlcPayloadLength uint16) *_BVLCDistributeBroadcastToNetwork {
+func NewBVLCDistributeBroadcastToNetwork(npdu NPDU) *_BVLCDistributeBroadcastToNetwork {
 	if npdu == nil {
 		panic("npdu of type NPDU for BVLCDistributeBroadcastToNetwork must not be nil")
 	}
@@ -90,8 +87,6 @@ type BVLCDistributeBroadcastToNetworkBuilder interface {
 	WithNpdu(NPDU) BVLCDistributeBroadcastToNetworkBuilder
 	// WithNpduBuilder adds Npdu (property field) which is build by the builder
 	WithNpduBuilder(func(NPDUBuilder) NPDUBuilder) BVLCDistributeBroadcastToNetworkBuilder
-	// WithArgBvlcPayloadLength sets a parser argument
-	WithArgBvlcPayloadLength(uint16) BVLCDistributeBroadcastToNetworkBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BVLCBuilder
 	// Build builds the BVLCDistributeBroadcastToNetwork or returns an error if something is wrong
@@ -139,11 +134,6 @@ func (b *_BVLCDistributeBroadcastToNetworkBuilder) WithNpduBuilder(builderSuppli
 	return b
 }
 
-func (b *_BVLCDistributeBroadcastToNetworkBuilder) WithArgBvlcPayloadLength(bvlcPayloadLength uint16) BVLCDistributeBroadcastToNetworkBuilder {
-	b.BvlcPayloadLength = bvlcPayloadLength
-	return b
-}
-
 func (b *_BVLCDistributeBroadcastToNetworkBuilder) Build() (BVLCDistributeBroadcastToNetwork, error) {
 	if b.Npdu == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'npdu' not set"))
@@ -308,16 +298,6 @@ func (m *_BVLCDistributeBroadcastToNetwork) SerializeWithWriteBuffer(ctx context
 	return m.BVLCContract.(*_BVLC).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BVLCDistributeBroadcastToNetwork) GetBvlcPayloadLength() uint16 {
-	return m.BvlcPayloadLength
-}
-
-//
-////
-
 func (m *_BVLCDistributeBroadcastToNetwork) IsBVLCDistributeBroadcastToNetwork() {}
 
 func (m *_BVLCDistributeBroadcastToNetwork) DeepCopy() any {
@@ -331,7 +311,6 @@ func (m *_BVLCDistributeBroadcastToNetwork) deepCopy() *_BVLCDistributeBroadcast
 	_BVLCDistributeBroadcastToNetworkCopy := &_BVLCDistributeBroadcastToNetwork{
 		m.BVLCContract.(*_BVLC).deepCopy(),
 		utils.DeepCopy[NPDU](m.Npdu),
-		m.BvlcPayloadLength,
 	}
 	_BVLCDistributeBroadcastToNetworkCopy.BVLCContract.(*_BVLC)._SubType = m
 	return _BVLCDistributeBroadcastToNetworkCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCForeignDeviceTableEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCForeignDeviceTableEntry.go
index c195538a7d3..d43e5d64ee4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCForeignDeviceTableEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCForeignDeviceTableEntry.go
@@ -242,7 +242,7 @@ func BVLCForeignDeviceTableEntryParseWithBufferProducer() func(ctx context.Conte
 }
 
 func BVLCForeignDeviceTableEntryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BVLCForeignDeviceTableEntry, error) {
-	v, err := (&_BVLCForeignDeviceTableEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_BVLCForeignDeviceTableEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCForwardedNPDU.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCForwardedNPDU.go
index 8622d50ccd2..9dfca563c56 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCForwardedNPDU.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCForwardedNPDU.go
@@ -61,16 +61,13 @@ type _BVLCForwardedNPDU struct {
 	Ip   []uint8
 	Port uint16
 	Npdu NPDU
-
-	// Arguments.
-	BvlcPayloadLength uint16
 }
 
 var _ BVLCForwardedNPDU = (*_BVLCForwardedNPDU)(nil)
 var _ BVLCRequirements = (*_BVLCForwardedNPDU)(nil)
 
 // NewBVLCForwardedNPDU factory function for _BVLCForwardedNPDU
-func NewBVLCForwardedNPDU(ip []uint8, port uint16, npdu NPDU, bvlcPayloadLength uint16) *_BVLCForwardedNPDU {
+func NewBVLCForwardedNPDU(ip []uint8, port uint16, npdu NPDU) *_BVLCForwardedNPDU {
 	if npdu == nil {
 		panic("npdu of type NPDU for BVLCForwardedNPDU must not be nil")
 	}
@@ -102,8 +99,6 @@ type BVLCForwardedNPDUBuilder interface {
 	WithNpdu(NPDU) BVLCForwardedNPDUBuilder
 	// WithNpduBuilder adds Npdu (property field) which is build by the builder
 	WithNpduBuilder(func(NPDUBuilder) NPDUBuilder) BVLCForwardedNPDUBuilder
-	// WithArgBvlcPayloadLength sets a parser argument
-	WithArgBvlcPayloadLength(uint16) BVLCForwardedNPDUBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BVLCBuilder
 	// Build builds the BVLCForwardedNPDU or returns an error if something is wrong
@@ -161,11 +156,6 @@ func (b *_BVLCForwardedNPDUBuilder) WithNpduBuilder(builderSupplier func(NPDUBui
 	return b
 }
 
-func (b *_BVLCForwardedNPDUBuilder) WithArgBvlcPayloadLength(bvlcPayloadLength uint16) BVLCForwardedNPDUBuilder {
-	b.BvlcPayloadLength = bvlcPayloadLength
-	return b
-}
-
 func (b *_BVLCForwardedNPDUBuilder) Build() (BVLCForwardedNPDU, error) {
 	if b.Npdu == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'npdu' not set"))
@@ -366,16 +356,6 @@ func (m *_BVLCForwardedNPDU) SerializeWithWriteBuffer(ctx context.Context, write
 	return m.BVLCContract.(*_BVLC).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BVLCForwardedNPDU) GetBvlcPayloadLength() uint16 {
-	return m.BvlcPayloadLength
-}
-
-//
-////
-
 func (m *_BVLCForwardedNPDU) IsBVLCForwardedNPDU() {}
 
 func (m *_BVLCForwardedNPDU) DeepCopy() any {
@@ -391,7 +371,6 @@ func (m *_BVLCForwardedNPDU) deepCopy() *_BVLCForwardedNPDU {
 		utils.DeepCopySlice[uint8, uint8](m.Ip),
 		m.Port,
 		utils.DeepCopy[NPDU](m.Npdu),
-		m.BvlcPayloadLength,
 	}
 	_BVLCForwardedNPDUCopy.BVLCContract.(*_BVLC)._SubType = m
 	return _BVLCForwardedNPDUCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
index ed4ed393cbf..a3bee5e5886 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
@@ -55,16 +55,13 @@ type BVLCOriginalBroadcastNPDU interface {
 type _BVLCOriginalBroadcastNPDU struct {
 	BVLCContract
 	Npdu NPDU
-
-	// Arguments.
-	BvlcPayloadLength uint16
 }
 
 var _ BVLCOriginalBroadcastNPDU = (*_BVLCOriginalBroadcastNPDU)(nil)
 var _ BVLCRequirements = (*_BVLCOriginalBroadcastNPDU)(nil)
 
 // NewBVLCOriginalBroadcastNPDU factory function for _BVLCOriginalBroadcastNPDU
-func NewBVLCOriginalBroadcastNPDU(npdu NPDU, bvlcPayloadLength uint16) *_BVLCOriginalBroadcastNPDU {
+func NewBVLCOriginalBroadcastNPDU(npdu NPDU) *_BVLCOriginalBroadcastNPDU {
 	if npdu == nil {
 		panic("npdu of type NPDU for BVLCOriginalBroadcastNPDU must not be nil")
 	}
@@ -90,8 +87,6 @@ type BVLCOriginalBroadcastNPDUBuilder interface {
 	WithNpdu(NPDU) BVLCOriginalBroadcastNPDUBuilder
 	// WithNpduBuilder adds Npdu (property field) which is build by the builder
 	WithNpduBuilder(func(NPDUBuilder) NPDUBuilder) BVLCOriginalBroadcastNPDUBuilder
-	// WithArgBvlcPayloadLength sets a parser argument
-	WithArgBvlcPayloadLength(uint16) BVLCOriginalBroadcastNPDUBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BVLCBuilder
 	// Build builds the BVLCOriginalBroadcastNPDU or returns an error if something is wrong
@@ -139,11 +134,6 @@ func (b *_BVLCOriginalBroadcastNPDUBuilder) WithNpduBuilder(builderSupplier func
 	return b
 }
 
-func (b *_BVLCOriginalBroadcastNPDUBuilder) WithArgBvlcPayloadLength(bvlcPayloadLength uint16) BVLCOriginalBroadcastNPDUBuilder {
-	b.BvlcPayloadLength = bvlcPayloadLength
-	return b
-}
-
 func (b *_BVLCOriginalBroadcastNPDUBuilder) Build() (BVLCOriginalBroadcastNPDU, error) {
 	if b.Npdu == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'npdu' not set"))
@@ -308,16 +298,6 @@ func (m *_BVLCOriginalBroadcastNPDU) SerializeWithWriteBuffer(ctx context.Contex
 	return m.BVLCContract.(*_BVLC).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BVLCOriginalBroadcastNPDU) GetBvlcPayloadLength() uint16 {
-	return m.BvlcPayloadLength
-}
-
-//
-////
-
 func (m *_BVLCOriginalBroadcastNPDU) IsBVLCOriginalBroadcastNPDU() {}
 
 func (m *_BVLCOriginalBroadcastNPDU) DeepCopy() any {
@@ -331,7 +311,6 @@ func (m *_BVLCOriginalBroadcastNPDU) deepCopy() *_BVLCOriginalBroadcastNPDU {
 	_BVLCOriginalBroadcastNPDUCopy := &_BVLCOriginalBroadcastNPDU{
 		m.BVLCContract.(*_BVLC).deepCopy(),
 		utils.DeepCopy[NPDU](m.Npdu),
-		m.BvlcPayloadLength,
 	}
 	_BVLCOriginalBroadcastNPDUCopy.BVLCContract.(*_BVLC)._SubType = m
 	return _BVLCOriginalBroadcastNPDUCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
index fe215fd8be7..9c8c58da23d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
@@ -55,16 +55,13 @@ type BVLCOriginalUnicastNPDU interface {
 type _BVLCOriginalUnicastNPDU struct {
 	BVLCContract
 	Npdu NPDU
-
-	// Arguments.
-	BvlcPayloadLength uint16
 }
 
 var _ BVLCOriginalUnicastNPDU = (*_BVLCOriginalUnicastNPDU)(nil)
 var _ BVLCRequirements = (*_BVLCOriginalUnicastNPDU)(nil)
 
 // NewBVLCOriginalUnicastNPDU factory function for _BVLCOriginalUnicastNPDU
-func NewBVLCOriginalUnicastNPDU(npdu NPDU, bvlcPayloadLength uint16) *_BVLCOriginalUnicastNPDU {
+func NewBVLCOriginalUnicastNPDU(npdu NPDU) *_BVLCOriginalUnicastNPDU {
 	if npdu == nil {
 		panic("npdu of type NPDU for BVLCOriginalUnicastNPDU must not be nil")
 	}
@@ -90,8 +87,6 @@ type BVLCOriginalUnicastNPDUBuilder interface {
 	WithNpdu(NPDU) BVLCOriginalUnicastNPDUBuilder
 	// WithNpduBuilder adds Npdu (property field) which is build by the builder
 	WithNpduBuilder(func(NPDUBuilder) NPDUBuilder) BVLCOriginalUnicastNPDUBuilder
-	// WithArgBvlcPayloadLength sets a parser argument
-	WithArgBvlcPayloadLength(uint16) BVLCOriginalUnicastNPDUBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BVLCBuilder
 	// Build builds the BVLCOriginalUnicastNPDU or returns an error if something is wrong
@@ -139,11 +134,6 @@ func (b *_BVLCOriginalUnicastNPDUBuilder) WithNpduBuilder(builderSupplier func(N
 	return b
 }
 
-func (b *_BVLCOriginalUnicastNPDUBuilder) WithArgBvlcPayloadLength(bvlcPayloadLength uint16) BVLCOriginalUnicastNPDUBuilder {
-	b.BvlcPayloadLength = bvlcPayloadLength
-	return b
-}
-
 func (b *_BVLCOriginalUnicastNPDUBuilder) Build() (BVLCOriginalUnicastNPDU, error) {
 	if b.Npdu == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'npdu' not set"))
@@ -308,16 +298,6 @@ func (m *_BVLCOriginalUnicastNPDU) SerializeWithWriteBuffer(ctx context.Context,
 	return m.BVLCContract.(*_BVLC).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BVLCOriginalUnicastNPDU) GetBvlcPayloadLength() uint16 {
-	return m.BvlcPayloadLength
-}
-
-//
-////
-
 func (m *_BVLCOriginalUnicastNPDU) IsBVLCOriginalUnicastNPDU() {}
 
 func (m *_BVLCOriginalUnicastNPDU) DeepCopy() any {
@@ -331,7 +311,6 @@ func (m *_BVLCOriginalUnicastNPDU) deepCopy() *_BVLCOriginalUnicastNPDU {
 	_BVLCOriginalUnicastNPDUCopy := &_BVLCOriginalUnicastNPDU{
 		m.BVLCContract.(*_BVLC).deepCopy(),
 		utils.DeepCopy[NPDU](m.Npdu),
-		m.BvlcPayloadLength,
 	}
 	_BVLCOriginalUnicastNPDUCopy.BVLCContract.(*_BVLC)._SubType = m
 	return _BVLCOriginalUnicastNPDUCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go
index fbfa78451ab..290b1768c20 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go
@@ -55,16 +55,13 @@ type BVLCReadBroadcastDistributionTableAck interface {
 type _BVLCReadBroadcastDistributionTableAck struct {
 	BVLCContract
 	Table []BVLCBroadcastDistributionTableEntry
-
-	// Arguments.
-	BvlcPayloadLength uint16
 }
 
 var _ BVLCReadBroadcastDistributionTableAck = (*_BVLCReadBroadcastDistributionTableAck)(nil)
 var _ BVLCRequirements = (*_BVLCReadBroadcastDistributionTableAck)(nil)
 
 // NewBVLCReadBroadcastDistributionTableAck factory function for _BVLCReadBroadcastDistributionTableAck
-func NewBVLCReadBroadcastDistributionTableAck(table []BVLCBroadcastDistributionTableEntry, bvlcPayloadLength uint16) *_BVLCReadBroadcastDistributionTableAck {
+func NewBVLCReadBroadcastDistributionTableAck(table []BVLCBroadcastDistributionTableEntry) *_BVLCReadBroadcastDistributionTableAck {
 	_result := &_BVLCReadBroadcastDistributionTableAck{
 		BVLCContract: NewBVLC(),
 		Table:        table,
@@ -85,8 +82,6 @@ type BVLCReadBroadcastDistributionTableAckBuilder interface {
 	WithMandatoryFields(table []BVLCBroadcastDistributionTableEntry) BVLCReadBroadcastDistributionTableAckBuilder
 	// WithTable adds Table (property field)
 	WithTable(...BVLCBroadcastDistributionTableEntry) BVLCReadBroadcastDistributionTableAckBuilder
-	// WithArgBvlcPayloadLength sets a parser argument
-	WithArgBvlcPayloadLength(uint16) BVLCReadBroadcastDistributionTableAckBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BVLCBuilder
 	// Build builds the BVLCReadBroadcastDistributionTableAck or returns an error if something is wrong
@@ -124,11 +119,6 @@ func (b *_BVLCReadBroadcastDistributionTableAckBuilder) WithTable(table ...BVLCB
 	return b
 }
 
-func (b *_BVLCReadBroadcastDistributionTableAckBuilder) WithArgBvlcPayloadLength(bvlcPayloadLength uint16) BVLCReadBroadcastDistributionTableAckBuilder {
-	b.BvlcPayloadLength = bvlcPayloadLength
-	return b
-}
-
 func (b *_BVLCReadBroadcastDistributionTableAckBuilder) Build() (BVLCReadBroadcastDistributionTableAck, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -294,16 +284,6 @@ func (m *_BVLCReadBroadcastDistributionTableAck) SerializeWithWriteBuffer(ctx co
 	return m.BVLCContract.(*_BVLC).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BVLCReadBroadcastDistributionTableAck) GetBvlcPayloadLength() uint16 {
-	return m.BvlcPayloadLength
-}
-
-//
-////
-
 func (m *_BVLCReadBroadcastDistributionTableAck) IsBVLCReadBroadcastDistributionTableAck() {}
 
 func (m *_BVLCReadBroadcastDistributionTableAck) DeepCopy() any {
@@ -317,7 +297,6 @@ func (m *_BVLCReadBroadcastDistributionTableAck) deepCopy() *_BVLCReadBroadcastD
 	_BVLCReadBroadcastDistributionTableAckCopy := &_BVLCReadBroadcastDistributionTableAck{
 		m.BVLCContract.(*_BVLC).deepCopy(),
 		utils.DeepCopySlice[BVLCBroadcastDistributionTableEntry, BVLCBroadcastDistributionTableEntry](m.Table),
-		m.BvlcPayloadLength,
 	}
 	_BVLCReadBroadcastDistributionTableAckCopy.BVLCContract.(*_BVLC)._SubType = m
 	return _BVLCReadBroadcastDistributionTableAckCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go
index 893a457878b..673a0762681 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go
@@ -55,16 +55,13 @@ type BVLCReadForeignDeviceTableAck interface {
 type _BVLCReadForeignDeviceTableAck struct {
 	BVLCContract
 	Table []BVLCForeignDeviceTableEntry
-
-	// Arguments.
-	BvlcPayloadLength uint16
 }
 
 var _ BVLCReadForeignDeviceTableAck = (*_BVLCReadForeignDeviceTableAck)(nil)
 var _ BVLCRequirements = (*_BVLCReadForeignDeviceTableAck)(nil)
 
 // NewBVLCReadForeignDeviceTableAck factory function for _BVLCReadForeignDeviceTableAck
-func NewBVLCReadForeignDeviceTableAck(table []BVLCForeignDeviceTableEntry, bvlcPayloadLength uint16) *_BVLCReadForeignDeviceTableAck {
+func NewBVLCReadForeignDeviceTableAck(table []BVLCForeignDeviceTableEntry) *_BVLCReadForeignDeviceTableAck {
 	_result := &_BVLCReadForeignDeviceTableAck{
 		BVLCContract: NewBVLC(),
 		Table:        table,
@@ -85,8 +82,6 @@ type BVLCReadForeignDeviceTableAckBuilder interface {
 	WithMandatoryFields(table []BVLCForeignDeviceTableEntry) BVLCReadForeignDeviceTableAckBuilder
 	// WithTable adds Table (property field)
 	WithTable(...BVLCForeignDeviceTableEntry) BVLCReadForeignDeviceTableAckBuilder
-	// WithArgBvlcPayloadLength sets a parser argument
-	WithArgBvlcPayloadLength(uint16) BVLCReadForeignDeviceTableAckBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BVLCBuilder
 	// Build builds the BVLCReadForeignDeviceTableAck or returns an error if something is wrong
@@ -124,11 +119,6 @@ func (b *_BVLCReadForeignDeviceTableAckBuilder) WithTable(table ...BVLCForeignDe
 	return b
 }
 
-func (b *_BVLCReadForeignDeviceTableAckBuilder) WithArgBvlcPayloadLength(bvlcPayloadLength uint16) BVLCReadForeignDeviceTableAckBuilder {
-	b.BvlcPayloadLength = bvlcPayloadLength
-	return b
-}
-
 func (b *_BVLCReadForeignDeviceTableAckBuilder) Build() (BVLCReadForeignDeviceTableAck, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -294,16 +284,6 @@ func (m *_BVLCReadForeignDeviceTableAck) SerializeWithWriteBuffer(ctx context.Co
 	return m.BVLCContract.(*_BVLC).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BVLCReadForeignDeviceTableAck) GetBvlcPayloadLength() uint16 {
-	return m.BvlcPayloadLength
-}
-
-//
-////
-
 func (m *_BVLCReadForeignDeviceTableAck) IsBVLCReadForeignDeviceTableAck() {}
 
 func (m *_BVLCReadForeignDeviceTableAck) DeepCopy() any {
@@ -317,7 +297,6 @@ func (m *_BVLCReadForeignDeviceTableAck) deepCopy() *_BVLCReadForeignDeviceTable
 	_BVLCReadForeignDeviceTableAckCopy := &_BVLCReadForeignDeviceTableAck{
 		m.BVLCContract.(*_BVLC).deepCopy(),
 		utils.DeepCopySlice[BVLCForeignDeviceTableEntry, BVLCForeignDeviceTableEntry](m.Table),
-		m.BvlcPayloadLength,
 	}
 	_BVLCReadForeignDeviceTableAckCopy.BVLCContract.(*_BVLC)._SubType = m
 	return _BVLCReadForeignDeviceTableAckCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCodeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCodeTagged.go
index 9cba1768d1a..7283bc7a56b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCodeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCodeTagged.go
@@ -54,20 +54,16 @@ type BVLCResultCodeTagged interface {
 type _BVLCResultCodeTagged struct {
 	Header BACnetTagHeader
 	Value  BVLCResultCode
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ BVLCResultCodeTagged = (*_BVLCResultCodeTagged)(nil)
 
 // NewBVLCResultCodeTagged factory function for _BVLCResultCodeTagged
-func NewBVLCResultCodeTagged(header BACnetTagHeader, value BVLCResultCode, tagNumber uint8, tagClass TagClass) *_BVLCResultCodeTagged {
+func NewBVLCResultCodeTagged(header BACnetTagHeader, value BVLCResultCode) *_BVLCResultCodeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for BVLCResultCodeTagged must not be nil")
 	}
-	return &_BVLCResultCodeTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_BVLCResultCodeTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type BVLCResultCodeTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BVLCResultCodeTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(BVLCResultCode) BVLCResultCodeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) BVLCResultCodeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) BVLCResultCodeTaggedBuilder
 	// Build builds the BVLCResultCodeTagged or returns an error if something is wrong
 	Build() (BVLCResultCodeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_BVLCResultCodeTaggedBuilder) WithValue(value BVLCResultCode) BVLCResul
 	return b
 }
 
-func (b *_BVLCResultCodeTaggedBuilder) WithArgTagNumber(tagNumber uint8) BVLCResultCodeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_BVLCResultCodeTaggedBuilder) WithArgTagClass(tagClass TagClass) BVLCResultCodeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_BVLCResultCodeTaggedBuilder) Build() (BVLCResultCodeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func BVLCResultCodeTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagCl
 }
 
 func BVLCResultCodeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (BVLCResultCodeTagged, error) {
-	v, err := (&_BVLCResultCodeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_BVLCResultCodeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_BVLCResultCodeTagged) SerializeWithWriteBuffer(ctx context.Context, wr
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_BVLCResultCodeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_BVLCResultCodeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_BVLCResultCodeTagged) IsBVLCResultCodeTagged() {}
 
 func (m *_BVLCResultCodeTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_BVLCResultCodeTagged) deepCopy() *_BVLCResultCodeTagged {
 	_BVLCResultCodeTaggedCopy := &_BVLCResultCodeTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _BVLCResultCodeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCSecureBVLL.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCSecureBVLL.go
index 495f1065980..a8897adec8b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCSecureBVLL.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCSecureBVLL.go
@@ -55,16 +55,13 @@ type BVLCSecureBVLL interface {
 type _BVLCSecureBVLL struct {
 	BVLCContract
 	SecurityWrapper []byte
-
-	// Arguments.
-	BvlcPayloadLength uint16
 }
 
 var _ BVLCSecureBVLL = (*_BVLCSecureBVLL)(nil)
 var _ BVLCRequirements = (*_BVLCSecureBVLL)(nil)
 
 // NewBVLCSecureBVLL factory function for _BVLCSecureBVLL
-func NewBVLCSecureBVLL(securityWrapper []byte, bvlcPayloadLength uint16) *_BVLCSecureBVLL {
+func NewBVLCSecureBVLL(securityWrapper []byte) *_BVLCSecureBVLL {
 	_result := &_BVLCSecureBVLL{
 		BVLCContract:    NewBVLC(),
 		SecurityWrapper: securityWrapper,
@@ -85,8 +82,6 @@ type BVLCSecureBVLLBuilder interface {
 	WithMandatoryFields(securityWrapper []byte) BVLCSecureBVLLBuilder
 	// WithSecurityWrapper adds SecurityWrapper (property field)
 	WithSecurityWrapper(...byte) BVLCSecureBVLLBuilder
-	// WithArgBvlcPayloadLength sets a parser argument
-	WithArgBvlcPayloadLength(uint16) BVLCSecureBVLLBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BVLCBuilder
 	// Build builds the BVLCSecureBVLL or returns an error if something is wrong
@@ -124,11 +119,6 @@ func (b *_BVLCSecureBVLLBuilder) WithSecurityWrapper(securityWrapper ...byte) BV
 	return b
 }
 
-func (b *_BVLCSecureBVLLBuilder) WithArgBvlcPayloadLength(bvlcPayloadLength uint16) BVLCSecureBVLLBuilder {
-	b.BvlcPayloadLength = bvlcPayloadLength
-	return b
-}
-
 func (b *_BVLCSecureBVLLBuilder) Build() (BVLCSecureBVLL, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -292,16 +282,6 @@ func (m *_BVLCSecureBVLL) SerializeWithWriteBuffer(ctx context.Context, writeBuf
 	return m.BVLCContract.(*_BVLC).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BVLCSecureBVLL) GetBvlcPayloadLength() uint16 {
-	return m.BvlcPayloadLength
-}
-
-//
-////
-
 func (m *_BVLCSecureBVLL) IsBVLCSecureBVLL() {}
 
 func (m *_BVLCSecureBVLL) DeepCopy() any {
@@ -315,7 +295,6 @@ func (m *_BVLCSecureBVLL) deepCopy() *_BVLCSecureBVLL {
 	_BVLCSecureBVLLCopy := &_BVLCSecureBVLL{
 		m.BVLCContract.(*_BVLC).deepCopy(),
 		utils.DeepCopySlice[byte, byte](m.SecurityWrapper),
-		m.BvlcPayloadLength,
 	}
 	_BVLCSecureBVLLCopy.BVLCContract.(*_BVLC)._SubType = m
 	return _BVLCSecureBVLLCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go
index 5e0a13ad2cc..b311ae580c3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go
@@ -55,16 +55,13 @@ type BVLCWriteBroadcastDistributionTable interface {
 type _BVLCWriteBroadcastDistributionTable struct {
 	BVLCContract
 	Table []BVLCBroadcastDistributionTableEntry
-
-	// Arguments.
-	BvlcPayloadLength uint16
 }
 
 var _ BVLCWriteBroadcastDistributionTable = (*_BVLCWriteBroadcastDistributionTable)(nil)
 var _ BVLCRequirements = (*_BVLCWriteBroadcastDistributionTable)(nil)
 
 // NewBVLCWriteBroadcastDistributionTable factory function for _BVLCWriteBroadcastDistributionTable
-func NewBVLCWriteBroadcastDistributionTable(table []BVLCBroadcastDistributionTableEntry, bvlcPayloadLength uint16) *_BVLCWriteBroadcastDistributionTable {
+func NewBVLCWriteBroadcastDistributionTable(table []BVLCBroadcastDistributionTableEntry) *_BVLCWriteBroadcastDistributionTable {
 	_result := &_BVLCWriteBroadcastDistributionTable{
 		BVLCContract: NewBVLC(),
 		Table:        table,
@@ -85,8 +82,6 @@ type BVLCWriteBroadcastDistributionTableBuilder interface {
 	WithMandatoryFields(table []BVLCBroadcastDistributionTableEntry) BVLCWriteBroadcastDistributionTableBuilder
 	// WithTable adds Table (property field)
 	WithTable(...BVLCBroadcastDistributionTableEntry) BVLCWriteBroadcastDistributionTableBuilder
-	// WithArgBvlcPayloadLength sets a parser argument
-	WithArgBvlcPayloadLength(uint16) BVLCWriteBroadcastDistributionTableBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() BVLCBuilder
 	// Build builds the BVLCWriteBroadcastDistributionTable or returns an error if something is wrong
@@ -124,11 +119,6 @@ func (b *_BVLCWriteBroadcastDistributionTableBuilder) WithTable(table ...BVLCBro
 	return b
 }
 
-func (b *_BVLCWriteBroadcastDistributionTableBuilder) WithArgBvlcPayloadLength(bvlcPayloadLength uint16) BVLCWriteBroadcastDistributionTableBuilder {
-	b.BvlcPayloadLength = bvlcPayloadLength
-	return b
-}
-
 func (b *_BVLCWriteBroadcastDistributionTableBuilder) Build() (BVLCWriteBroadcastDistributionTable, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -294,16 +284,6 @@ func (m *_BVLCWriteBroadcastDistributionTable) SerializeWithWriteBuffer(ctx cont
 	return m.BVLCContract.(*_BVLC).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_BVLCWriteBroadcastDistributionTable) GetBvlcPayloadLength() uint16 {
-	return m.BvlcPayloadLength
-}
-
-//
-////
-
 func (m *_BVLCWriteBroadcastDistributionTable) IsBVLCWriteBroadcastDistributionTable() {}
 
 func (m *_BVLCWriteBroadcastDistributionTable) DeepCopy() any {
@@ -317,7 +297,6 @@ func (m *_BVLCWriteBroadcastDistributionTable) deepCopy() *_BVLCWriteBroadcastDi
 	_BVLCWriteBroadcastDistributionTableCopy := &_BVLCWriteBroadcastDistributionTable{
 		m.BVLCContract.(*_BVLC).deepCopy(),
 		utils.DeepCopySlice[BVLCBroadcastDistributionTableEntry, BVLCBroadcastDistributionTableEntry](m.Table),
-		m.BvlcPayloadLength,
 	}
 	_BVLCWriteBroadcastDistributionTableCopy.BVLCContract.(*_BVLC)._SubType = m
 	return _BVLCWriteBroadcastDistributionTableCopy
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ConfirmedEventNotificationRequest.go b/plc4go/protocols/bacnetip/readwrite/model/ConfirmedEventNotificationRequest.go
index 3202b0cc0ec..31670d5b41a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ConfirmedEventNotificationRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ConfirmedEventNotificationRequest.go
@@ -611,7 +611,7 @@ func ConfirmedEventNotificationRequestParseWithBufferProducer() func(ctx context
 }
 
 func ConfirmedEventNotificationRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ConfirmedEventNotificationRequest, error) {
-	v, err := (&_ConfirmedEventNotificationRequest{}).parse(ctx, readBuffer)
+	v, err := (new(_ConfirmedEventNotificationRequest)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/Constants.go b/plc4go/protocols/bacnetip/readwrite/model/Constants.go
new file mode 100644
index 00000000000..2f93807021f
--- /dev/null
+++ b/plc4go/protocols/bacnetip/readwrite/model/Constants.go
@@ -0,0 +1,24 @@
+/*
+ * 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 model
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Constant values.
+var Constant_BACNETUDPDEFAULTPORT uint16 = uint16(47808)
diff --git a/plc4go/protocols/bacnetip/readwrite/model/Error.go b/plc4go/protocols/bacnetip/readwrite/model/Error.go
index 3ad1c6d1579..a97c5ab8cca 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/Error.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/Error.go
@@ -242,7 +242,7 @@ func ErrorParseWithBufferProducer() func(ctx context.Context, readBuffer utils.R
 }
 
 func ErrorParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (Error, error) {
-	v, err := (&_Error{}).parse(ctx, readBuffer)
+	v, err := (new(_Error)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ErrorClassTagged.go b/plc4go/protocols/bacnetip/readwrite/model/ErrorClassTagged.go
index d40d43ee545..fe04076c3dc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ErrorClassTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ErrorClassTagged.go
@@ -59,20 +59,16 @@ type _ErrorClassTagged struct {
 	Header           BACnetTagHeader
 	Value            ErrorClass
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ ErrorClassTagged = (*_ErrorClassTagged)(nil)
 
 // NewErrorClassTagged factory function for _ErrorClassTagged
-func NewErrorClassTagged(header BACnetTagHeader, value ErrorClass, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_ErrorClassTagged {
+func NewErrorClassTagged(header BACnetTagHeader, value ErrorClass, proprietaryValue uint32) *_ErrorClassTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for ErrorClassTagged must not be nil")
 	}
-	return &_ErrorClassTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_ErrorClassTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type ErrorClassTaggedBuilder interface {
 	WithValue(ErrorClass) ErrorClassTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) ErrorClassTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) ErrorClassTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) ErrorClassTaggedBuilder
 	// Build builds the ErrorClassTagged or returns an error if something is wrong
 	Build() (ErrorClassTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_ErrorClassTaggedBuilder) WithProprietaryValue(proprietaryValue uint32)
 	return b
 }
 
-func (b *_ErrorClassTaggedBuilder) WithArgTagNumber(tagNumber uint8) ErrorClassTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_ErrorClassTaggedBuilder) WithArgTagClass(tagClass TagClass) ErrorClassTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_ErrorClassTaggedBuilder) Build() (ErrorClassTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func ErrorClassTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagClass)
 }
 
 func ErrorClassTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (ErrorClassTagged, error) {
-	v, err := (&_ErrorClassTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_ErrorClassTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_ErrorClassTagged) SerializeWithWriteBuffer(ctx context.Context, writeB
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_ErrorClassTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_ErrorClassTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_ErrorClassTagged) IsErrorClassTagged() {}
 
 func (m *_ErrorClassTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_ErrorClassTagged) deepCopy() *_ErrorClassTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _ErrorClassTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ErrorCodeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/ErrorCodeTagged.go
index 752995de0a6..95ef77c72e6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ErrorCodeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ErrorCodeTagged.go
@@ -59,20 +59,16 @@ type _ErrorCodeTagged struct {
 	Header           BACnetTagHeader
 	Value            ErrorCode
 	ProprietaryValue uint32
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ ErrorCodeTagged = (*_ErrorCodeTagged)(nil)
 
 // NewErrorCodeTagged factory function for _ErrorCodeTagged
-func NewErrorCodeTagged(header BACnetTagHeader, value ErrorCode, proprietaryValue uint32, tagNumber uint8, tagClass TagClass) *_ErrorCodeTagged {
+func NewErrorCodeTagged(header BACnetTagHeader, value ErrorCode, proprietaryValue uint32) *_ErrorCodeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for ErrorCodeTagged must not be nil")
 	}
-	return &_ErrorCodeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue, TagNumber: tagNumber, TagClass: tagClass}
+	return &_ErrorCodeTagged{Header: header, Value: value, ProprietaryValue: proprietaryValue}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,10 +89,6 @@ type ErrorCodeTaggedBuilder interface {
 	WithValue(ErrorCode) ErrorCodeTaggedBuilder
 	// WithProprietaryValue adds ProprietaryValue (property field)
 	WithProprietaryValue(uint32) ErrorCodeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) ErrorCodeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) ErrorCodeTaggedBuilder
 	// Build builds the ErrorCodeTagged or returns an error if something is wrong
 	Build() (ErrorCodeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -145,15 +137,6 @@ func (b *_ErrorCodeTaggedBuilder) WithProprietaryValue(proprietaryValue uint32)
 	return b
 }
 
-func (b *_ErrorCodeTaggedBuilder) WithArgTagNumber(tagNumber uint8) ErrorCodeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_ErrorCodeTaggedBuilder) WithArgTagClass(tagClass TagClass) ErrorCodeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_ErrorCodeTaggedBuilder) Build() (ErrorCodeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -277,7 +260,7 @@ func ErrorCodeTaggedParseWithBufferProducer(tagNumber uint8, tagClass TagClass)
 }
 
 func ErrorCodeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (ErrorCodeTagged, error) {
-	v, err := (&_ErrorCodeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_ErrorCodeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -377,19 +360,6 @@ func (m *_ErrorCodeTagged) SerializeWithWriteBuffer(ctx context.Context, writeBu
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_ErrorCodeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_ErrorCodeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_ErrorCodeTagged) IsErrorCodeTagged() {}
 
 func (m *_ErrorCodeTagged) DeepCopy() any {
@@ -404,8 +374,6 @@ func (m *_ErrorCodeTagged) deepCopy() *_ErrorCodeTagged {
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
 		m.ProprietaryValue,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _ErrorCodeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ErrorEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/ErrorEnclosed.go
index 080dabba7e1..297fd38fa04 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ErrorEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ErrorEnclosed.go
@@ -57,15 +57,12 @@ type _ErrorEnclosed struct {
 	OpeningTag BACnetOpeningTag
 	Error      Error
 	ClosingTag BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ ErrorEnclosed = (*_ErrorEnclosed)(nil)
 
 // NewErrorEnclosed factory function for _ErrorEnclosed
-func NewErrorEnclosed(openingTag BACnetOpeningTag, error Error, closingTag BACnetClosingTag, tagNumber uint8) *_ErrorEnclosed {
+func NewErrorEnclosed(openingTag BACnetOpeningTag, error Error, closingTag BACnetClosingTag) *_ErrorEnclosed {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for ErrorEnclosed must not be nil")
 	}
@@ -75,7 +72,7 @@ func NewErrorEnclosed(openingTag BACnetOpeningTag, error Error, closingTag BACne
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for ErrorEnclosed must not be nil")
 	}
-	return &_ErrorEnclosed{OpeningTag: openingTag, Error: error, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_ErrorEnclosed{OpeningTag: openingTag, Error: error, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -100,8 +97,6 @@ type ErrorEnclosedBuilder interface {
 	WithClosingTag(BACnetClosingTag) ErrorEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) ErrorEnclosedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) ErrorEnclosedBuilder
 	// Build builds the ErrorEnclosed or returns an error if something is wrong
 	Build() (ErrorEnclosed, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,11 +165,6 @@ func (b *_ErrorEnclosedBuilder) WithClosingTagBuilder(builderSupplier func(BACne
 	return b
 }
 
-func (b *_ErrorEnclosedBuilder) WithArgTagNumber(tagNumber uint8) ErrorEnclosedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_ErrorEnclosedBuilder) Build() (ErrorEnclosed, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -287,7 +277,7 @@ func ErrorEnclosedParseWithBufferProducer(tagNumber uint8) func(ctx context.Cont
 }
 
 func ErrorEnclosedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (ErrorEnclosed, error) {
-	v, err := (&_ErrorEnclosed{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_ErrorEnclosed)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -363,16 +353,6 @@ func (m *_ErrorEnclosed) SerializeWithWriteBuffer(ctx context.Context, writeBuff
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_ErrorEnclosed) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_ErrorEnclosed) IsErrorEnclosed() {}
 
 func (m *_ErrorEnclosed) DeepCopy() any {
@@ -387,7 +367,6 @@ func (m *_ErrorEnclosed) deepCopy() *_ErrorEnclosed {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopy[Error](m.Error),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _ErrorEnclosedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotifications.go b/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotifications.go
index b9e09595633..652ef2ac938 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotifications.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotifications.go
@@ -298,7 +298,7 @@ func ListOfCovNotificationsParseWithBufferProducer() func(ctx context.Context, r
 }
 
 func ListOfCovNotificationsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ListOfCovNotifications, error) {
-	v, err := (&_ListOfCovNotifications{}).parse(ctx, readBuffer)
+	v, err := (new(_ListOfCovNotifications)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsList.go b/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsList.go
index de3e43ade70..dff29a426cf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsList.go
@@ -57,22 +57,19 @@ type _ListOfCovNotificationsList struct {
 	OpeningTag     BACnetOpeningTag
 	Specifications []ListOfCovNotifications
 	ClosingTag     BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ ListOfCovNotificationsList = (*_ListOfCovNotificationsList)(nil)
 
 // NewListOfCovNotificationsList factory function for _ListOfCovNotificationsList
-func NewListOfCovNotificationsList(openingTag BACnetOpeningTag, specifications []ListOfCovNotifications, closingTag BACnetClosingTag, tagNumber uint8) *_ListOfCovNotificationsList {
+func NewListOfCovNotificationsList(openingTag BACnetOpeningTag, specifications []ListOfCovNotifications, closingTag BACnetClosingTag) *_ListOfCovNotificationsList {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for ListOfCovNotificationsList must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for ListOfCovNotificationsList must not be nil")
 	}
-	return &_ListOfCovNotificationsList{OpeningTag: openingTag, Specifications: specifications, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_ListOfCovNotificationsList{OpeningTag: openingTag, Specifications: specifications, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type ListOfCovNotificationsListBuilder interface {
 	WithClosingTag(BACnetClosingTag) ListOfCovNotificationsListBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) ListOfCovNotificationsListBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) ListOfCovNotificationsListBuilder
 	// Build builds the ListOfCovNotificationsList or returns an error if something is wrong
 	Build() (ListOfCovNotificationsList, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_ListOfCovNotificationsListBuilder) WithClosingTagBuilder(builderSuppli
 	return b
 }
 
-func (b *_ListOfCovNotificationsListBuilder) WithArgTagNumber(tagNumber uint8) ListOfCovNotificationsListBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_ListOfCovNotificationsListBuilder) Build() (ListOfCovNotificationsList, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func ListOfCovNotificationsListParseWithBufferProducer(tagNumber uint8) func(ctx
 }
 
 func ListOfCovNotificationsListParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (ListOfCovNotificationsList, error) {
-	v, err := (&_ListOfCovNotificationsList{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_ListOfCovNotificationsList)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_ListOfCovNotificationsList) SerializeWithWriteBuffer(ctx context.Conte
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_ListOfCovNotificationsList) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_ListOfCovNotificationsList) IsListOfCovNotificationsList() {}
 
 func (m *_ListOfCovNotificationsList) DeepCopy() any {
@@ -373,7 +353,6 @@ func (m *_ListOfCovNotificationsList) deepCopy() *_ListOfCovNotificationsList {
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[ListOfCovNotifications, ListOfCovNotifications](m.Specifications),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _ListOfCovNotificationsListCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsValue.go b/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsValue.go
index d31c288acc2..bd35ac973dc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsValue.go
@@ -60,22 +60,19 @@ type _ListOfCovNotificationsValue struct {
 	ArrayIndex         BACnetContextTagUnsignedInteger
 	PropertyValue      BACnetConstructedData
 	TimeOfChange       BACnetContextTagTime
-
-	// Arguments.
-	ObjectTypeArgument BACnetObjectType
 }
 
 var _ ListOfCovNotificationsValue = (*_ListOfCovNotificationsValue)(nil)
 
 // NewListOfCovNotificationsValue factory function for _ListOfCovNotificationsValue
-func NewListOfCovNotificationsValue(propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger, propertyValue BACnetConstructedData, timeOfChange BACnetContextTagTime, objectTypeArgument BACnetObjectType) *_ListOfCovNotificationsValue {
+func NewListOfCovNotificationsValue(propertyIdentifier BACnetPropertyIdentifierTagged, arrayIndex BACnetContextTagUnsignedInteger, propertyValue BACnetConstructedData, timeOfChange BACnetContextTagTime) *_ListOfCovNotificationsValue {
 	if propertyIdentifier == nil {
 		panic("propertyIdentifier of type BACnetPropertyIdentifierTagged for ListOfCovNotificationsValue must not be nil")
 	}
 	if propertyValue == nil {
 		panic("propertyValue of type BACnetConstructedData for ListOfCovNotificationsValue must not be nil")
 	}
-	return &_ListOfCovNotificationsValue{PropertyIdentifier: propertyIdentifier, ArrayIndex: arrayIndex, PropertyValue: propertyValue, TimeOfChange: timeOfChange, ObjectTypeArgument: objectTypeArgument}
+	return &_ListOfCovNotificationsValue{PropertyIdentifier: propertyIdentifier, ArrayIndex: arrayIndex, PropertyValue: propertyValue, TimeOfChange: timeOfChange}
 }
 
 ///////////////////////////////////////////////////////////
@@ -104,8 +101,6 @@ type ListOfCovNotificationsValueBuilder interface {
 	WithOptionalTimeOfChange(BACnetContextTagTime) ListOfCovNotificationsValueBuilder
 	// WithOptionalTimeOfChangeBuilder adds TimeOfChange (property field) which is build by the builder
 	WithOptionalTimeOfChangeBuilder(func(BACnetContextTagTimeBuilder) BACnetContextTagTimeBuilder) ListOfCovNotificationsValueBuilder
-	// WithArgObjectTypeArgument sets a parser argument
-	WithArgObjectTypeArgument(BACnetObjectType) ListOfCovNotificationsValueBuilder
 	// Build builds the ListOfCovNotificationsValue or returns an error if something is wrong
 	Build() (ListOfCovNotificationsValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -189,11 +184,6 @@ func (b *_ListOfCovNotificationsValueBuilder) WithOptionalTimeOfChangeBuilder(bu
 	return b
 }
 
-func (b *_ListOfCovNotificationsValueBuilder) WithArgObjectTypeArgument(objectTypeArgument BACnetObjectType) ListOfCovNotificationsValueBuilder {
-	b.ObjectTypeArgument = objectTypeArgument
-	return b
-}
-
 func (b *_ListOfCovNotificationsValueBuilder) Build() (ListOfCovNotificationsValue, error) {
 	if b.PropertyIdentifier == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'propertyIdentifier' not set"))
@@ -314,7 +304,7 @@ func ListOfCovNotificationsValueParseWithBufferProducer(objectTypeArgument BACne
 }
 
 func ListOfCovNotificationsValueParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, objectTypeArgument BACnetObjectType) (ListOfCovNotificationsValue, error) {
-	v, err := (&_ListOfCovNotificationsValue{ObjectTypeArgument: objectTypeArgument}).parse(ctx, readBuffer, objectTypeArgument)
+	v, err := (new(_ListOfCovNotificationsValue)).parse(ctx, readBuffer, objectTypeArgument)
 	if err != nil {
 		return nil, err
 	}
@@ -408,16 +398,6 @@ func (m *_ListOfCovNotificationsValue) SerializeWithWriteBuffer(ctx context.Cont
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_ListOfCovNotificationsValue) GetObjectTypeArgument() BACnetObjectType {
-	return m.ObjectTypeArgument
-}
-
-//
-////
-
 func (m *_ListOfCovNotificationsValue) IsListOfCovNotificationsValue() {}
 
 func (m *_ListOfCovNotificationsValue) DeepCopy() any {
@@ -433,7 +413,6 @@ func (m *_ListOfCovNotificationsValue) deepCopy() *_ListOfCovNotificationsValue
 		utils.DeepCopy[BACnetContextTagUnsignedInteger](m.ArrayIndex),
 		utils.DeepCopy[BACnetConstructedData](m.PropertyValue),
 		utils.DeepCopy[BACnetContextTagTime](m.TimeOfChange),
-		m.ObjectTypeArgument,
 	}
 	return _ListOfCovNotificationsValueCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLM.go b/plc4go/protocols/bacnetip/readwrite/model/NLM.go
index 2b59ca5960d..94066866358 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLM.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLM.go
@@ -52,8 +52,6 @@ type NLM interface {
 type NLMContract interface {
 	// GetIsVendorProprietaryMessage returns IsVendorProprietaryMessage (virtual field)
 	GetIsVendorProprietaryMessage() bool
-	// GetApduLength() returns a parser argument
-	GetApduLength() uint16
 	// IsNLM is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsNLM()
 	// CreateBuilder creates a NLMBuilder
@@ -76,16 +74,13 @@ type _NLM struct {
 		NLMContract
 		NLMRequirements
 	}
-
-	// Arguments.
-	ApduLength uint16
 }
 
 var _ NLMContract = (*_NLM)(nil)
 
 // NewNLM factory function for _NLM
-func NewNLM(apduLength uint16) *_NLM {
-	return &_NLM{ApduLength: apduLength}
+func NewNLM() *_NLM {
+	return &_NLM{}
 }
 
 ///////////////////////////////////////////////////////////
@@ -98,8 +93,6 @@ type NLMBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
 	WithMandatoryFields() NLMBuilder
-	// WithArgApduLength sets a parser argument
-	WithArgApduLength(uint16) NLMBuilder
 	// AsNLMWhoIsRouterToNetwork converts this build to a subType of NLM. It is always possible to return to current builder using Done()
 	AsNLMWhoIsRouterToNetwork() NLMWhoIsRouterToNetworkBuilder
 	// AsNLMIAmRouterToNetwork converts this build to a subType of NLM. It is always possible to return to current builder using Done()
@@ -179,11 +172,6 @@ func (b *_NLMBuilder) WithMandatoryFields() NLMBuilder {
 	return b
 }
 
-func (b *_NLMBuilder) WithArgApduLength(apduLength uint16) NLMBuilder {
-	b.ApduLength = apduLength
-	return b
-}
-
 func (b *_NLMBuilder) PartialBuild() (NLMContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -528,7 +516,7 @@ func NLMParseWithBufferProducer[T NLM](apduLength uint16) func(ctx context.Conte
 }
 
 func NLMParseWithBuffer[T NLM](ctx context.Context, readBuffer utils.ReadBuffer, apduLength uint16) (T, error) {
-	v, err := (&_NLM{ApduLength: apduLength}).parse(ctx, readBuffer, apduLength)
+	v, err := (new(_NLM)).parse(ctx, readBuffer, apduLength)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -696,16 +684,6 @@ func (pm *_NLM) serializeParent(ctx context.Context, writeBuffer utils.WriteBuff
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_NLM) GetApduLength() uint16 {
-	return m.ApduLength
-}
-
-//
-////
-
 func (m *_NLM) IsNLM() {}
 
 func (m *_NLM) DeepCopy() any {
@@ -718,7 +696,6 @@ func (m *_NLM) deepCopy() *_NLM {
 	}
 	_NLMCopy := &_NLM{
 		nil, // will be set by child
-		m.ApduLength,
 	}
 	return _NLMCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMChallengeRequest.go b/plc4go/protocols/bacnetip/readwrite/model/NLMChallengeRequest.go
index 30a4f78ab62..c63fe1968c4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMChallengeRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMChallengeRequest.go
@@ -65,9 +65,9 @@ var _ NLMChallengeRequest = (*_NLMChallengeRequest)(nil)
 var _ NLMRequirements = (*_NLMChallengeRequest)(nil)
 
 // NewNLMChallengeRequest factory function for _NLMChallengeRequest
-func NewNLMChallengeRequest(messageChallenge byte, originalMessageId uint32, originalTimestamp uint32, apduLength uint16) *_NLMChallengeRequest {
+func NewNLMChallengeRequest(messageChallenge byte, originalMessageId uint32, originalTimestamp uint32) *_NLMChallengeRequest {
 	_result := &_NLMChallengeRequest{
-		NLMContract:       NewNLM(apduLength),
+		NLMContract:       NewNLM(),
 		MessageChallenge:  messageChallenge,
 		OriginalMessageId: originalMessageId,
 		OriginalTimestamp: originalTimestamp,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go
index 6943cb4dbd8..9769ddcb415 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go
@@ -59,9 +59,9 @@ var _ NLMDisconnectConnectionToNetwork = (*_NLMDisconnectConnectionToNetwork)(ni
 var _ NLMRequirements = (*_NLMDisconnectConnectionToNetwork)(nil)
 
 // NewNLMDisconnectConnectionToNetwork factory function for _NLMDisconnectConnectionToNetwork
-func NewNLMDisconnectConnectionToNetwork(destinationNetworkAddress uint16, apduLength uint16) *_NLMDisconnectConnectionToNetwork {
+func NewNLMDisconnectConnectionToNetwork(destinationNetworkAddress uint16) *_NLMDisconnectConnectionToNetwork {
 	_result := &_NLMDisconnectConnectionToNetwork{
-		NLMContract:               NewNLM(apduLength),
+		NLMContract:               NewNLM(),
 		DestinationNetworkAddress: destinationNetworkAddress,
 	}
 	_result.NLMContract.(*_NLM)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go
index 62fd2d167a6..d9cf06e8285 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go
@@ -62,9 +62,9 @@ var _ NLMEstablishConnectionToNetwork = (*_NLMEstablishConnectionToNetwork)(nil)
 var _ NLMRequirements = (*_NLMEstablishConnectionToNetwork)(nil)
 
 // NewNLMEstablishConnectionToNetwork factory function for _NLMEstablishConnectionToNetwork
-func NewNLMEstablishConnectionToNetwork(destinationNetworkAddress uint16, terminationTime uint8, apduLength uint16) *_NLMEstablishConnectionToNetwork {
+func NewNLMEstablishConnectionToNetwork(destinationNetworkAddress uint16, terminationTime uint8) *_NLMEstablishConnectionToNetwork {
 	_result := &_NLMEstablishConnectionToNetwork{
-		NLMContract:               NewNLM(apduLength),
+		NLMContract:               NewNLM(),
 		DestinationNetworkAddress: destinationNetworkAddress,
 		TerminationTime:           terminationTime,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
index 1042068623a..032aa609272 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
@@ -59,9 +59,9 @@ var _ NLMIAmRouterToNetwork = (*_NLMIAmRouterToNetwork)(nil)
 var _ NLMRequirements = (*_NLMIAmRouterToNetwork)(nil)
 
 // NewNLMIAmRouterToNetwork factory function for _NLMIAmRouterToNetwork
-func NewNLMIAmRouterToNetwork(destinationNetworkAddresses []uint16, apduLength uint16) *_NLMIAmRouterToNetwork {
+func NewNLMIAmRouterToNetwork(destinationNetworkAddresses []uint16) *_NLMIAmRouterToNetwork {
 	_result := &_NLMIAmRouterToNetwork{
-		NLMContract:                 NewNLM(apduLength),
+		NLMContract:                 NewNLM(),
 		DestinationNetworkAddresses: destinationNetworkAddresses,
 	}
 	_result.NLMContract.(*_NLM)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go
index 887d0ab12d8..de9520451e2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go
@@ -62,9 +62,9 @@ var _ NLMICouldBeRouterToNetwork = (*_NLMICouldBeRouterToNetwork)(nil)
 var _ NLMRequirements = (*_NLMICouldBeRouterToNetwork)(nil)
 
 // NewNLMICouldBeRouterToNetwork factory function for _NLMICouldBeRouterToNetwork
-func NewNLMICouldBeRouterToNetwork(destinationNetworkAddress uint16, performanceIndex uint8, apduLength uint16) *_NLMICouldBeRouterToNetwork {
+func NewNLMICouldBeRouterToNetwork(destinationNetworkAddress uint16, performanceIndex uint8) *_NLMICouldBeRouterToNetwork {
 	_result := &_NLMICouldBeRouterToNetwork{
-		NLMContract:               NewNLM(apduLength),
+		NLMContract:               NewNLM(),
 		DestinationNetworkAddress: destinationNetworkAddress,
 		PerformanceIndex:          performanceIndex,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTable.go b/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTable.go
index 85f0c7d3f15..4e5d7130c39 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTable.go
@@ -62,9 +62,9 @@ var _ NLMInitializeRoutingTable = (*_NLMInitializeRoutingTable)(nil)
 var _ NLMRequirements = (*_NLMInitializeRoutingTable)(nil)
 
 // NewNLMInitializeRoutingTable factory function for _NLMInitializeRoutingTable
-func NewNLMInitializeRoutingTable(numberOfPorts uint8, portMappings []NLMInitializeRoutingTablePortMapping, apduLength uint16) *_NLMInitializeRoutingTable {
+func NewNLMInitializeRoutingTable(numberOfPorts uint8, portMappings []NLMInitializeRoutingTablePortMapping) *_NLMInitializeRoutingTable {
 	_result := &_NLMInitializeRoutingTable{
-		NLMContract:   NewNLM(apduLength),
+		NLMContract:   NewNLM(),
 		NumberOfPorts: numberOfPorts,
 		PortMappings:  portMappings,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTableAck.go b/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTableAck.go
index 567296c5bee..14f2c15093b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTableAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTableAck.go
@@ -62,9 +62,9 @@ var _ NLMInitializeRoutingTableAck = (*_NLMInitializeRoutingTableAck)(nil)
 var _ NLMRequirements = (*_NLMInitializeRoutingTableAck)(nil)
 
 // NewNLMInitializeRoutingTableAck factory function for _NLMInitializeRoutingTableAck
-func NewNLMInitializeRoutingTableAck(numberOfPorts uint8, portMappings []NLMInitializeRoutingTablePortMapping, apduLength uint16) *_NLMInitializeRoutingTableAck {
+func NewNLMInitializeRoutingTableAck(numberOfPorts uint8, portMappings []NLMInitializeRoutingTablePortMapping) *_NLMInitializeRoutingTableAck {
 	_result := &_NLMInitializeRoutingTableAck{
-		NLMContract:   NewNLM(apduLength),
+		NLMContract:   NewNLM(),
 		NumberOfPorts: numberOfPorts,
 		PortMappings:  portMappings,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTablePortMapping.go b/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTablePortMapping.go
index 4e43d41b517..b5c2158279a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTablePortMapping.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTablePortMapping.go
@@ -242,7 +242,7 @@ func NLMInitializeRoutingTablePortMappingParseWithBufferProducer() func(ctx cont
 }
 
 func NLMInitializeRoutingTablePortMappingParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (NLMInitializeRoutingTablePortMapping, error) {
-	v, err := (&_NLMInitializeRoutingTablePortMapping{}).parse(ctx, readBuffer)
+	v, err := (new(_NLMInitializeRoutingTablePortMapping)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMNetworkNumberIs.go b/plc4go/protocols/bacnetip/readwrite/model/NLMNetworkNumberIs.go
index c55245b2d29..9ae6e4473e5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMNetworkNumberIs.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMNetworkNumberIs.go
@@ -64,9 +64,9 @@ var _ NLMNetworkNumberIs = (*_NLMNetworkNumberIs)(nil)
 var _ NLMRequirements = (*_NLMNetworkNumberIs)(nil)
 
 // NewNLMNetworkNumberIs factory function for _NLMNetworkNumberIs
-func NewNLMNetworkNumberIs(networkNumber uint16, networkNumberConfigured bool, apduLength uint16) *_NLMNetworkNumberIs {
+func NewNLMNetworkNumberIs(networkNumber uint16, networkNumberConfigured bool) *_NLMNetworkNumberIs {
 	_result := &_NLMNetworkNumberIs{
-		NLMContract:             NewNLM(apduLength),
+		NLMContract:             NewNLM(),
 		NetworkNumber:           networkNumber,
 		NetworkNumberConfigured: networkNumberConfigured,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetwork.go
index ef3ddc251ae..e03c8c0060a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetwork.go
@@ -62,9 +62,9 @@ var _ NLMRejectMessageToNetwork = (*_NLMRejectMessageToNetwork)(nil)
 var _ NLMRequirements = (*_NLMRejectMessageToNetwork)(nil)
 
 // NewNLMRejectMessageToNetwork factory function for _NLMRejectMessageToNetwork
-func NewNLMRejectMessageToNetwork(rejectReason NLMRejectMessageToNetworkRejectReason, destinationNetworkAddress uint16, apduLength uint16) *_NLMRejectMessageToNetwork {
+func NewNLMRejectMessageToNetwork(rejectReason NLMRejectMessageToNetworkRejectReason, destinationNetworkAddress uint16) *_NLMRejectMessageToNetwork {
 	_result := &_NLMRejectMessageToNetwork{
-		NLMContract:               NewNLM(apduLength),
+		NLMContract:               NewNLM(),
 		RejectReason:              rejectReason,
 		DestinationNetworkAddress: destinationNetworkAddress,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMRequestKeyUpdate.go b/plc4go/protocols/bacnetip/readwrite/model/NLMRequestKeyUpdate.go
index 27bfe16114f..314d97ded49 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMRequestKeyUpdate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMRequestKeyUpdate.go
@@ -77,9 +77,9 @@ var _ NLMRequestKeyUpdate = (*_NLMRequestKeyUpdate)(nil)
 var _ NLMRequirements = (*_NLMRequestKeyUpdate)(nil)
 
 // NewNLMRequestKeyUpdate factory function for _NLMRequestKeyUpdate
-func NewNLMRequestKeyUpdate(set1KeyRevision byte, set1ActivationTime uint32, set1ExpirationTime uint32, set2KeyRevision byte, set2ActivationTime uint32, set2ExpirationTime uint32, distributionKeyRevision byte, apduLength uint16) *_NLMRequestKeyUpdate {
+func NewNLMRequestKeyUpdate(set1KeyRevision byte, set1ActivationTime uint32, set1ExpirationTime uint32, set2KeyRevision byte, set2ActivationTime uint32, set2ExpirationTime uint32, distributionKeyRevision byte) *_NLMRequestKeyUpdate {
 	_result := &_NLMRequestKeyUpdate{
-		NLMContract:             NewNLM(apduLength),
+		NLMContract:             NewNLM(),
 		Set1KeyRevision:         set1KeyRevision,
 		Set1ActivationTime:      set1ActivationTime,
 		Set1ExpirationTime:      set1ExpirationTime,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMRequestMasterKey.go b/plc4go/protocols/bacnetip/readwrite/model/NLMRequestMasterKey.go
index be70b373b16..e16f15edbde 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMRequestMasterKey.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMRequestMasterKey.go
@@ -62,9 +62,9 @@ var _ NLMRequestMasterKey = (*_NLMRequestMasterKey)(nil)
 var _ NLMRequirements = (*_NLMRequestMasterKey)(nil)
 
 // NewNLMRequestMasterKey factory function for _NLMRequestMasterKey
-func NewNLMRequestMasterKey(numberOfSupportedKeyAlgorithms uint8, encryptionAndSignatureAlgorithms []byte, apduLength uint16) *_NLMRequestMasterKey {
+func NewNLMRequestMasterKey(numberOfSupportedKeyAlgorithms uint8, encryptionAndSignatureAlgorithms []byte) *_NLMRequestMasterKey {
 	_result := &_NLMRequestMasterKey{
-		NLMContract:                      NewNLM(apduLength),
+		NLMContract:                      NewNLM(),
 		NumberOfSupportedKeyAlgorithms:   numberOfSupportedKeyAlgorithms,
 		EncryptionAndSignatureAlgorithms: encryptionAndSignatureAlgorithms,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMReserved.go b/plc4go/protocols/bacnetip/readwrite/model/NLMReserved.go
index 824cc95ff46..b7bd9b6e2b7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMReserved.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMReserved.go
@@ -59,9 +59,9 @@ var _ NLMReserved = (*_NLMReserved)(nil)
 var _ NLMRequirements = (*_NLMReserved)(nil)
 
 // NewNLMReserved factory function for _NLMReserved
-func NewNLMReserved(unknownBytes []byte, apduLength uint16) *_NLMReserved {
+func NewNLMReserved(unknownBytes []byte) *_NLMReserved {
 	_result := &_NLMReserved{
-		NLMContract:  NewNLM(apduLength),
+		NLMContract:  NewNLM(),
 		UnknownBytes: unknownBytes,
 	}
 	_result.NLMContract.(*_NLM)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go
index e6d6d10403c..3fac68b0186 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go
@@ -59,9 +59,9 @@ var _ NLMRouterAvailableToNetwork = (*_NLMRouterAvailableToNetwork)(nil)
 var _ NLMRequirements = (*_NLMRouterAvailableToNetwork)(nil)
 
 // NewNLMRouterAvailableToNetwork factory function for _NLMRouterAvailableToNetwork
-func NewNLMRouterAvailableToNetwork(destinationNetworkAddresses []uint16, apduLength uint16) *_NLMRouterAvailableToNetwork {
+func NewNLMRouterAvailableToNetwork(destinationNetworkAddresses []uint16) *_NLMRouterAvailableToNetwork {
 	_result := &_NLMRouterAvailableToNetwork{
-		NLMContract:                 NewNLM(apduLength),
+		NLMContract:                 NewNLM(),
 		DestinationNetworkAddresses: destinationNetworkAddresses,
 	}
 	_result.NLMContract.(*_NLM)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go
index c9e6fa9d68b..0e04e314674 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go
@@ -59,9 +59,9 @@ var _ NLMRouterBusyToNetwork = (*_NLMRouterBusyToNetwork)(nil)
 var _ NLMRequirements = (*_NLMRouterBusyToNetwork)(nil)
 
 // NewNLMRouterBusyToNetwork factory function for _NLMRouterBusyToNetwork
-func NewNLMRouterBusyToNetwork(destinationNetworkAddresses []uint16, apduLength uint16) *_NLMRouterBusyToNetwork {
+func NewNLMRouterBusyToNetwork(destinationNetworkAddresses []uint16) *_NLMRouterBusyToNetwork {
 	_result := &_NLMRouterBusyToNetwork{
-		NLMContract:                 NewNLM(apduLength),
+		NLMContract:                 NewNLM(),
 		DestinationNetworkAddresses: destinationNetworkAddresses,
 	}
 	_result.NLMContract.(*_NLM)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityPayload.go b/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityPayload.go
index 1ac545a76a6..7476c1280ad 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityPayload.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityPayload.go
@@ -62,9 +62,9 @@ var _ NLMSecurityPayload = (*_NLMSecurityPayload)(nil)
 var _ NLMRequirements = (*_NLMSecurityPayload)(nil)
 
 // NewNLMSecurityPayload factory function for _NLMSecurityPayload
-func NewNLMSecurityPayload(payloadLength uint16, payload []byte, apduLength uint16) *_NLMSecurityPayload {
+func NewNLMSecurityPayload(payloadLength uint16, payload []byte) *_NLMSecurityPayload {
 	_result := &_NLMSecurityPayload{
-		NLMContract:   NewNLM(apduLength),
+		NLMContract:   NewNLM(),
 		PayloadLength: payloadLength,
 		Payload:       payload,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityResponse.go b/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityResponse.go
index 41e0d95817d..478e9182e2b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityResponse.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityResponse.go
@@ -68,9 +68,9 @@ var _ NLMSecurityResponse = (*_NLMSecurityResponse)(nil)
 var _ NLMRequirements = (*_NLMSecurityResponse)(nil)
 
 // NewNLMSecurityResponse factory function for _NLMSecurityResponse
-func NewNLMSecurityResponse(responseCode SecurityResponseCode, originalMessageId uint32, originalTimestamp uint32, variableParameters []byte, apduLength uint16) *_NLMSecurityResponse {
+func NewNLMSecurityResponse(responseCode SecurityResponseCode, originalMessageId uint32, originalTimestamp uint32, variableParameters []byte) *_NLMSecurityResponse {
 	_result := &_NLMSecurityResponse{
-		NLMContract:        NewNLM(apduLength),
+		NLMContract:        NewNLM(),
 		ResponseCode:       responseCode,
 		OriginalMessageId:  originalMessageId,
 		OriginalTimestamp:  originalTimestamp,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMSetMasterKey.go b/plc4go/protocols/bacnetip/readwrite/model/NLMSetMasterKey.go
index 37a99b2358e..61b2b63926f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMSetMasterKey.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMSetMasterKey.go
@@ -59,12 +59,12 @@ var _ NLMSetMasterKey = (*_NLMSetMasterKey)(nil)
 var _ NLMRequirements = (*_NLMSetMasterKey)(nil)
 
 // NewNLMSetMasterKey factory function for _NLMSetMasterKey
-func NewNLMSetMasterKey(key NLMUpdateKeyUpdateKeyEntry, apduLength uint16) *_NLMSetMasterKey {
+func NewNLMSetMasterKey(key NLMUpdateKeyUpdateKeyEntry) *_NLMSetMasterKey {
 	if key == nil {
 		panic("key of type NLMUpdateKeyUpdateKeyEntry for NLMSetMasterKey must not be nil")
 	}
 	_result := &_NLMSetMasterKey{
-		NLMContract: NewNLM(apduLength),
+		NLMContract: NewNLM(),
 		Key:         key,
 	}
 	_result.NLMContract.(*_NLM)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyDistributionKey.go b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyDistributionKey.go
index 86594826558..d549f58685c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyDistributionKey.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyDistributionKey.go
@@ -62,12 +62,12 @@ var _ NLMUpdateKeyDistributionKey = (*_NLMUpdateKeyDistributionKey)(nil)
 var _ NLMRequirements = (*_NLMUpdateKeyDistributionKey)(nil)
 
 // NewNLMUpdateKeyDistributionKey factory function for _NLMUpdateKeyDistributionKey
-func NewNLMUpdateKeyDistributionKey(keyRevision byte, key NLMUpdateKeyUpdateKeyEntry, apduLength uint16) *_NLMUpdateKeyDistributionKey {
+func NewNLMUpdateKeyDistributionKey(keyRevision byte, key NLMUpdateKeyUpdateKeyEntry) *_NLMUpdateKeyDistributionKey {
 	if key == nil {
 		panic("key of type NLMUpdateKeyUpdateKeyEntry for NLMUpdateKeyDistributionKey must not be nil")
 	}
 	_result := &_NLMUpdateKeyDistributionKey{
-		NLMContract: NewNLM(apduLength),
+		NLMContract: NewNLM(),
 		KeyRevision: keyRevision,
 		Key:         key,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdate.go b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdate.go
index 058c69cad84..51d3e6dc41e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdate.go
@@ -89,12 +89,12 @@ var _ NLMUpdateKeyUpdate = (*_NLMUpdateKeyUpdate)(nil)
 var _ NLMRequirements = (*_NLMUpdateKeyUpdate)(nil)
 
 // NewNLMUpdateKeyUpdate factory function for _NLMUpdateKeyUpdate
-func NewNLMUpdateKeyUpdate(controlFlags NLMUpdateKeyUpdateControlFlags, set1KeyRevision *byte, set1ActivationTime *uint32, set1ExpirationTime *uint32, set1KeyCount *uint8, set1Keys []NLMUpdateKeyUpdateKeyEntry, set2KeyRevision *byte, set2ActivationTime *uint32, set2ExpirationTime *uint32, set2KeyCount *uint8, set2Keys []NLMUpdateKeyUpdateKeyEntry, apduLength uint16) *_NLMUpdateKeyUpdate {
+func NewNLMUpdateKeyUpdate(controlFlags NLMUpdateKeyUpdateControlFlags, set1KeyRevision *byte, set1ActivationTime *uint32, set1ExpirationTime *uint32, set1KeyCount *uint8, set1Keys []NLMUpdateKeyUpdateKeyEntry, set2KeyRevision *byte, set2ActivationTime *uint32, set2ExpirationTime *uint32, set2KeyCount *uint8, set2Keys []NLMUpdateKeyUpdateKeyEntry) *_NLMUpdateKeyUpdate {
 	if controlFlags == nil {
 		panic("controlFlags of type NLMUpdateKeyUpdateControlFlags for NLMUpdateKeyUpdate must not be nil")
 	}
 	_result := &_NLMUpdateKeyUpdate{
-		NLMContract:        NewNLM(apduLength),
+		NLMContract:        NewNLM(),
 		ControlFlags:       controlFlags,
 		Set1KeyRevision:    set1KeyRevision,
 		Set1ActivationTime: set1ActivationTime,
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateControlFlags.go b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateControlFlags.go
index 98359b273b7..661e89d90c3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateControlFlags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateControlFlags.go
@@ -308,7 +308,7 @@ func NLMUpdateKeyUpdateControlFlagsParseWithBufferProducer() func(ctx context.Co
 }
 
 func NLMUpdateKeyUpdateControlFlagsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (NLMUpdateKeyUpdateControlFlags, error) {
-	v, err := (&_NLMUpdateKeyUpdateControlFlags{}).parse(ctx, readBuffer)
+	v, err := (new(_NLMUpdateKeyUpdateControlFlags)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateKeyEntry.go b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateKeyEntry.go
index c1aa48d29e9..6b36c67c6a1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateKeyEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateKeyEntry.go
@@ -225,7 +225,7 @@ func NLMUpdateKeyUpdateKeyEntryParseWithBufferProducer() func(ctx context.Contex
 }
 
 func NLMUpdateKeyUpdateKeyEntryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (NLMUpdateKeyUpdateKeyEntry, error) {
-	v, err := (&_NLMUpdateKeyUpdateKeyEntry{}).parse(ctx, readBuffer)
+	v, err := (new(_NLMUpdateKeyUpdateKeyEntry)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMVendorProprietaryMessage.go b/plc4go/protocols/bacnetip/readwrite/model/NLMVendorProprietaryMessage.go
index adb3127e8c4..086c41fb618 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMVendorProprietaryMessage.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMVendorProprietaryMessage.go
@@ -62,9 +62,9 @@ var _ NLMVendorProprietaryMessage = (*_NLMVendorProprietaryMessage)(nil)
 var _ NLMRequirements = (*_NLMVendorProprietaryMessage)(nil)
 
 // NewNLMVendorProprietaryMessage factory function for _NLMVendorProprietaryMessage
-func NewNLMVendorProprietaryMessage(vendorId BACnetVendorId, proprietaryMessage []byte, apduLength uint16) *_NLMVendorProprietaryMessage {
+func NewNLMVendorProprietaryMessage(vendorId BACnetVendorId, proprietaryMessage []byte) *_NLMVendorProprietaryMessage {
 	_result := &_NLMVendorProprietaryMessage{
-		NLMContract:        NewNLM(apduLength),
+		NLMContract:        NewNLM(),
 		VendorId:           vendorId,
 		ProprietaryMessage: proprietaryMessage,
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMWhatIsNetworkNumber.go b/plc4go/protocols/bacnetip/readwrite/model/NLMWhatIsNetworkNumber.go
index 8d4ee913606..cba82b60f9d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMWhatIsNetworkNumber.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMWhatIsNetworkNumber.go
@@ -54,9 +54,9 @@ var _ NLMWhatIsNetworkNumber = (*_NLMWhatIsNetworkNumber)(nil)
 var _ NLMRequirements = (*_NLMWhatIsNetworkNumber)(nil)
 
 // NewNLMWhatIsNetworkNumber factory function for _NLMWhatIsNetworkNumber
-func NewNLMWhatIsNetworkNumber(apduLength uint16) *_NLMWhatIsNetworkNumber {
+func NewNLMWhatIsNetworkNumber() *_NLMWhatIsNetworkNumber {
 	_result := &_NLMWhatIsNetworkNumber{
-		NLMContract: NewNLM(apduLength),
+		NLMContract: NewNLM(),
 	}
 	_result.NLMContract.(*_NLM)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
index 16445a884c9..5c77f61f820 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
@@ -59,9 +59,9 @@ var _ NLMWhoIsRouterToNetwork = (*_NLMWhoIsRouterToNetwork)(nil)
 var _ NLMRequirements = (*_NLMWhoIsRouterToNetwork)(nil)
 
 // NewNLMWhoIsRouterToNetwork factory function for _NLMWhoIsRouterToNetwork
-func NewNLMWhoIsRouterToNetwork(destinationNetworkAddress *uint16, apduLength uint16) *_NLMWhoIsRouterToNetwork {
+func NewNLMWhoIsRouterToNetwork(destinationNetworkAddress *uint16) *_NLMWhoIsRouterToNetwork {
 	_result := &_NLMWhoIsRouterToNetwork{
-		NLMContract:               NewNLM(apduLength),
+		NLMContract:               NewNLM(),
 		DestinationNetworkAddress: destinationNetworkAddress,
 	}
 	_result.NLMContract.(*_NLM)._SubType = _result
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NPDU.go b/plc4go/protocols/bacnetip/readwrite/model/NPDU.go
index 97d26fdc5aa..8cc8bd64f4a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NPDU.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NPDU.go
@@ -87,19 +87,16 @@ type _NPDU struct {
 	HopCount                  *uint8
 	Nlm                       NLM
 	Apdu                      APDU
-
-	// Arguments.
-	NpduLength uint16
 }
 
 var _ NPDU = (*_NPDU)(nil)
 
 // NewNPDU factory function for _NPDU
-func NewNPDU(protocolVersionNumber uint8, control NPDUControl, destinationNetworkAddress *uint16, destinationLength *uint8, destinationAddress []uint8, sourceNetworkAddress *uint16, sourceLength *uint8, sourceAddress []uint8, hopCount *uint8, nlm NLM, apdu APDU, npduLength uint16) *_NPDU {
+func NewNPDU(protocolVersionNumber uint8, control NPDUControl, destinationNetworkAddress *uint16, destinationLength *uint8, destinationAddress []uint8, sourceNetworkAddress *uint16, sourceLength *uint8, sourceAddress []uint8, hopCount *uint8, nlm NLM, apdu APDU) *_NPDU {
 	if control == nil {
 		panic("control of type NPDUControl for NPDU must not be nil")
 	}
-	return &_NPDU{ProtocolVersionNumber: protocolVersionNumber, Control: control, DestinationNetworkAddress: destinationNetworkAddress, DestinationLength: destinationLength, DestinationAddress: destinationAddress, SourceNetworkAddress: sourceNetworkAddress, SourceLength: sourceLength, SourceAddress: sourceAddress, HopCount: hopCount, Nlm: nlm, Apdu: apdu, NpduLength: npduLength}
+	return &_NPDU{ProtocolVersionNumber: protocolVersionNumber, Control: control, DestinationNetworkAddress: destinationNetworkAddress, DestinationLength: destinationLength, DestinationAddress: destinationAddress, SourceNetworkAddress: sourceNetworkAddress, SourceLength: sourceLength, SourceAddress: sourceAddress, HopCount: hopCount, Nlm: nlm, Apdu: apdu}
 }
 
 ///////////////////////////////////////////////////////////
@@ -140,8 +137,6 @@ type NPDUBuilder interface {
 	WithOptionalApdu(APDU) NPDUBuilder
 	// WithOptionalApduBuilder adds Apdu (property field) which is build by the builder
 	WithOptionalApduBuilder(func(APDUBuilder) APDUBuilder) NPDUBuilder
-	// WithArgNpduLength sets a parser argument
-	WithArgNpduLength(uint16) NPDUBuilder
 	// Build builds the NPDU or returns an error if something is wrong
 	Build() (NPDU, error)
 	// MustBuild does the same as Build but panics on error
@@ -250,11 +245,6 @@ func (b *_NPDUBuilder) WithOptionalApduBuilder(builderSupplier func(APDUBuilder)
 	return b
 }
 
-func (b *_NPDUBuilder) WithArgNpduLength(npduLength uint16) NPDUBuilder {
-	b.NpduLength = npduLength
-	return b
-}
-
 func (b *_NPDUBuilder) Build() (NPDU, error) {
 	if b.Control == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'control' not set"))
@@ -510,7 +500,7 @@ func NPDUParseWithBufferProducer(npduLength uint16) func(ctx context.Context, re
 }
 
 func NPDUParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, npduLength uint16) (NPDU, error) {
-	v, err := (&_NPDU{NpduLength: npduLength}).parse(ctx, readBuffer, npduLength)
+	v, err := (new(_NPDU)).parse(ctx, readBuffer, npduLength)
 	if err != nil {
 		return nil, err
 	}
@@ -730,16 +720,6 @@ func (m *_NPDU) SerializeWithWriteBuffer(ctx context.Context, writeBuffer utils.
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_NPDU) GetNpduLength() uint16 {
-	return m.NpduLength
-}
-
-//
-////
-
 func (m *_NPDU) IsNPDU() {}
 
 func (m *_NPDU) DeepCopy() any {
@@ -762,7 +742,6 @@ func (m *_NPDU) deepCopy() *_NPDU {
 		utils.CopyPtr[uint8](m.HopCount),
 		utils.DeepCopy[NLM](m.Nlm),
 		utils.DeepCopy[APDU](m.Apdu),
-		m.NpduLength,
 	}
 	return _NPDUCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NPDUControl.go b/plc4go/protocols/bacnetip/readwrite/model/NPDUControl.go
index bcc9be38c64..9d72a0ed94e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NPDUControl.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NPDUControl.go
@@ -266,7 +266,7 @@ func NPDUControlParseWithBufferProducer() func(ctx context.Context, readBuffer u
 }
 
 func NPDUControlParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (NPDUControl, error) {
-	v, err := (&_NPDUControl{}).parse(ctx, readBuffer)
+	v, err := (new(_NPDUControl)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriorityTagged.go b/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriorityTagged.go
index aa099b8cf5d..dd0bce9fc4d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriorityTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriorityTagged.go
@@ -54,20 +54,16 @@ type NPDUNetworkPriorityTagged interface {
 type _NPDUNetworkPriorityTagged struct {
 	Header BACnetTagHeader
 	Value  NPDUNetworkPriority
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ NPDUNetworkPriorityTagged = (*_NPDUNetworkPriorityTagged)(nil)
 
 // NewNPDUNetworkPriorityTagged factory function for _NPDUNetworkPriorityTagged
-func NewNPDUNetworkPriorityTagged(header BACnetTagHeader, value NPDUNetworkPriority, tagNumber uint8, tagClass TagClass) *_NPDUNetworkPriorityTagged {
+func NewNPDUNetworkPriorityTagged(header BACnetTagHeader, value NPDUNetworkPriority) *_NPDUNetworkPriorityTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for NPDUNetworkPriorityTagged must not be nil")
 	}
-	return &_NPDUNetworkPriorityTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_NPDUNetworkPriorityTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type NPDUNetworkPriorityTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) NPDUNetworkPriorityTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(NPDUNetworkPriority) NPDUNetworkPriorityTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) NPDUNetworkPriorityTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) NPDUNetworkPriorityTaggedBuilder
 	// Build builds the NPDUNetworkPriorityTagged or returns an error if something is wrong
 	Build() (NPDUNetworkPriorityTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_NPDUNetworkPriorityTaggedBuilder) WithValue(value NPDUNetworkPriority)
 	return b
 }
 
-func (b *_NPDUNetworkPriorityTaggedBuilder) WithArgTagNumber(tagNumber uint8) NPDUNetworkPriorityTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_NPDUNetworkPriorityTaggedBuilder) WithArgTagClass(tagClass TagClass) NPDUNetworkPriorityTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_NPDUNetworkPriorityTaggedBuilder) Build() (NPDUNetworkPriorityTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func NPDUNetworkPriorityTaggedParseWithBufferProducer(tagNumber uint8, tagClass
 }
 
 func NPDUNetworkPriorityTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (NPDUNetworkPriorityTagged, error) {
-	v, err := (&_NPDUNetworkPriorityTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_NPDUNetworkPriorityTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_NPDUNetworkPriorityTagged) SerializeWithWriteBuffer(ctx context.Contex
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_NPDUNetworkPriorityTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_NPDUNetworkPriorityTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_NPDUNetworkPriorityTagged) IsNPDUNetworkPriorityTagged() {}
 
 func (m *_NPDUNetworkPriorityTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_NPDUNetworkPriorityTagged) deepCopy() *_NPDUNetworkPriorityTagged {
 	_NPDUNetworkPriorityTaggedCopy := &_NPDUNetworkPriorityTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _NPDUNetworkPriorityTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/SecurityResponseCodeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/SecurityResponseCodeTagged.go
index 888507d1aad..8cdbcb41974 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/SecurityResponseCodeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/SecurityResponseCodeTagged.go
@@ -54,20 +54,16 @@ type SecurityResponseCodeTagged interface {
 type _SecurityResponseCodeTagged struct {
 	Header BACnetTagHeader
 	Value  SecurityResponseCode
-
-	// Arguments.
-	TagNumber uint8
-	TagClass  TagClass
 }
 
 var _ SecurityResponseCodeTagged = (*_SecurityResponseCodeTagged)(nil)
 
 // NewSecurityResponseCodeTagged factory function for _SecurityResponseCodeTagged
-func NewSecurityResponseCodeTagged(header BACnetTagHeader, value SecurityResponseCode, tagNumber uint8, tagClass TagClass) *_SecurityResponseCodeTagged {
+func NewSecurityResponseCodeTagged(header BACnetTagHeader, value SecurityResponseCode) *_SecurityResponseCodeTagged {
 	if header == nil {
 		panic("header of type BACnetTagHeader for SecurityResponseCodeTagged must not be nil")
 	}
-	return &_SecurityResponseCodeTagged{Header: header, Value: value, TagNumber: tagNumber, TagClass: tagClass}
+	return &_SecurityResponseCodeTagged{Header: header, Value: value}
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,10 +82,6 @@ type SecurityResponseCodeTaggedBuilder interface {
 	WithHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) SecurityResponseCodeTaggedBuilder
 	// WithValue adds Value (property field)
 	WithValue(SecurityResponseCode) SecurityResponseCodeTaggedBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) SecurityResponseCodeTaggedBuilder
-	// WithArgTagClass sets a parser argument
-	WithArgTagClass(TagClass) SecurityResponseCodeTaggedBuilder
 	// Build builds the SecurityResponseCodeTagged or returns an error if something is wrong
 	Build() (SecurityResponseCodeTagged, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,15 +125,6 @@ func (b *_SecurityResponseCodeTaggedBuilder) WithValue(value SecurityResponseCod
 	return b
 }
 
-func (b *_SecurityResponseCodeTaggedBuilder) WithArgTagNumber(tagNumber uint8) SecurityResponseCodeTaggedBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-func (b *_SecurityResponseCodeTaggedBuilder) WithArgTagClass(tagClass TagClass) SecurityResponseCodeTaggedBuilder {
-	b.TagClass = tagClass
-	return b
-}
-
 func (b *_SecurityResponseCodeTaggedBuilder) Build() (SecurityResponseCodeTagged, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -241,7 +224,7 @@ func SecurityResponseCodeTaggedParseWithBufferProducer(tagNumber uint8, tagClass
 }
 
 func SecurityResponseCodeTaggedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8, tagClass TagClass) (SecurityResponseCodeTagged, error) {
-	v, err := (&_SecurityResponseCodeTagged{TagNumber: tagNumber, TagClass: tagClass}).parse(ctx, readBuffer, tagNumber, tagClass)
+	v, err := (new(_SecurityResponseCodeTagged)).parse(ctx, readBuffer, tagNumber, tagClass)
 	if err != nil {
 		return nil, err
 	}
@@ -317,19 +300,6 @@ func (m *_SecurityResponseCodeTagged) SerializeWithWriteBuffer(ctx context.Conte
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_SecurityResponseCodeTagged) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-func (m *_SecurityResponseCodeTagged) GetTagClass() TagClass {
-	return m.TagClass
-}
-
-//
-////
-
 func (m *_SecurityResponseCodeTagged) IsSecurityResponseCodeTagged() {}
 
 func (m *_SecurityResponseCodeTagged) DeepCopy() any {
@@ -343,8 +313,6 @@ func (m *_SecurityResponseCodeTagged) deepCopy() *_SecurityResponseCodeTagged {
 	_SecurityResponseCodeTaggedCopy := &_SecurityResponseCodeTagged{
 		utils.DeepCopy[BACnetTagHeader](m.Header),
 		m.Value,
-		m.TagNumber,
-		m.TagClass,
 	}
 	return _SecurityResponseCodeTaggedCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/StaticHelper.go b/plc4go/protocols/bacnetip/readwrite/model/StaticHelper.go
index 94647852b2c..f43af85a4ed 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/StaticHelper.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/StaticHelper.go
@@ -705,7 +705,7 @@ func CreateBACnetApplicationTagNull() BACnetApplicationTagNull {
 
 func CreateBACnetContextTagNull(tagNumber uint8) BACnetContextTagNull {
 	header := CreateBACnetTagHeaderBalanced(true, tagNumber, 0)
-	return NewBACnetContextTagNull(header, tagNumber)
+	return NewBACnetContextTagNull(header)
 }
 
 func CreateBACnetOpeningTag(tagNum uint8) BACnetOpeningTag {
@@ -718,7 +718,7 @@ func CreateBACnetOpeningTag(tagNum uint8) BACnetOpeningTag {
 		extTagNumber = &tagNum
 	}
 	header := NewBACnetTagHeader(tagNumber, TagClass_CONTEXT_SPECIFIC_TAGS, 0x6, extTagNumber, nil, nil, nil)
-	return NewBACnetOpeningTag(header, tagNum)
+	return NewBACnetOpeningTag(header)
 }
 
 func CreateBACnetClosingTag(tagNum uint8) BACnetClosingTag {
@@ -731,7 +731,7 @@ func CreateBACnetClosingTag(tagNum uint8) BACnetClosingTag {
 		extTagNumber = &tagNum
 	}
 	header := NewBACnetTagHeader(tagNumber, TagClass_CONTEXT_SPECIFIC_TAGS, 0x7, extTagNumber, nil, nil, nil)
-	return NewBACnetClosingTag(header, tagNum)
+	return NewBACnetClosingTag(header)
 }
 
 func CreateBACnetApplicationTagObjectIdentifier(objectType uint16, instance uint32) BACnetApplicationTagObjectIdentifier {
@@ -755,7 +755,7 @@ func CreateBACnetContextTagObjectIdentifier(tagNum uint8, objectType uint16, ins
 		proprietaryValue = objectType
 	}
 	payload := NewBACnetTagPayloadObjectIdentifier(objectTypeEnum, proprietaryValue, instance)
-	return NewBACnetContextTagObjectIdentifier(header, payload, tagNum)
+	return NewBACnetContextTagObjectIdentifier(header, payload)
 }
 
 func CreateBACnetPropertyIdentifierTagged(tagNum uint8, propertyType uint32) BACnetPropertyIdentifierTagged {
@@ -766,7 +766,7 @@ func CreateBACnetPropertyIdentifierTagged(tagNum uint8, propertyType uint32) BAC
 		propertyTypeEnum = BACnetPropertyIdentifier_VENDOR_PROPRIETARY_VALUE
 		proprietaryValue = propertyType
 	}
-	return NewBACnetPropertyIdentifierTagged(header, propertyTypeEnum, proprietaryValue, tagNum, TagClass_CONTEXT_SPECIFIC_TAGS)
+	return NewBACnetPropertyIdentifierTagged(header, propertyTypeEnum, proprietaryValue)
 }
 
 func CreateBACnetVendorIdApplicationTagged(vendorId uint16) BACnetVendorIdTagged {
@@ -777,7 +777,7 @@ func CreateBACnetVendorIdApplicationTagged(vendorId uint16) BACnetVendorIdTagged
 		baCnetVendorId = BACnetVendorId_UNKNOWN_VENDOR
 		unknownVendorId = uint32(vendorId)
 	}
-	return NewBACnetVendorIdTagged(header, baCnetVendorId, unknownVendorId, 0x2, TagClass_APPLICATION_TAGS)
+	return NewBACnetVendorIdTagged(header, baCnetVendorId, unknownVendorId)
 }
 
 func CreateBACnetVendorIdContextTagged(tagNum uint8, vendorId uint16) BACnetVendorIdTagged {
@@ -788,7 +788,7 @@ func CreateBACnetVendorIdContextTagged(tagNum uint8, vendorId uint16) BACnetVend
 		baCnetVendorId = BACnetVendorId_UNKNOWN_VENDOR
 		unknownVendorId = uint32(vendorId)
 	}
-	return NewBACnetVendorIdTagged(header, baCnetVendorId, unknownVendorId, tagNum, TagClass_CONTEXT_SPECIFIC_TAGS)
+	return NewBACnetVendorIdTagged(header, baCnetVendorId, unknownVendorId)
 }
 
 func CreateBACnetApplicationTagUnsignedInteger(value uint) BACnetApplicationTagUnsignedInteger {
@@ -800,7 +800,7 @@ func CreateBACnetApplicationTagUnsignedInteger(value uint) BACnetApplicationTagU
 func CreateBACnetContextTagUnsignedInteger(tagNumber uint8, value uint) BACnetContextTagUnsignedInteger {
 	length, payload := CreateUnsignedPayload(value)
 	header := CreateBACnetTagHeaderBalanced(true, tagNumber, length)
-	return NewBACnetContextTagUnsignedInteger(header, payload, tagNumber)
+	return NewBACnetContextTagUnsignedInteger(header, payload)
 }
 
 func CreateUnsignedPayload(value uint) (length uint32, payload BACnetTagPayloadUnsignedInteger) {
@@ -831,7 +831,7 @@ func CreateUnsignedPayload(value uint) (length uint32, payload BACnetTagPayloadU
 		valueUint32_ := uint32(value)
 		valueUint32 = &valueUint32_
 	}
-	payload = NewBACnetTagPayloadUnsignedInteger(valueUint8, valueUint16, valueUint24, valueUint32, valueUint40, valueUint48, valueUint56, valueUint64, length)
+	payload = NewBACnetTagPayloadUnsignedInteger(length, valueUint8, valueUint16, valueUint24, valueUint32, valueUint40, valueUint48, valueUint56, valueUint64)
 	return
 }
 
@@ -844,7 +844,7 @@ func CreateBACnetApplicationTagSignedInteger(value int) BACnetApplicationTagSign
 func CreateBACnetContextTagSignedInteger(tagNumber uint8, value int) BACnetContextTagSignedInteger {
 	length, payload := CreateSignedPayload(value)
 	header := CreateBACnetTagHeaderBalanced(true, tagNumber, length)
-	return NewBACnetContextTagSignedInteger(header, payload, tagNumber)
+	return NewBACnetContextTagSignedInteger(header, payload)
 }
 
 func CreateSignedPayload(value int) (uint32, BACnetTagPayloadSignedInteger) {
@@ -872,13 +872,13 @@ func CreateSignedPayload(value int) (uint32, BACnetTagPayloadSignedInteger) {
 		_valueInt32 := int32(value)
 		valueInt32 = &_valueInt32
 	}
-	payload := NewBACnetTagPayloadSignedInteger(valueInt8, valueInt16, valueInt24, valueInt32, nil, nil, nil, nil, length)
+	payload := NewBACnetTagPayloadSignedInteger(length, valueInt8, valueInt16, valueInt24, valueInt32, nil, nil, nil, nil)
 	return length, payload
 }
 
 func CreatBACnetSegmentationTagged(value BACnetSegmentation) BACnetSegmentationTagged {
 	header := CreateBACnetTagHeaderBalanced(false, 9, 1)
-	return NewBACnetSegmentationTagged(header, value, 9, TagClass_APPLICATION_TAGS)
+	return NewBACnetSegmentationTagged(header, value)
 }
 
 func CreateBACnetApplicationTagBoolean(value bool) BACnetApplicationTagBoolean {
@@ -896,7 +896,7 @@ func CreateBACnetContextTagBoolean(tagNumber uint8, value bool) BACnetContextTag
 	if value {
 		_value = 1
 	}
-	return NewBACnetContextTagBoolean(header, _value, NewBACnetTagPayloadBoolean(uint32(_value)), tagNumber)
+	return NewBACnetContextTagBoolean(header, _value, NewBACnetTagPayloadBoolean(uint32(_value)))
 }
 
 func CreateBACnetApplicationTagReal(value float32) BACnetApplicationTagReal {
@@ -906,7 +906,7 @@ func CreateBACnetApplicationTagReal(value float32) BACnetApplicationTagReal {
 
 func CreateBACnetContextTagReal(tagNumber uint8, value float32) BACnetContextTagReal {
 	header := CreateBACnetTagHeaderBalanced(true, tagNumber, 4)
-	return NewBACnetContextTagReal(header, NewBACnetTagPayloadReal(value), tagNumber)
+	return NewBACnetContextTagReal(header, NewBACnetTagPayloadReal(value))
 }
 
 func CreateBACnetApplicationTagDouble(value float64) BACnetApplicationTagDouble {
@@ -916,27 +916,27 @@ func CreateBACnetApplicationTagDouble(value float64) BACnetApplicationTagDouble
 
 func CreateBACnetContextTagDouble(tagNumber uint8, value float64) BACnetContextTagDouble {
 	header := CreateBACnetTagHeaderBalanced(true, tagNumber, 8)
-	return NewBACnetContextTagDouble(header, NewBACnetTagPayloadDouble(value), tagNumber)
+	return NewBACnetContextTagDouble(header, NewBACnetTagPayloadDouble(value))
 }
 
 func CreateBACnetApplicationTagOctetString(value []byte) BACnetApplicationTagOctetString {
 	header := CreateBACnetTagHeaderBalanced(false, uint8(BACnetDataType_OCTET_STRING), uint32(len(value)+1))
-	return NewBACnetApplicationTagOctetString(header, NewBACnetTagPayloadOctetString(value, uint32(len(value)+1)))
+	return NewBACnetApplicationTagOctetString(header, NewBACnetTagPayloadOctetString(value))
 }
 
 func CreateBACnetContextTagOctetString(tagNumber uint8, value []byte) BACnetContextTagOctetString {
 	header := CreateBACnetTagHeaderBalanced(true, tagNumber, uint32(len(value)+1))
-	return NewBACnetContextTagOctetString(header, NewBACnetTagPayloadOctetString(value, uint32(len(value)+1)), tagNumber)
+	return NewBACnetContextTagOctetString(header, NewBACnetTagPayloadOctetString(value))
 }
 
 func CreateBACnetApplicationTagCharacterString(baCnetCharacterEncoding BACnetCharacterEncoding, value string) BACnetApplicationTagCharacterString {
 	header := CreateBACnetTagHeaderBalanced(false, uint8(BACnetDataType_CHARACTER_STRING), uint32(len(value)+1))
-	return NewBACnetApplicationTagCharacterString(header, NewBACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, uint32(len(value)+1)))
+	return NewBACnetApplicationTagCharacterString(header, NewBACnetTagPayloadCharacterString(uint32(len(value)+1), baCnetCharacterEncoding, value))
 }
 
 func CreateBACnetContextTagCharacterString(tagNumber uint8, baCnetCharacterEncoding BACnetCharacterEncoding, value string) BACnetContextTagCharacterString {
 	header := CreateBACnetTagHeaderBalanced(true, tagNumber, uint32(len(value)+1))
-	return NewBACnetContextTagCharacterString(header, NewBACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, uint32(len(value)+1)), tagNumber)
+	return NewBACnetContextTagCharacterString(header, NewBACnetTagPayloadCharacterString(uint32(len(value)+1), baCnetCharacterEncoding, value))
 }
 
 func CreateBACnetApplicationTagBitString(value []bool) BACnetApplicationTagBitString {
@@ -946,7 +946,7 @@ func CreateBACnetApplicationTagBitString(value []bool) BACnetApplicationTagBitSt
 		unusedBits = 0
 	}
 	header := CreateBACnetTagHeaderBalanced(false, uint8(BACnetDataType_BIT_STRING), uint32(numberOfBytesNeeded+1))
-	return NewBACnetApplicationTagBitString(header, NewBACnetTagPayloadBitString(uint8(unusedBits), value, make([]bool, unusedBits), uint32(numberOfBytesNeeded+1)))
+	return NewBACnetApplicationTagBitString(header, NewBACnetTagPayloadBitString(uint8(unusedBits), value, make([]bool, unusedBits)))
 }
 
 func CreateBACnetContextTagBitString(tagNumber uint8, value []bool) BACnetContextTagBitString {
@@ -956,7 +956,7 @@ func CreateBACnetContextTagBitString(tagNumber uint8, value []bool) BACnetContex
 		unusedBits = 0
 	}
 	header := CreateBACnetTagHeaderBalanced(true, tagNumber, uint32(numberOfBytesNeeded+1))
-	return NewBACnetContextTagBitString(header, NewBACnetTagPayloadBitString(uint8(unusedBits), value, make([]bool, unusedBits), uint32(numberOfBytesNeeded+1)), tagNumber)
+	return NewBACnetContextTagBitString(header, NewBACnetTagPayloadBitString(uint8(unusedBits), value, make([]bool, unusedBits)))
 }
 
 func CreateBACnetApplicationTagEnumerated(value uint32) BACnetApplicationTagEnumerated {
@@ -968,13 +968,13 @@ func CreateBACnetApplicationTagEnumerated(value uint32) BACnetApplicationTagEnum
 func CreateBACnetContextTagEnumerated(tagNumber uint8, value uint32) BACnetContextTagEnumerated {
 	length, payload := CreateEnumeratedPayload(value)
 	header := CreateBACnetTagHeaderBalanced(true, tagNumber, length)
-	return NewBACnetContextTagEnumerated(header, payload, tagNumber)
+	return NewBACnetContextTagEnumerated(header, payload)
 }
 
 func CreateEnumeratedPayload(value uint32) (uint32, BACnetTagPayloadEnumerated) {
 	length := requiredLength(uint(value))
 	data := WriteVarUint(value)
-	payload := NewBACnetTagPayloadEnumerated(data, length)
+	payload := NewBACnetTagPayloadEnumerated(data)
 	return length, payload
 }
 
@@ -993,7 +993,7 @@ func CreateBACnetContextTagDate(tagNumber uint8, year uint16, month, dayOfMonth,
 	if year == 0xFF {
 		yearMinus1900 = 0xFF
 	}
-	return NewBACnetContextTagDate(header, NewBACnetTagPayloadDate(yearMinus1900, month, dayOfMonth, dayOfWeek), tagNumber)
+	return NewBACnetContextTagDate(header, NewBACnetTagPayloadDate(yearMinus1900, month, dayOfMonth, dayOfWeek))
 }
 
 func CreateBACnetApplicationTagTime(hour, minute, second, fractional uint8) BACnetApplicationTagTime {
@@ -1003,7 +1003,7 @@ func CreateBACnetApplicationTagTime(hour, minute, second, fractional uint8) BACn
 
 func CreateBACnetContextTagTime(tagNumber uint8, hour, minute, second, fractional uint8) BACnetContextTagTime {
 	header := CreateBACnetTagHeaderBalanced(true, tagNumber, 4)
-	return NewBACnetContextTagTime(header, NewBACnetTagPayloadTime(hour, minute, second, fractional), tagNumber)
+	return NewBACnetContextTagTime(header, NewBACnetTagPayloadTime(hour, minute, second, fractional))
 }
 
 func requiredLength(value uint) uint32 {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/SubscribeCOVPropertyMultipleErrorFirstFailedSubscription.go b/plc4go/protocols/bacnetip/readwrite/model/SubscribeCOVPropertyMultipleErrorFirstFailedSubscription.go
index 52c0b374cad..0dae1f7beb3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/SubscribeCOVPropertyMultipleErrorFirstFailedSubscription.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/SubscribeCOVPropertyMultipleErrorFirstFailedSubscription.go
@@ -63,15 +63,12 @@ type _SubscribeCOVPropertyMultipleErrorFirstFailedSubscription struct {
 	MonitoredPropertyReference BACnetPropertyReferenceEnclosed
 	ErrorType                  ErrorEnclosed
 	ClosingTag                 BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ SubscribeCOVPropertyMultipleErrorFirstFailedSubscription = (*_SubscribeCOVPropertyMultipleErrorFirstFailedSubscription)(nil)
 
 // NewSubscribeCOVPropertyMultipleErrorFirstFailedSubscription factory function for _SubscribeCOVPropertyMultipleErrorFirstFailedSubscription
-func NewSubscribeCOVPropertyMultipleErrorFirstFailedSubscription(openingTag BACnetOpeningTag, monitoredObjectIdentifier BACnetContextTagObjectIdentifier, monitoredPropertyReference BACnetPropertyReferenceEnclosed, errorType ErrorEnclosed, closingTag BACnetClosingTag, tagNumber uint8) *_SubscribeCOVPropertyMultipleErrorFirstFailedSubscription {
+func NewSubscribeCOVPropertyMultipleErrorFirstFailedSubscription(openingTag BACnetOpeningTag, monitoredObjectIdentifier BACnetContextTagObjectIdentifier, monitoredPropertyReference BACnetPropertyReferenceEnclosed, errorType ErrorEnclosed, closingTag BACnetClosingTag) *_SubscribeCOVPropertyMultipleErrorFirstFailedSubscription {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for SubscribeCOVPropertyMultipleErrorFirstFailedSubscription must not be nil")
 	}
@@ -87,7 +84,7 @@ func NewSubscribeCOVPropertyMultipleErrorFirstFailedSubscription(openingTag BACn
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for SubscribeCOVPropertyMultipleErrorFirstFailedSubscription must not be nil")
 	}
-	return &_SubscribeCOVPropertyMultipleErrorFirstFailedSubscription{OpeningTag: openingTag, MonitoredObjectIdentifier: monitoredObjectIdentifier, MonitoredPropertyReference: monitoredPropertyReference, ErrorType: errorType, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_SubscribeCOVPropertyMultipleErrorFirstFailedSubscription{OpeningTag: openingTag, MonitoredObjectIdentifier: monitoredObjectIdentifier, MonitoredPropertyReference: monitoredPropertyReference, ErrorType: errorType, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -120,8 +117,6 @@ type SubscribeCOVPropertyMultipleErrorFirstFailedSubscriptionBuilder interface {
 	WithClosingTag(BACnetClosingTag) SubscribeCOVPropertyMultipleErrorFirstFailedSubscriptionBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) SubscribeCOVPropertyMultipleErrorFirstFailedSubscriptionBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) SubscribeCOVPropertyMultipleErrorFirstFailedSubscriptionBuilder
 	// Build builds the SubscribeCOVPropertyMultipleErrorFirstFailedSubscription or returns an error if something is wrong
 	Build() (SubscribeCOVPropertyMultipleErrorFirstFailedSubscription, error)
 	// MustBuild does the same as Build but panics on error
@@ -220,11 +215,6 @@ func (b *_SubscribeCOVPropertyMultipleErrorFirstFailedSubscriptionBuilder) WithC
 	return b
 }
 
-func (b *_SubscribeCOVPropertyMultipleErrorFirstFailedSubscriptionBuilder) WithArgTagNumber(tagNumber uint8) SubscribeCOVPropertyMultipleErrorFirstFailedSubscriptionBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_SubscribeCOVPropertyMultipleErrorFirstFailedSubscriptionBuilder) Build() (SubscribeCOVPropertyMultipleErrorFirstFailedSubscription, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -357,7 +347,7 @@ func SubscribeCOVPropertyMultipleErrorFirstFailedSubscriptionParseWithBufferProd
 }
 
 func SubscribeCOVPropertyMultipleErrorFirstFailedSubscriptionParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (SubscribeCOVPropertyMultipleErrorFirstFailedSubscription, error) {
-	v, err := (&_SubscribeCOVPropertyMultipleErrorFirstFailedSubscription{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_SubscribeCOVPropertyMultipleErrorFirstFailedSubscription)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -453,16 +443,6 @@ func (m *_SubscribeCOVPropertyMultipleErrorFirstFailedSubscription) SerializeWit
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_SubscribeCOVPropertyMultipleErrorFirstFailedSubscription) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_SubscribeCOVPropertyMultipleErrorFirstFailedSubscription) IsSubscribeCOVPropertyMultipleErrorFirstFailedSubscription() {
 }
 
@@ -480,7 +460,6 @@ func (m *_SubscribeCOVPropertyMultipleErrorFirstFailedSubscription) deepCopy() *
 		utils.DeepCopy[BACnetPropertyReferenceEnclosed](m.MonitoredPropertyReference),
 		utils.DeepCopy[ErrorEnclosed](m.ErrorType),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _SubscribeCOVPropertyMultipleErrorFirstFailedSubscriptionCopy
 }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/VTCloseErrorListOfVTSessionIdentifiers.go b/plc4go/protocols/bacnetip/readwrite/model/VTCloseErrorListOfVTSessionIdentifiers.go
index 40614aebc0a..0d117e78dd7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/VTCloseErrorListOfVTSessionIdentifiers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/VTCloseErrorListOfVTSessionIdentifiers.go
@@ -57,22 +57,19 @@ type _VTCloseErrorListOfVTSessionIdentifiers struct {
 	OpeningTag                 BACnetOpeningTag
 	ListOfVtSessionIdentifiers []BACnetApplicationTagUnsignedInteger
 	ClosingTag                 BACnetClosingTag
-
-	// Arguments.
-	TagNumber uint8
 }
 
 var _ VTCloseErrorListOfVTSessionIdentifiers = (*_VTCloseErrorListOfVTSessionIdentifiers)(nil)
 
 // NewVTCloseErrorListOfVTSessionIdentifiers factory function for _VTCloseErrorListOfVTSessionIdentifiers
-func NewVTCloseErrorListOfVTSessionIdentifiers(openingTag BACnetOpeningTag, listOfVtSessionIdentifiers []BACnetApplicationTagUnsignedInteger, closingTag BACnetClosingTag, tagNumber uint8) *_VTCloseErrorListOfVTSessionIdentifiers {
+func NewVTCloseErrorListOfVTSessionIdentifiers(openingTag BACnetOpeningTag, listOfVtSessionIdentifiers []BACnetApplicationTagUnsignedInteger, closingTag BACnetClosingTag) *_VTCloseErrorListOfVTSessionIdentifiers {
 	if openingTag == nil {
 		panic("openingTag of type BACnetOpeningTag for VTCloseErrorListOfVTSessionIdentifiers must not be nil")
 	}
 	if closingTag == nil {
 		panic("closingTag of type BACnetClosingTag for VTCloseErrorListOfVTSessionIdentifiers must not be nil")
 	}
-	return &_VTCloseErrorListOfVTSessionIdentifiers{OpeningTag: openingTag, ListOfVtSessionIdentifiers: listOfVtSessionIdentifiers, ClosingTag: closingTag, TagNumber: tagNumber}
+	return &_VTCloseErrorListOfVTSessionIdentifiers{OpeningTag: openingTag, ListOfVtSessionIdentifiers: listOfVtSessionIdentifiers, ClosingTag: closingTag}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,8 +92,6 @@ type VTCloseErrorListOfVTSessionIdentifiersBuilder interface {
 	WithClosingTag(BACnetClosingTag) VTCloseErrorListOfVTSessionIdentifiersBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
 	WithClosingTagBuilder(func(BACnetClosingTagBuilder) BACnetClosingTagBuilder) VTCloseErrorListOfVTSessionIdentifiersBuilder
-	// WithArgTagNumber sets a parser argument
-	WithArgTagNumber(uint8) VTCloseErrorListOfVTSessionIdentifiersBuilder
 	// Build builds the VTCloseErrorListOfVTSessionIdentifiers or returns an error if something is wrong
 	Build() (VTCloseErrorListOfVTSessionIdentifiers, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,11 +150,6 @@ func (b *_VTCloseErrorListOfVTSessionIdentifiersBuilder) WithClosingTagBuilder(b
 	return b
 }
 
-func (b *_VTCloseErrorListOfVTSessionIdentifiersBuilder) WithArgTagNumber(tagNumber uint8) VTCloseErrorListOfVTSessionIdentifiersBuilder {
-	b.TagNumber = tagNumber
-	return b
-}
-
 func (b *_VTCloseErrorListOfVTSessionIdentifiersBuilder) Build() (VTCloseErrorListOfVTSessionIdentifiers, error) {
 	if b.OpeningTag == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openingTag' not set"))
@@ -273,7 +263,7 @@ func VTCloseErrorListOfVTSessionIdentifiersParseWithBufferProducer(tagNumber uin
 }
 
 func VTCloseErrorListOfVTSessionIdentifiersParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, tagNumber uint8) (VTCloseErrorListOfVTSessionIdentifiers, error) {
-	v, err := (&_VTCloseErrorListOfVTSessionIdentifiers{TagNumber: tagNumber}).parse(ctx, readBuffer, tagNumber)
+	v, err := (new(_VTCloseErrorListOfVTSessionIdentifiers)).parse(ctx, readBuffer, tagNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -349,16 +339,6 @@ func (m *_VTCloseErrorListOfVTSessionIdentifiers) SerializeWithWriteBuffer(ctx c
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_VTCloseErrorListOfVTSessionIdentifiers) GetTagNumber() uint8 {
-	return m.TagNumber
-}
-
-//
-////
-
 func (m *_VTCloseErrorListOfVTSessionIdentifiers) IsVTCloseErrorListOfVTSessionIdentifiers() {}
 
 func (m *_VTCloseErrorListOfVTSessionIdentifiers) DeepCopy() any {
@@ -373,7 +353,6 @@ func (m *_VTCloseErrorListOfVTSessionIdentifiers) deepCopy() *_VTCloseErrorListO
 		utils.DeepCopy[BACnetOpeningTag](m.OpeningTag),
 		utils.DeepCopySlice[BACnetApplicationTagUnsignedInteger, BACnetApplicationTagUnsignedInteger](m.ListOfVtSessionIdentifiers),
 		utils.DeepCopy[BACnetClosingTag](m.ClosingTag),
-		m.TagNumber,
 	}
 	return _VTCloseErrorListOfVTSessionIdentifiersCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/ParserHelper.go b/plc4go/protocols/cbus/readwrite/ParserHelper.go
index 3fcf4f7b1be..8ef740e158d 100644
--- a/plc4go/protocols/cbus/readwrite/ParserHelper.go
+++ b/plc4go/protocols/cbus/readwrite/ParserHelper.go
@@ -90,8 +90,6 @@ func (m CbusParserHelper) Parse(typeName string, arguments []string, io utils.Re
 		return HVACHumidityParseWithBuffer(context.Background(), io)
 	case "HVACHumidityModeAndFlags":
 		return HVACHumidityModeAndFlagsParseWithBuffer(context.Background(), io)
-	case "CBusConstants":
-		return CBusConstantsParseWithBuffer(context.Background(), io)
 	case "SerialInterfaceAddress":
 		return SerialInterfaceAddressParseWithBuffer(context.Background(), io)
 	case "MeasurementData":
diff --git a/plc4go/protocols/cbus/readwrite/XmlParserHelper.go b/plc4go/protocols/cbus/readwrite/XmlParserHelper.go
index a820948e119..39e44e2d0ad 100644
--- a/plc4go/protocols/cbus/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/cbus/readwrite/XmlParserHelper.go
@@ -106,8 +106,6 @@ func (m CbusXmlParserHelper) Parse(typeName string, xmlString string, parserArgu
 		return HVACHumidityParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
 	case "HVACHumidityModeAndFlags":
 		return HVACHumidityModeAndFlagsParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
-	case "CBusConstants":
-		return CBusConstantsParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
 	case "SerialInterfaceAddress":
 		return SerialInterfaceAddressParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
 	case "MeasurementData":
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlData.go b/plc4go/protocols/cbus/readwrite/model/AccessControlData.go
index 01ff21e1cc5..073bb12a2c1 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlData.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlData.go
@@ -404,7 +404,7 @@ func AccessControlDataParseWithBufferProducer[T AccessControlData]() func(ctx co
 }
 
 func AccessControlDataParseWithBuffer[T AccessControlData](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_AccessControlData{}).parse(ctx, readBuffer)
+	v, err := (new(_AccessControlData)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningData.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningData.go
index 1618f6b7f6e..098bc0f19b5 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningData.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningData.go
@@ -502,7 +502,7 @@ func AirConditioningDataParseWithBufferProducer[T AirConditioningData]() func(ct
 }
 
 func AirConditioningDataParseWithBuffer[T AirConditioningData](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_AirConditioningData{}).parse(ctx, readBuffer)
+	v, err := (new(_AirConditioningData)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/cbus/readwrite/model/Alpha.go b/plc4go/protocols/cbus/readwrite/model/Alpha.go
index 2a15c032127..d1c0c57306f 100644
--- a/plc4go/protocols/cbus/readwrite/model/Alpha.go
+++ b/plc4go/protocols/cbus/readwrite/model/Alpha.go
@@ -189,7 +189,7 @@ func AlphaParseWithBufferProducer() func(ctx context.Context, readBuffer utils.R
 }
 
 func AlphaParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (Alpha, error) {
-	v, err := (&_Alpha{}).parse(ctx, readBuffer)
+	v, err := (new(_Alpha)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ApplicationAddress1.go b/plc4go/protocols/cbus/readwrite/model/ApplicationAddress1.go
index 9327896624e..ffd90090117 100644
--- a/plc4go/protocols/cbus/readwrite/model/ApplicationAddress1.go
+++ b/plc4go/protocols/cbus/readwrite/model/ApplicationAddress1.go
@@ -208,7 +208,7 @@ func ApplicationAddress1ParseWithBufferProducer() func(ctx context.Context, read
 }
 
 func ApplicationAddress1ParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ApplicationAddress1, error) {
-	v, err := (&_ApplicationAddress1{}).parse(ctx, readBuffer)
+	v, err := (new(_ApplicationAddress1)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ApplicationAddress2.go b/plc4go/protocols/cbus/readwrite/model/ApplicationAddress2.go
index 7e2cb7cd558..7b04eca7e32 100644
--- a/plc4go/protocols/cbus/readwrite/model/ApplicationAddress2.go
+++ b/plc4go/protocols/cbus/readwrite/model/ApplicationAddress2.go
@@ -208,7 +208,7 @@ func ApplicationAddress2ParseWithBufferProducer() func(ctx context.Context, read
 }
 
 func ApplicationAddress2ParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ApplicationAddress2, error) {
-	v, err := (&_ApplicationAddress2{}).parse(ctx, readBuffer)
+	v, err := (new(_ApplicationAddress2)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/BridgeAddress.go b/plc4go/protocols/cbus/readwrite/model/BridgeAddress.go
index 9fcf1526907..6b6fba0c5eb 100644
--- a/plc4go/protocols/cbus/readwrite/model/BridgeAddress.go
+++ b/plc4go/protocols/cbus/readwrite/model/BridgeAddress.go
@@ -189,7 +189,7 @@ func BridgeAddressParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func BridgeAddressParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BridgeAddress, error) {
-	v, err := (&_BridgeAddress{}).parse(ctx, readBuffer)
+	v, err := (new(_BridgeAddress)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/CALData.go b/plc4go/protocols/cbus/readwrite/model/CALData.go
index e87df5da0f4..414c6cf9be1 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALData.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALData.go
@@ -50,6 +50,8 @@ type CALData interface {
 
 // CALDataContract provides a set of functions which can be overwritten by a sub struct
 type CALDataContract interface {
+	// GetRequestContext returns RequestContext (property field)
+	GetRequestContext() RequestContext
 	// GetCommandTypeContainer returns CommandTypeContainer (property field)
 	GetCommandTypeContainer() CALCommandTypeContainer
 	// GetAdditionalData returns AdditionalData (property field)
@@ -58,8 +60,6 @@ type CALDataContract interface {
 	GetCommandType() CALCommandType
 	// GetSendIdentifyRequestBefore returns SendIdentifyRequestBefore (virtual field)
 	GetSendIdentifyRequestBefore() bool
-	// GetRequestContext() returns a parser argument
-	GetRequestContext() RequestContext
 	// IsCALData is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsCALData()
 	// CreateBuilder creates a CALDataBuilder
@@ -82,18 +82,16 @@ type _CALData struct {
 		CALDataContract
 		CALDataRequirements
 	}
+	RequestContext       RequestContext
 	CommandTypeContainer CALCommandTypeContainer
 	AdditionalData       CALData
-
-	// Arguments.
-	RequestContext RequestContext
 }
 
 var _ CALDataContract = (*_CALData)(nil)
 
 // NewCALData factory function for _CALData
-func NewCALData(commandTypeContainer CALCommandTypeContainer, additionalData CALData, requestContext RequestContext) *_CALData {
-	return &_CALData{CommandTypeContainer: commandTypeContainer, AdditionalData: additionalData, RequestContext: requestContext}
+func NewCALData(requestContext RequestContext, commandTypeContainer CALCommandTypeContainer, additionalData CALData) *_CALData {
+	return &_CALData{RequestContext: requestContext, CommandTypeContainer: commandTypeContainer, AdditionalData: additionalData}
 }
 
 ///////////////////////////////////////////////////////////
@@ -105,15 +103,17 @@ func NewCALData(commandTypeContainer CALCommandTypeContainer, additionalData CAL
 type CALDataBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
-	WithMandatoryFields(commandTypeContainer CALCommandTypeContainer) CALDataBuilder
+	WithMandatoryFields(requestContext RequestContext, commandTypeContainer CALCommandTypeContainer) CALDataBuilder
+	// WithRequestContext adds RequestContext (property field)
+	WithRequestContext(RequestContext) CALDataBuilder
+	// WithRequestContextBuilder adds RequestContext (property field) which is build by the builder
+	WithRequestContextBuilder(func(RequestContextBuilder) RequestContextBuilder) CALDataBuilder
 	// WithCommandTypeContainer adds CommandTypeContainer (property field)
 	WithCommandTypeContainer(CALCommandTypeContainer) CALDataBuilder
 	// WithAdditionalData adds AdditionalData (property field)
 	WithOptionalAdditionalData(CALData) CALDataBuilder
 	// WithOptionalAdditionalDataBuilder adds AdditionalData (property field) which is build by the builder
 	WithOptionalAdditionalDataBuilder(func(CALDataBuilder) CALDataBuilder) CALDataBuilder
-	// WithArgRequestContext sets a parser argument
-	WithArgRequestContext(RequestContext) CALDataBuilder
 	// AsCALDataReset converts this build to a subType of CALData. It is always possible to return to current builder using Done()
 	AsCALDataReset() CALDataResetBuilder
 	// AsCALDataRecall converts this build to a subType of CALData. It is always possible to return to current builder using Done()
@@ -165,8 +165,23 @@ type _CALDataBuilder struct {
 
 var _ (CALDataBuilder) = (*_CALDataBuilder)(nil)
 
-func (b *_CALDataBuilder) WithMandatoryFields(commandTypeContainer CALCommandTypeContainer) CALDataBuilder {
-	return b.WithCommandTypeContainer(commandTypeContainer)
+func (b *_CALDataBuilder) WithMandatoryFields(requestContext RequestContext, commandTypeContainer CALCommandTypeContainer) CALDataBuilder {
+	return b.WithRequestContext(requestContext).WithCommandTypeContainer(commandTypeContainer)
+}
+
+func (b *_CALDataBuilder) WithRequestContext(requestContext RequestContext) CALDataBuilder {
+	b.RequestContext = requestContext
+	return b
+}
+
+func (b *_CALDataBuilder) WithRequestContextBuilder(builderSupplier func(RequestContextBuilder) RequestContextBuilder) CALDataBuilder {
+	builder := builderSupplier(b.RequestContext.CreateRequestContextBuilder())
+	var err error
+	b.RequestContext, err = builder.Build()
+	if err != nil {
+		b.collectedErr = append(b.collectedErr, errors.Wrap(err, "RequestContextBuilder failed"))
+	}
+	return b
 }
 
 func (b *_CALDataBuilder) WithCommandTypeContainer(commandTypeContainer CALCommandTypeContainer) CALDataBuilder {
@@ -189,12 +204,10 @@ func (b *_CALDataBuilder) WithOptionalAdditionalDataBuilder(builderSupplier func
 	return b
 }
 
-func (b *_CALDataBuilder) WithArgRequestContext(requestContext RequestContext) CALDataBuilder {
-	b.RequestContext = requestContext
-	return b
-}
-
 func (b *_CALDataBuilder) PartialBuild() (CALDataContract, error) {
+	if b.RequestContext == nil {
+		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'requestContext' not set"))
+	}
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
 	}
@@ -357,6 +370,10 @@ func (b *_CALData) CreateCALDataBuilder() CALDataBuilder {
 /////////////////////// Accessors for property fields.
 ///////////////////////
 
+func (m *_CALData) GetRequestContext() RequestContext {
+	return m.RequestContext
+}
+
 func (m *_CALData) GetCommandTypeContainer() CALCommandTypeContainer {
 	return m.CommandTypeContainer
 }
@@ -454,7 +471,7 @@ func CALDataParseWithBufferProducer[T CALData](requestContext RequestContext) fu
 }
 
 func CALDataParseWithBuffer[T CALData](ctx context.Context, readBuffer utils.ReadBuffer, requestContext RequestContext) (T, error) {
-	v, err := (&_CALData{RequestContext: requestContext}).parse(ctx, readBuffer, requestContext)
+	v, err := (new(_CALData)).parse(ctx, readBuffer, requestContext)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -475,6 +492,7 @@ func (m *_CALData) parse(ctx context.Context, readBuffer utils.ReadBuffer, reque
 	}
 	currentPos := positionAware.GetPos()
 	_ = currentPos
+	m.RequestContext = requestContext
 
 	// Validation
 	if !(KnowsCALCommandTypeContainer(ctx, readBuffer)) {
@@ -606,16 +624,6 @@ func (pm *_CALData) serializeParent(ctx context.Context, writeBuffer utils.Write
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_CALData) GetRequestContext() RequestContext {
-	return m.RequestContext
-}
-
-//
-////
-
 func (m *_CALData) IsCALData() {}
 
 func (m *_CALData) DeepCopy() any {
@@ -628,9 +636,9 @@ func (m *_CALData) deepCopy() *_CALData {
 	}
 	_CALDataCopy := &_CALData{
 		nil, // will be set by child
+		utils.DeepCopy[RequestContext](m.RequestContext),
 		m.CommandTypeContainer,
 		utils.DeepCopy[CALData](m.AdditionalData),
-		m.RequestContext,
 	}
 	return _CALDataCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataAcknowledge.go b/plc4go/protocols/cbus/readwrite/model/CALDataAcknowledge.go
index e3992e6e980..3a6b42383ae 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataAcknowledge.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataAcknowledge.go
@@ -62,9 +62,9 @@ var _ CALDataAcknowledge = (*_CALDataAcknowledge)(nil)
 var _ CALDataRequirements = (*_CALDataAcknowledge)(nil)
 
 // NewCALDataAcknowledge factory function for _CALDataAcknowledge
-func NewCALDataAcknowledge(commandTypeContainer CALCommandTypeContainer, additionalData CALData, paramNo Parameter, code uint8, requestContext RequestContext) *_CALDataAcknowledge {
+func NewCALDataAcknowledge(requestContext RequestContext, commandTypeContainer CALCommandTypeContainer, additionalData CALData, paramNo Parameter, code uint8) *_CALDataAcknowledge {
 	_result := &_CALDataAcknowledge{
-		CALDataContract: NewCALData(commandTypeContainer, additionalData, requestContext),
+		CALDataContract: NewCALData(requestContext, commandTypeContainer, additionalData),
 		ParamNo:         paramNo,
 		Code:            code,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataGetStatus.go b/plc4go/protocols/cbus/readwrite/model/CALDataGetStatus.go
index 92b1cb3aa73..e269176cb7b 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataGetStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataGetStatus.go
@@ -62,9 +62,9 @@ var _ CALDataGetStatus = (*_CALDataGetStatus)(nil)
 var _ CALDataRequirements = (*_CALDataGetStatus)(nil)
 
 // NewCALDataGetStatus factory function for _CALDataGetStatus
-func NewCALDataGetStatus(commandTypeContainer CALCommandTypeContainer, additionalData CALData, paramNo Parameter, count uint8, requestContext RequestContext) *_CALDataGetStatus {
+func NewCALDataGetStatus(requestContext RequestContext, commandTypeContainer CALCommandTypeContainer, additionalData CALData, paramNo Parameter, count uint8) *_CALDataGetStatus {
 	_result := &_CALDataGetStatus{
-		CALDataContract: NewCALData(commandTypeContainer, additionalData, requestContext),
+		CALDataContract: NewCALData(requestContext, commandTypeContainer, additionalData),
 		ParamNo:         paramNo,
 		Count:           count,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataIdentify.go b/plc4go/protocols/cbus/readwrite/model/CALDataIdentify.go
index 86667cb1b83..45206bb54b7 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataIdentify.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataIdentify.go
@@ -59,9 +59,9 @@ var _ CALDataIdentify = (*_CALDataIdentify)(nil)
 var _ CALDataRequirements = (*_CALDataIdentify)(nil)
 
 // NewCALDataIdentify factory function for _CALDataIdentify
-func NewCALDataIdentify(commandTypeContainer CALCommandTypeContainer, additionalData CALData, attribute Attribute, requestContext RequestContext) *_CALDataIdentify {
+func NewCALDataIdentify(requestContext RequestContext, commandTypeContainer CALCommandTypeContainer, additionalData CALData, attribute Attribute) *_CALDataIdentify {
 	_result := &_CALDataIdentify{
-		CALDataContract: NewCALData(commandTypeContainer, additionalData, requestContext),
+		CALDataContract: NewCALData(requestContext, commandTypeContainer, additionalData),
 		Attribute:       attribute,
 	}
 	_result.CALDataContract.(*_CALData)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataIdentifyReply.go b/plc4go/protocols/cbus/readwrite/model/CALDataIdentifyReply.go
index fe302ff7e98..f8f743b38e1 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataIdentifyReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataIdentifyReply.go
@@ -62,12 +62,12 @@ var _ CALDataIdentifyReply = (*_CALDataIdentifyReply)(nil)
 var _ CALDataRequirements = (*_CALDataIdentifyReply)(nil)
 
 // NewCALDataIdentifyReply factory function for _CALDataIdentifyReply
-func NewCALDataIdentifyReply(commandTypeContainer CALCommandTypeContainer, additionalData CALData, attribute Attribute, identifyReplyCommand IdentifyReplyCommand, requestContext RequestContext) *_CALDataIdentifyReply {
+func NewCALDataIdentifyReply(requestContext RequestContext, commandTypeContainer CALCommandTypeContainer, additionalData CALData, attribute Attribute, identifyReplyCommand IdentifyReplyCommand) *_CALDataIdentifyReply {
 	if identifyReplyCommand == nil {
 		panic("identifyReplyCommand of type IdentifyReplyCommand for CALDataIdentifyReply must not be nil")
 	}
 	_result := &_CALDataIdentifyReply{
-		CALDataContract:      NewCALData(commandTypeContainer, additionalData, requestContext),
+		CALDataContract:      NewCALData(requestContext, commandTypeContainer, additionalData),
 		Attribute:            attribute,
 		IdentifyReplyCommand: identifyReplyCommand,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataRecall.go b/plc4go/protocols/cbus/readwrite/model/CALDataRecall.go
index 872f91f6ca5..fad315bd1c7 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataRecall.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataRecall.go
@@ -62,9 +62,9 @@ var _ CALDataRecall = (*_CALDataRecall)(nil)
 var _ CALDataRequirements = (*_CALDataRecall)(nil)
 
 // NewCALDataRecall factory function for _CALDataRecall
-func NewCALDataRecall(commandTypeContainer CALCommandTypeContainer, additionalData CALData, paramNo Parameter, count uint8, requestContext RequestContext) *_CALDataRecall {
+func NewCALDataRecall(requestContext RequestContext, commandTypeContainer CALCommandTypeContainer, additionalData CALData, paramNo Parameter, count uint8) *_CALDataRecall {
 	_result := &_CALDataRecall{
-		CALDataContract: NewCALData(commandTypeContainer, additionalData, requestContext),
+		CALDataContract: NewCALData(requestContext, commandTypeContainer, additionalData),
 		ParamNo:         paramNo,
 		Count:           count,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataReply.go b/plc4go/protocols/cbus/readwrite/model/CALDataReply.go
index c6013f2b15a..61ef49a3c0f 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataReply.go
@@ -62,12 +62,12 @@ var _ CALDataReply = (*_CALDataReply)(nil)
 var _ CALDataRequirements = (*_CALDataReply)(nil)
 
 // NewCALDataReply factory function for _CALDataReply
-func NewCALDataReply(commandTypeContainer CALCommandTypeContainer, additionalData CALData, paramNo Parameter, parameterValue ParameterValue, requestContext RequestContext) *_CALDataReply {
+func NewCALDataReply(requestContext RequestContext, commandTypeContainer CALCommandTypeContainer, additionalData CALData, paramNo Parameter, parameterValue ParameterValue) *_CALDataReply {
 	if parameterValue == nil {
 		panic("parameterValue of type ParameterValue for CALDataReply must not be nil")
 	}
 	_result := &_CALDataReply{
-		CALDataContract: NewCALData(commandTypeContainer, additionalData, requestContext),
+		CALDataContract: NewCALData(requestContext, commandTypeContainer, additionalData),
 		ParamNo:         paramNo,
 		ParameterValue:  parameterValue,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataReset.go b/plc4go/protocols/cbus/readwrite/model/CALDataReset.go
index 16c5862ad29..2fc5ba61e05 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataReset.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataReset.go
@@ -54,9 +54,9 @@ var _ CALDataReset = (*_CALDataReset)(nil)
 var _ CALDataRequirements = (*_CALDataReset)(nil)
 
 // NewCALDataReset factory function for _CALDataReset
-func NewCALDataReset(commandTypeContainer CALCommandTypeContainer, additionalData CALData, requestContext RequestContext) *_CALDataReset {
+func NewCALDataReset(requestContext RequestContext, commandTypeContainer CALCommandTypeContainer, additionalData CALData) *_CALDataReset {
 	_result := &_CALDataReset{
-		CALDataContract: NewCALData(commandTypeContainer, additionalData, requestContext),
+		CALDataContract: NewCALData(requestContext, commandTypeContainer, additionalData),
 	}
 	_result.CALDataContract.(*_CALData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataStatus.go b/plc4go/protocols/cbus/readwrite/model/CALDataStatus.go
index b4a1104f2ed..d8c25212aa6 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataStatus.go
@@ -65,9 +65,9 @@ var _ CALDataStatus = (*_CALDataStatus)(nil)
 var _ CALDataRequirements = (*_CALDataStatus)(nil)
 
 // NewCALDataStatus factory function for _CALDataStatus
-func NewCALDataStatus(commandTypeContainer CALCommandTypeContainer, additionalData CALData, application ApplicationIdContainer, blockStart uint8, statusBytes []StatusByte, requestContext RequestContext) *_CALDataStatus {
+func NewCALDataStatus(requestContext RequestContext, commandTypeContainer CALCommandTypeContainer, additionalData CALData, application ApplicationIdContainer, blockStart uint8, statusBytes []StatusByte) *_CALDataStatus {
 	_result := &_CALDataStatus{
-		CALDataContract: NewCALData(commandTypeContainer, additionalData, requestContext),
+		CALDataContract: NewCALData(requestContext, commandTypeContainer, additionalData),
 		Application:     application,
 		BlockStart:      blockStart,
 		StatusBytes:     statusBytes,
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataStatusExtended.go b/plc4go/protocols/cbus/readwrite/model/CALDataStatusExtended.go
index 7dc6e71a5ec..3a8529b1188 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataStatusExtended.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataStatusExtended.go
@@ -75,9 +75,9 @@ var _ CALDataStatusExtended = (*_CALDataStatusExtended)(nil)
 var _ CALDataRequirements = (*_CALDataStatusExtended)(nil)
 
 // NewCALDataStatusExtended factory function for _CALDataStatusExtended
-func NewCALDataStatusExtended(commandTypeContainer CALCommandTypeContainer, additionalData CALData, coding StatusCoding, application ApplicationIdContainer, blockStart uint8, statusBytes []StatusByte, levelInformation []LevelInformation, requestContext RequestContext) *_CALDataStatusExtended {
+func NewCALDataStatusExtended(requestContext RequestContext, commandTypeContainer CALCommandTypeContainer, additionalData CALData, coding StatusCoding, application ApplicationIdContainer, blockStart uint8, statusBytes []StatusByte, levelInformation []LevelInformation) *_CALDataStatusExtended {
 	_result := &_CALDataStatusExtended{
-		CALDataContract:  NewCALData(commandTypeContainer, additionalData, requestContext),
+		CALDataContract:  NewCALData(requestContext, commandTypeContainer, additionalData),
 		Coding:           coding,
 		Application:      application,
 		BlockStart:       blockStart,
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataWrite.go b/plc4go/protocols/cbus/readwrite/model/CALDataWrite.go
index 90c930a1564..1a8f324396a 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataWrite.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataWrite.go
@@ -65,12 +65,12 @@ var _ CALDataWrite = (*_CALDataWrite)(nil)
 var _ CALDataRequirements = (*_CALDataWrite)(nil)
 
 // NewCALDataWrite factory function for _CALDataWrite
-func NewCALDataWrite(commandTypeContainer CALCommandTypeContainer, additionalData CALData, paramNo Parameter, code byte, parameterValue ParameterValue, requestContext RequestContext) *_CALDataWrite {
+func NewCALDataWrite(requestContext RequestContext, commandTypeContainer CALCommandTypeContainer, additionalData CALData, paramNo Parameter, code byte, parameterValue ParameterValue) *_CALDataWrite {
 	if parameterValue == nil {
 		panic("parameterValue of type ParameterValue for CALDataWrite must not be nil")
 	}
 	_result := &_CALDataWrite{
-		CALDataContract: NewCALData(commandTypeContainer, additionalData, requestContext),
+		CALDataContract: NewCALData(requestContext, commandTypeContainer, additionalData),
 		ParamNo:         paramNo,
 		Code:            code,
 		ParameterValue:  parameterValue,
diff --git a/plc4go/protocols/cbus/readwrite/model/CALReply.go b/plc4go/protocols/cbus/readwrite/model/CALReply.go
index 4fd57229971..6da03c49936 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALReply.go
@@ -54,10 +54,6 @@ type CALReplyContract interface {
 	GetCalType() byte
 	// GetCalData returns CalData (property field)
 	GetCalData() CALData
-	// GetCBusOptions() returns a parser argument
-	GetCBusOptions() CBusOptions
-	// GetRequestContext() returns a parser argument
-	GetRequestContext() RequestContext
 	// IsCALReply is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsCALReply()
 	// CreateBuilder creates a CALReplyBuilder
@@ -80,20 +76,16 @@ type _CALReply struct {
 	}
 	CalType byte
 	CalData CALData
-
-	// Arguments.
-	CBusOptions    CBusOptions
-	RequestContext RequestContext
 }
 
 var _ CALReplyContract = (*_CALReply)(nil)
 
 // NewCALReply factory function for _CALReply
-func NewCALReply(calType byte, calData CALData, cBusOptions CBusOptions, requestContext RequestContext) *_CALReply {
+func NewCALReply(calType byte, calData CALData) *_CALReply {
 	if calData == nil {
 		panic("calData of type CALData for CALReply must not be nil")
 	}
-	return &_CALReply{CalType: calType, CalData: calData, CBusOptions: cBusOptions, RequestContext: requestContext}
+	return &_CALReply{CalType: calType, CalData: calData}
 }
 
 ///////////////////////////////////////////////////////////
@@ -112,10 +104,6 @@ type CALReplyBuilder interface {
 	WithCalData(CALData) CALReplyBuilder
 	// WithCalDataBuilder adds CalData (property field) which is build by the builder
 	WithCalDataBuilder(func(CALDataBuilder) CALDataBuilder) CALReplyBuilder
-	// WithArgCBusOptions sets a parser argument
-	WithArgCBusOptions(CBusOptions) CALReplyBuilder
-	// WithArgRequestContext sets a parser argument
-	WithArgRequestContext(RequestContext) CALReplyBuilder
 	// AsCALReplyLong converts this build to a subType of CALReply. It is always possible to return to current builder using Done()
 	AsCALReplyLong() CALReplyLongBuilder
 	// AsCALReplyShort converts this build to a subType of CALReply. It is always possible to return to current builder using Done()
@@ -175,15 +163,6 @@ func (b *_CALReplyBuilder) WithCalDataBuilder(builderSupplier func(CALDataBuilde
 	return b
 }
 
-func (b *_CALReplyBuilder) WithArgCBusOptions(cBusOptions CBusOptions) CALReplyBuilder {
-	b.CBusOptions = cBusOptions
-	return b
-}
-func (b *_CALReplyBuilder) WithArgRequestContext(requestContext RequestContext) CALReplyBuilder {
-	b.RequestContext = requestContext
-	return b
-}
-
 func (b *_CALReplyBuilder) PartialBuild() (CALReplyContract, error) {
 	if b.CalData == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'calData' not set"))
@@ -331,7 +310,7 @@ func CALReplyParseWithBufferProducer[T CALReply](cBusOptions CBusOptions, reques
 }
 
 func CALReplyParseWithBuffer[T CALReply](ctx context.Context, readBuffer utils.ReadBuffer, cBusOptions CBusOptions, requestContext RequestContext) (T, error) {
-	v, err := (&_CALReply{CBusOptions: cBusOptions, RequestContext: requestContext}).parse(ctx, readBuffer, cBusOptions, requestContext)
+	v, err := (new(_CALReply)).parse(ctx, readBuffer, cBusOptions, requestContext)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -414,19 +393,6 @@ func (pm *_CALReply) serializeParent(ctx context.Context, writeBuffer utils.Writ
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_CALReply) GetCBusOptions() CBusOptions {
-	return m.CBusOptions
-}
-func (m *_CALReply) GetRequestContext() RequestContext {
-	return m.RequestContext
-}
-
-//
-////
-
 func (m *_CALReply) IsCALReply() {}
 
 func (m *_CALReply) DeepCopy() any {
@@ -441,8 +407,6 @@ func (m *_CALReply) deepCopy() *_CALReply {
 		nil, // will be set by child
 		m.CalType,
 		utils.DeepCopy[CALData](m.CalData),
-		m.CBusOptions,
-		m.RequestContext,
 	}
 	return _CALReplyCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go b/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go
index ce3c6695b7a..befdcfa38f9 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go
@@ -78,12 +78,12 @@ var _ CALReplyLong = (*_CALReplyLong)(nil)
 var _ CALReplyRequirements = (*_CALReplyLong)(nil)
 
 // NewCALReplyLong factory function for _CALReplyLong
-func NewCALReplyLong(calType byte, calData CALData, terminatingByte uint32, unitAddress UnitAddress, bridgeAddress BridgeAddress, serialInterfaceAddress SerialInterfaceAddress, reservedByte *byte, replyNetwork ReplyNetwork, cBusOptions CBusOptions, requestContext RequestContext) *_CALReplyLong {
+func NewCALReplyLong(calType byte, calData CALData, terminatingByte uint32, unitAddress UnitAddress, bridgeAddress BridgeAddress, serialInterfaceAddress SerialInterfaceAddress, reservedByte *byte, replyNetwork ReplyNetwork) *_CALReplyLong {
 	if serialInterfaceAddress == nil {
 		panic("serialInterfaceAddress of type SerialInterfaceAddress for CALReplyLong must not be nil")
 	}
 	_result := &_CALReplyLong{
-		CALReplyContract:       NewCALReply(calType, calData, cBusOptions, requestContext),
+		CALReplyContract:       NewCALReply(calType, calData),
 		TerminatingByte:        terminatingByte,
 		UnitAddress:            unitAddress,
 		BridgeAddress:          bridgeAddress,
diff --git a/plc4go/protocols/cbus/readwrite/model/CALReplyShort.go b/plc4go/protocols/cbus/readwrite/model/CALReplyShort.go
index 9cc30be4c7e..8711b148946 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALReplyShort.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALReplyShort.go
@@ -54,9 +54,9 @@ var _ CALReplyShort = (*_CALReplyShort)(nil)
 var _ CALReplyRequirements = (*_CALReplyShort)(nil)
 
 // NewCALReplyShort factory function for _CALReplyShort
-func NewCALReplyShort(calType byte, calData CALData, cBusOptions CBusOptions, requestContext RequestContext) *_CALReplyShort {
+func NewCALReplyShort(calType byte, calData CALData) *_CALReplyShort {
 	_result := &_CALReplyShort{
-		CALReplyContract: NewCALReply(calType, calData, cBusOptions, requestContext),
+		CALReplyContract: NewCALReply(calType, calData),
 	}
 	_result.CALReplyContract.(*_CALReply)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusCommand.go b/plc4go/protocols/cbus/readwrite/model/CBusCommand.go
index dd15a06f4f7..62aeb625afe 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusCommand.go
@@ -56,8 +56,6 @@ type CBusCommandContract interface {
 	GetIsDeviceManagement() bool
 	// GetDestinationAddressType returns DestinationAddressType (virtual field)
 	GetDestinationAddressType() DestinationAddressType
-	// GetCBusOptions() returns a parser argument
-	GetCBusOptions() CBusOptions
 	// IsCBusCommand is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsCBusCommand()
 	// CreateBuilder creates a CBusCommandBuilder
@@ -81,19 +79,16 @@ type _CBusCommand struct {
 		CBusCommandRequirements
 	}
 	Header CBusHeader
-
-	// Arguments.
-	CBusOptions CBusOptions
 }
 
 var _ CBusCommandContract = (*_CBusCommand)(nil)
 
 // NewCBusCommand factory function for _CBusCommand
-func NewCBusCommand(header CBusHeader, cBusOptions CBusOptions) *_CBusCommand {
+func NewCBusCommand(header CBusHeader) *_CBusCommand {
 	if header == nil {
 		panic("header of type CBusHeader for CBusCommand must not be nil")
 	}
-	return &_CBusCommand{Header: header, CBusOptions: cBusOptions}
+	return &_CBusCommand{Header: header}
 }
 
 ///////////////////////////////////////////////////////////
@@ -110,8 +105,6 @@ type CBusCommandBuilder interface {
 	WithHeader(CBusHeader) CBusCommandBuilder
 	// WithHeaderBuilder adds Header (property field) which is build by the builder
 	WithHeaderBuilder(func(CBusHeaderBuilder) CBusHeaderBuilder) CBusCommandBuilder
-	// WithArgCBusOptions sets a parser argument
-	WithArgCBusOptions(CBusOptions) CBusCommandBuilder
 	// AsCBusCommandDeviceManagement converts this build to a subType of CBusCommand. It is always possible to return to current builder using Done()
 	AsCBusCommandDeviceManagement() CBusCommandDeviceManagementBuilder
 	// AsCBusCommandPointToPointToMultiPoint converts this build to a subType of CBusCommand. It is always possible to return to current builder using Done()
@@ -170,11 +163,6 @@ func (b *_CBusCommandBuilder) WithHeaderBuilder(builderSupplier func(CBusHeaderB
 	return b
 }
 
-func (b *_CBusCommandBuilder) WithArgCBusOptions(cBusOptions CBusOptions) CBusCommandBuilder {
-	b.CBusOptions = cBusOptions
-	return b
-}
-
 func (b *_CBusCommandBuilder) PartialBuild() (CBusCommandContract, error) {
 	if b.Header == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'header' not set"))
@@ -365,7 +353,7 @@ func CBusCommandParseWithBufferProducer[T CBusCommand](cBusOptions CBusOptions)
 }
 
 func CBusCommandParseWithBuffer[T CBusCommand](ctx context.Context, readBuffer utils.ReadBuffer, cBusOptions CBusOptions) (T, error) {
-	v, err := (&_CBusCommand{CBusOptions: cBusOptions}).parse(ctx, readBuffer, cBusOptions)
+	v, err := (new(_CBusCommand)).parse(ctx, readBuffer, cBusOptions)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -474,16 +462,6 @@ func (pm *_CBusCommand) serializeParent(ctx context.Context, writeBuffer utils.W
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_CBusCommand) GetCBusOptions() CBusOptions {
-	return m.CBusOptions
-}
-
-//
-////
-
 func (m *_CBusCommand) IsCBusCommand() {}
 
 func (m *_CBusCommand) DeepCopy() any {
@@ -497,7 +475,6 @@ func (m *_CBusCommand) deepCopy() *_CBusCommand {
 	_CBusCommandCopy := &_CBusCommand{
 		nil, // will be set by child
 		utils.DeepCopy[CBusHeader](m.Header),
-		m.CBusOptions,
 	}
 	return _CBusCommandCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusCommandDeviceManagement.go b/plc4go/protocols/cbus/readwrite/model/CBusCommandDeviceManagement.go
index f634f0eed5d..6d9442c0389 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusCommandDeviceManagement.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusCommandDeviceManagement.go
@@ -65,9 +65,9 @@ var _ CBusCommandDeviceManagement = (*_CBusCommandDeviceManagement)(nil)
 var _ CBusCommandRequirements = (*_CBusCommandDeviceManagement)(nil)
 
 // NewCBusCommandDeviceManagement factory function for _CBusCommandDeviceManagement
-func NewCBusCommandDeviceManagement(header CBusHeader, paramNo Parameter, parameterValue byte, cBusOptions CBusOptions) *_CBusCommandDeviceManagement {
+func NewCBusCommandDeviceManagement(header CBusHeader, paramNo Parameter, parameterValue byte) *_CBusCommandDeviceManagement {
 	_result := &_CBusCommandDeviceManagement{
-		CBusCommandContract: NewCBusCommand(header, cBusOptions),
+		CBusCommandContract: NewCBusCommand(header),
 		ParamNo:             paramNo,
 		ParameterValue:      parameterValue,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToMultiPoint.go b/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToMultiPoint.go
index 1bee43b753c..32075abf3c1 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToMultiPoint.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToMultiPoint.go
@@ -59,12 +59,12 @@ var _ CBusCommandPointToMultiPoint = (*_CBusCommandPointToMultiPoint)(nil)
 var _ CBusCommandRequirements = (*_CBusCommandPointToMultiPoint)(nil)
 
 // NewCBusCommandPointToMultiPoint factory function for _CBusCommandPointToMultiPoint
-func NewCBusCommandPointToMultiPoint(header CBusHeader, command CBusPointToMultiPointCommand, cBusOptions CBusOptions) *_CBusCommandPointToMultiPoint {
+func NewCBusCommandPointToMultiPoint(header CBusHeader, command CBusPointToMultiPointCommand) *_CBusCommandPointToMultiPoint {
 	if command == nil {
 		panic("command of type CBusPointToMultiPointCommand for CBusCommandPointToMultiPoint must not be nil")
 	}
 	_result := &_CBusCommandPointToMultiPoint{
-		CBusCommandContract: NewCBusCommand(header, cBusOptions),
+		CBusCommandContract: NewCBusCommand(header),
 		Command:             command,
 	}
 	_result.CBusCommandContract.(*_CBusCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPoint.go b/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPoint.go
index 23dc75e1197..78b9046c19b 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPoint.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPoint.go
@@ -59,12 +59,12 @@ var _ CBusCommandPointToPoint = (*_CBusCommandPointToPoint)(nil)
 var _ CBusCommandRequirements = (*_CBusCommandPointToPoint)(nil)
 
 // NewCBusCommandPointToPoint factory function for _CBusCommandPointToPoint
-func NewCBusCommandPointToPoint(header CBusHeader, command CBusPointToPointCommand, cBusOptions CBusOptions) *_CBusCommandPointToPoint {
+func NewCBusCommandPointToPoint(header CBusHeader, command CBusPointToPointCommand) *_CBusCommandPointToPoint {
 	if command == nil {
 		panic("command of type CBusPointToPointCommand for CBusCommandPointToPoint must not be nil")
 	}
 	_result := &_CBusCommandPointToPoint{
-		CBusCommandContract: NewCBusCommand(header, cBusOptions),
+		CBusCommandContract: NewCBusCommand(header),
 		Command:             command,
 	}
 	_result.CBusCommandContract.(*_CBusCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPointToMultiPoint.go b/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPointToMultiPoint.go
index 85017609b82..70388411a7e 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPointToMultiPoint.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPointToMultiPoint.go
@@ -59,12 +59,12 @@ var _ CBusCommandPointToPointToMultiPoint = (*_CBusCommandPointToPointToMultiPoi
 var _ CBusCommandRequirements = (*_CBusCommandPointToPointToMultiPoint)(nil)
 
 // NewCBusCommandPointToPointToMultiPoint factory function for _CBusCommandPointToPointToMultiPoint
-func NewCBusCommandPointToPointToMultiPoint(header CBusHeader, command CBusPointToPointToMultiPointCommand, cBusOptions CBusOptions) *_CBusCommandPointToPointToMultiPoint {
+func NewCBusCommandPointToPointToMultiPoint(header CBusHeader, command CBusPointToPointToMultiPointCommand) *_CBusCommandPointToPointToMultiPoint {
 	if command == nil {
 		panic("command of type CBusPointToPointToMultiPointCommand for CBusCommandPointToPointToMultiPoint must not be nil")
 	}
 	_result := &_CBusCommandPointToPointToMultiPoint{
-		CBusCommandContract: NewCBusCommand(header, cBusOptions),
+		CBusCommandContract: NewCBusCommand(header),
 		Command:             command,
 	}
 	_result.CBusCommandContract.(*_CBusCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusHeader.go b/plc4go/protocols/cbus/readwrite/model/CBusHeader.go
index dea2af03e44..a6f98d90c2c 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusHeader.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusHeader.go
@@ -240,7 +240,7 @@ func CBusHeaderParseWithBufferProducer() func(ctx context.Context, readBuffer ut
 }
 
 func CBusHeaderParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (CBusHeader, error) {
-	v, err := (&_CBusHeader{}).parse(ctx, readBuffer)
+	v, err := (new(_CBusHeader)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusMessage.go b/plc4go/protocols/cbus/readwrite/model/CBusMessage.go
index 27a191cec69..ee56a993577 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusMessage.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusMessage.go
@@ -48,10 +48,6 @@ type CBusMessage interface {
 
 // CBusMessageContract provides a set of functions which can be overwritten by a sub struct
 type CBusMessageContract interface {
-	// GetRequestContext() returns a parser argument
-	GetRequestContext() RequestContext
-	// GetCBusOptions() returns a parser argument
-	GetCBusOptions() CBusOptions
 	// IsCBusMessage is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsCBusMessage()
 	// CreateBuilder creates a CBusMessageBuilder
@@ -72,17 +68,13 @@ type _CBusMessage struct {
 		CBusMessageContract
 		CBusMessageRequirements
 	}
-
-	// Arguments.
-	RequestContext RequestContext
-	CBusOptions    CBusOptions
 }
 
 var _ CBusMessageContract = (*_CBusMessage)(nil)
 
 // NewCBusMessage factory function for _CBusMessage
-func NewCBusMessage(requestContext RequestContext, cBusOptions CBusOptions) *_CBusMessage {
-	return &_CBusMessage{RequestContext: requestContext, CBusOptions: cBusOptions}
+func NewCBusMessage() *_CBusMessage {
+	return &_CBusMessage{}
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,10 +87,6 @@ type CBusMessageBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
 	WithMandatoryFields() CBusMessageBuilder
-	// WithArgRequestContext sets a parser argument
-	WithArgRequestContext(RequestContext) CBusMessageBuilder
-	// WithArgCBusOptions sets a parser argument
-	WithArgCBusOptions(CBusOptions) CBusMessageBuilder
 	// AsCBusMessageToServer converts this build to a subType of CBusMessage. It is always possible to return to current builder using Done()
 	AsCBusMessageToServer() CBusMessageToServerBuilder
 	// AsCBusMessageToClient converts this build to a subType of CBusMessage. It is always possible to return to current builder using Done()
@@ -138,15 +126,6 @@ func (b *_CBusMessageBuilder) WithMandatoryFields() CBusMessageBuilder {
 	return b
 }
 
-func (b *_CBusMessageBuilder) WithArgRequestContext(requestContext RequestContext) CBusMessageBuilder {
-	b.RequestContext = requestContext
-	return b
-}
-func (b *_CBusMessageBuilder) WithArgCBusOptions(cBusOptions CBusOptions) CBusMessageBuilder {
-	b.CBusOptions = cBusOptions
-	return b
-}
-
 func (b *_CBusMessageBuilder) PartialBuild() (CBusMessageContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -270,7 +249,7 @@ func CBusMessageParseWithBufferProducer[T CBusMessage](isResponse bool, requestC
 }
 
 func CBusMessageParseWithBuffer[T CBusMessage](ctx context.Context, readBuffer utils.ReadBuffer, isResponse bool, requestContext RequestContext, cBusOptions CBusOptions) (T, error) {
-	v, err := (&_CBusMessage{RequestContext: requestContext, CBusOptions: cBusOptions}).parse(ctx, readBuffer, isResponse, requestContext, cBusOptions)
+	v, err := (new(_CBusMessage)).parse(ctx, readBuffer, isResponse, requestContext, cBusOptions)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -347,19 +326,6 @@ func (pm *_CBusMessage) serializeParent(ctx context.Context, writeBuffer utils.W
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_CBusMessage) GetRequestContext() RequestContext {
-	return m.RequestContext
-}
-func (m *_CBusMessage) GetCBusOptions() CBusOptions {
-	return m.CBusOptions
-}
-
-//
-////
-
 func (m *_CBusMessage) IsCBusMessage() {}
 
 func (m *_CBusMessage) DeepCopy() any {
@@ -372,8 +338,6 @@ func (m *_CBusMessage) deepCopy() *_CBusMessage {
 	}
 	_CBusMessageCopy := &_CBusMessage{
 		nil, // will be set by child
-		m.RequestContext,
-		m.CBusOptions,
 	}
 	return _CBusMessageCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusMessageToClient.go b/plc4go/protocols/cbus/readwrite/model/CBusMessageToClient.go
index 6991d1fe6fb..bf63b0241f2 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusMessageToClient.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusMessageToClient.go
@@ -59,12 +59,12 @@ var _ CBusMessageToClient = (*_CBusMessageToClient)(nil)
 var _ CBusMessageRequirements = (*_CBusMessageToClient)(nil)
 
 // NewCBusMessageToClient factory function for _CBusMessageToClient
-func NewCBusMessageToClient(reply ReplyOrConfirmation, requestContext RequestContext, cBusOptions CBusOptions) *_CBusMessageToClient {
+func NewCBusMessageToClient(reply ReplyOrConfirmation) *_CBusMessageToClient {
 	if reply == nil {
 		panic("reply of type ReplyOrConfirmation for CBusMessageToClient must not be nil")
 	}
 	_result := &_CBusMessageToClient{
-		CBusMessageContract: NewCBusMessage(requestContext, cBusOptions),
+		CBusMessageContract: NewCBusMessage(),
 		Reply:               reply,
 	}
 	_result.CBusMessageContract.(*_CBusMessage)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusMessageToServer.go b/plc4go/protocols/cbus/readwrite/model/CBusMessageToServer.go
index 69cf8f90a7f..1055cb6b291 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusMessageToServer.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusMessageToServer.go
@@ -59,12 +59,12 @@ var _ CBusMessageToServer = (*_CBusMessageToServer)(nil)
 var _ CBusMessageRequirements = (*_CBusMessageToServer)(nil)
 
 // NewCBusMessageToServer factory function for _CBusMessageToServer
-func NewCBusMessageToServer(request Request, requestContext RequestContext, cBusOptions CBusOptions) *_CBusMessageToServer {
+func NewCBusMessageToServer(request Request) *_CBusMessageToServer {
 	if request == nil {
 		panic("request of type Request for CBusMessageToServer must not be nil")
 	}
 	_result := &_CBusMessageToServer{
-		CBusMessageContract: NewCBusMessage(requestContext, cBusOptions),
+		CBusMessageContract: NewCBusMessage(),
 		Request:             request,
 	}
 	_result.CBusMessageContract.(*_CBusMessage)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusOptions.go b/plc4go/protocols/cbus/readwrite/model/CBusOptions.go
index 87c277823cf..61a8e246dcc 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusOptions.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusOptions.go
@@ -325,7 +325,7 @@ func CBusOptionsParseWithBufferProducer() func(ctx context.Context, readBuffer u
 }
 
 func CBusOptionsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (CBusOptions, error) {
-	v, err := (&_CBusOptions{}).parse(ctx, readBuffer)
+	v, err := (new(_CBusOptions)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommand.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommand.go
index 6efd488790d..0aab83d31b1 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommand.go
@@ -52,8 +52,6 @@ type CBusPointToMultiPointCommand interface {
 type CBusPointToMultiPointCommandContract interface {
 	// GetPeekedApplication returns PeekedApplication (property field)
 	GetPeekedApplication() byte
-	// GetCBusOptions() returns a parser argument
-	GetCBusOptions() CBusOptions
 	// IsCBusPointToMultiPointCommand is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsCBusPointToMultiPointCommand()
 	// CreateBuilder creates a CBusPointToMultiPointCommandBuilder
@@ -75,16 +73,13 @@ type _CBusPointToMultiPointCommand struct {
 		CBusPointToMultiPointCommandRequirements
 	}
 	PeekedApplication byte
-
-	// Arguments.
-	CBusOptions CBusOptions
 }
 
 var _ CBusPointToMultiPointCommandContract = (*_CBusPointToMultiPointCommand)(nil)
 
 // NewCBusPointToMultiPointCommand factory function for _CBusPointToMultiPointCommand
-func NewCBusPointToMultiPointCommand(peekedApplication byte, cBusOptions CBusOptions) *_CBusPointToMultiPointCommand {
-	return &_CBusPointToMultiPointCommand{PeekedApplication: peekedApplication, CBusOptions: cBusOptions}
+func NewCBusPointToMultiPointCommand(peekedApplication byte) *_CBusPointToMultiPointCommand {
+	return &_CBusPointToMultiPointCommand{PeekedApplication: peekedApplication}
 }
 
 ///////////////////////////////////////////////////////////
@@ -99,8 +94,6 @@ type CBusPointToMultiPointCommandBuilder interface {
 	WithMandatoryFields(peekedApplication byte) CBusPointToMultiPointCommandBuilder
 	// WithPeekedApplication adds PeekedApplication (property field)
 	WithPeekedApplication(byte) CBusPointToMultiPointCommandBuilder
-	// WithArgCBusOptions sets a parser argument
-	WithArgCBusOptions(CBusOptions) CBusPointToMultiPointCommandBuilder
 	// AsCBusPointToMultiPointCommandStatus converts this build to a subType of CBusPointToMultiPointCommand. It is always possible to return to current builder using Done()
 	AsCBusPointToMultiPointCommandStatus() CBusPointToMultiPointCommandStatusBuilder
 	// AsCBusPointToMultiPointCommandNormal converts this build to a subType of CBusPointToMultiPointCommand. It is always possible to return to current builder using Done()
@@ -145,11 +138,6 @@ func (b *_CBusPointToMultiPointCommandBuilder) WithPeekedApplication(peekedAppli
 	return b
 }
 
-func (b *_CBusPointToMultiPointCommandBuilder) WithArgCBusOptions(cBusOptions CBusOptions) CBusPointToMultiPointCommandBuilder {
-	b.CBusOptions = cBusOptions
-	return b
-}
-
 func (b *_CBusPointToMultiPointCommandBuilder) PartialBuild() (CBusPointToMultiPointCommandContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -287,7 +275,7 @@ func CBusPointToMultiPointCommandParseWithBufferProducer[T CBusPointToMultiPoint
 }
 
 func CBusPointToMultiPointCommandParseWithBuffer[T CBusPointToMultiPointCommand](ctx context.Context, readBuffer utils.ReadBuffer, cBusOptions CBusOptions) (T, error) {
-	v, err := (&_CBusPointToMultiPointCommand{CBusOptions: cBusOptions}).parse(ctx, readBuffer, cBusOptions)
+	v, err := (new(_CBusPointToMultiPointCommand)).parse(ctx, readBuffer, cBusOptions)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -360,16 +348,6 @@ func (pm *_CBusPointToMultiPointCommand) serializeParent(ctx context.Context, wr
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_CBusPointToMultiPointCommand) GetCBusOptions() CBusOptions {
-	return m.CBusOptions
-}
-
-//
-////
-
 func (m *_CBusPointToMultiPointCommand) IsCBusPointToMultiPointCommand() {}
 
 func (m *_CBusPointToMultiPointCommand) DeepCopy() any {
@@ -383,7 +361,6 @@ func (m *_CBusPointToMultiPointCommand) deepCopy() *_CBusPointToMultiPointComman
 	_CBusPointToMultiPointCommandCopy := &_CBusPointToMultiPointCommand{
 		nil, // will be set by child
 		m.PeekedApplication,
-		m.CBusOptions,
 	}
 	return _CBusPointToMultiPointCommandCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go
index 59e8d4536cd..e47a24fe12d 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go
@@ -64,12 +64,12 @@ var _ CBusPointToMultiPointCommandNormal = (*_CBusPointToMultiPointCommandNormal
 var _ CBusPointToMultiPointCommandRequirements = (*_CBusPointToMultiPointCommandNormal)(nil)
 
 // NewCBusPointToMultiPointCommandNormal factory function for _CBusPointToMultiPointCommandNormal
-func NewCBusPointToMultiPointCommandNormal(peekedApplication byte, application ApplicationIdContainer, salData SALData, cBusOptions CBusOptions) *_CBusPointToMultiPointCommandNormal {
+func NewCBusPointToMultiPointCommandNormal(peekedApplication byte, application ApplicationIdContainer, salData SALData) *_CBusPointToMultiPointCommandNormal {
 	if salData == nil {
 		panic("salData of type SALData for CBusPointToMultiPointCommandNormal must not be nil")
 	}
 	_result := &_CBusPointToMultiPointCommandNormal{
-		CBusPointToMultiPointCommandContract: NewCBusPointToMultiPointCommand(peekedApplication, cBusOptions),
+		CBusPointToMultiPointCommandContract: NewCBusPointToMultiPointCommand(peekedApplication),
 		Application:                          application,
 		SalData:                              salData,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go
index 98237b1337f..714acfd6c97 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go
@@ -62,12 +62,12 @@ var _ CBusPointToMultiPointCommandStatus = (*_CBusPointToMultiPointCommandStatus
 var _ CBusPointToMultiPointCommandRequirements = (*_CBusPointToMultiPointCommandStatus)(nil)
 
 // NewCBusPointToMultiPointCommandStatus factory function for _CBusPointToMultiPointCommandStatus
-func NewCBusPointToMultiPointCommandStatus(peekedApplication byte, statusRequest StatusRequest, cBusOptions CBusOptions) *_CBusPointToMultiPointCommandStatus {
+func NewCBusPointToMultiPointCommandStatus(peekedApplication byte, statusRequest StatusRequest) *_CBusPointToMultiPointCommandStatus {
 	if statusRequest == nil {
 		panic("statusRequest of type StatusRequest for CBusPointToMultiPointCommandStatus must not be nil")
 	}
 	_result := &_CBusPointToMultiPointCommandStatus{
-		CBusPointToMultiPointCommandContract: NewCBusPointToMultiPointCommand(peekedApplication, cBusOptions),
+		CBusPointToMultiPointCommandContract: NewCBusPointToMultiPointCommand(peekedApplication),
 		StatusRequest:                        statusRequest,
 	}
 	_result.CBusPointToMultiPointCommandContract.(*_CBusPointToMultiPointCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommand.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommand.go
index 750dbe86850..bb33bd1759b 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommand.go
@@ -56,8 +56,6 @@ type CBusPointToPointCommandContract interface {
 	GetCalData() CALData
 	// GetIsDirect returns IsDirect (virtual field)
 	GetIsDirect() bool
-	// GetCBusOptions() returns a parser argument
-	GetCBusOptions() CBusOptions
 	// IsCBusPointToPointCommand is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsCBusPointToPointCommand()
 	// CreateBuilder creates a CBusPointToPointCommandBuilder
@@ -80,19 +78,16 @@ type _CBusPointToPointCommand struct {
 	}
 	BridgeAddressCountPeek uint16
 	CalData                CALData
-
-	// Arguments.
-	CBusOptions CBusOptions
 }
 
 var _ CBusPointToPointCommandContract = (*_CBusPointToPointCommand)(nil)
 
 // NewCBusPointToPointCommand factory function for _CBusPointToPointCommand
-func NewCBusPointToPointCommand(bridgeAddressCountPeek uint16, calData CALData, cBusOptions CBusOptions) *_CBusPointToPointCommand {
+func NewCBusPointToPointCommand(bridgeAddressCountPeek uint16, calData CALData) *_CBusPointToPointCommand {
 	if calData == nil {
 		panic("calData of type CALData for CBusPointToPointCommand must not be nil")
 	}
-	return &_CBusPointToPointCommand{BridgeAddressCountPeek: bridgeAddressCountPeek, CalData: calData, CBusOptions: cBusOptions}
+	return &_CBusPointToPointCommand{BridgeAddressCountPeek: bridgeAddressCountPeek, CalData: calData}
 }
 
 ///////////////////////////////////////////////////////////
@@ -111,8 +106,6 @@ type CBusPointToPointCommandBuilder interface {
 	WithCalData(CALData) CBusPointToPointCommandBuilder
 	// WithCalDataBuilder adds CalData (property field) which is build by the builder
 	WithCalDataBuilder(func(CALDataBuilder) CALDataBuilder) CBusPointToPointCommandBuilder
-	// WithArgCBusOptions sets a parser argument
-	WithArgCBusOptions(CBusOptions) CBusPointToPointCommandBuilder
 	// AsCBusPointToPointCommandDirect converts this build to a subType of CBusPointToPointCommand. It is always possible to return to current builder using Done()
 	AsCBusPointToPointCommandDirect() CBusPointToPointCommandDirectBuilder
 	// AsCBusPointToPointCommandIndirect converts this build to a subType of CBusPointToPointCommand. It is always possible to return to current builder using Done()
@@ -172,11 +165,6 @@ func (b *_CBusPointToPointCommandBuilder) WithCalDataBuilder(builderSupplier fun
 	return b
 }
 
-func (b *_CBusPointToPointCommandBuilder) WithArgCBusOptions(cBusOptions CBusOptions) CBusPointToPointCommandBuilder {
-	b.CBusOptions = cBusOptions
-	return b
-}
-
 func (b *_CBusPointToPointCommandBuilder) PartialBuild() (CBusPointToPointCommandContract, error) {
 	if b.CalData == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'calData' not set"))
@@ -342,7 +330,7 @@ func CBusPointToPointCommandParseWithBufferProducer[T CBusPointToPointCommand](c
 }
 
 func CBusPointToPointCommandParseWithBuffer[T CBusPointToPointCommand](ctx context.Context, readBuffer utils.ReadBuffer, cBusOptions CBusOptions) (T, error) {
-	v, err := (&_CBusPointToPointCommand{CBusOptions: cBusOptions}).parse(ctx, readBuffer, cBusOptions)
+	v, err := (new(_CBusPointToPointCommand)).parse(ctx, readBuffer, cBusOptions)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -437,16 +425,6 @@ func (pm *_CBusPointToPointCommand) serializeParent(ctx context.Context, writeBu
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_CBusPointToPointCommand) GetCBusOptions() CBusOptions {
-	return m.CBusOptions
-}
-
-//
-////
-
 func (m *_CBusPointToPointCommand) IsCBusPointToPointCommand() {}
 
 func (m *_CBusPointToPointCommand) DeepCopy() any {
@@ -461,7 +439,6 @@ func (m *_CBusPointToPointCommand) deepCopy() *_CBusPointToPointCommand {
 		nil, // will be set by child
 		m.BridgeAddressCountPeek,
 		utils.DeepCopy[CALData](m.CalData),
-		m.CBusOptions,
 	}
 	return _CBusPointToPointCommandCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandDirect.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandDirect.go
index 1e3260eac0d..386288c126f 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandDirect.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandDirect.go
@@ -61,12 +61,12 @@ var _ CBusPointToPointCommandDirect = (*_CBusPointToPointCommandDirect)(nil)
 var _ CBusPointToPointCommandRequirements = (*_CBusPointToPointCommandDirect)(nil)
 
 // NewCBusPointToPointCommandDirect factory function for _CBusPointToPointCommandDirect
-func NewCBusPointToPointCommandDirect(bridgeAddressCountPeek uint16, calData CALData, unitAddress UnitAddress, cBusOptions CBusOptions) *_CBusPointToPointCommandDirect {
+func NewCBusPointToPointCommandDirect(bridgeAddressCountPeek uint16, calData CALData, unitAddress UnitAddress) *_CBusPointToPointCommandDirect {
 	if unitAddress == nil {
 		panic("unitAddress of type UnitAddress for CBusPointToPointCommandDirect must not be nil")
 	}
 	_result := &_CBusPointToPointCommandDirect{
-		CBusPointToPointCommandContract: NewCBusPointToPointCommand(bridgeAddressCountPeek, calData, cBusOptions),
+		CBusPointToPointCommandContract: NewCBusPointToPointCommand(bridgeAddressCountPeek, calData),
 		UnitAddress:                     unitAddress,
 	}
 	_result.CBusPointToPointCommandContract.(*_CBusPointToPointCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandIndirect.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandIndirect.go
index 1005ba96cd8..fc66f2709b0 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandIndirect.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandIndirect.go
@@ -65,7 +65,7 @@ var _ CBusPointToPointCommandIndirect = (*_CBusPointToPointCommandIndirect)(nil)
 var _ CBusPointToPointCommandRequirements = (*_CBusPointToPointCommandIndirect)(nil)
 
 // NewCBusPointToPointCommandIndirect factory function for _CBusPointToPointCommandIndirect
-func NewCBusPointToPointCommandIndirect(bridgeAddressCountPeek uint16, calData CALData, bridgeAddress BridgeAddress, networkRoute NetworkRoute, unitAddress UnitAddress, cBusOptions CBusOptions) *_CBusPointToPointCommandIndirect {
+func NewCBusPointToPointCommandIndirect(bridgeAddressCountPeek uint16, calData CALData, bridgeAddress BridgeAddress, networkRoute NetworkRoute, unitAddress UnitAddress) *_CBusPointToPointCommandIndirect {
 	if bridgeAddress == nil {
 		panic("bridgeAddress of type BridgeAddress for CBusPointToPointCommandIndirect must not be nil")
 	}
@@ -76,7 +76,7 @@ func NewCBusPointToPointCommandIndirect(bridgeAddressCountPeek uint16, calData C
 		panic("unitAddress of type UnitAddress for CBusPointToPointCommandIndirect must not be nil")
 	}
 	_result := &_CBusPointToPointCommandIndirect{
-		CBusPointToPointCommandContract: NewCBusPointToPointCommand(bridgeAddressCountPeek, calData, cBusOptions),
+		CBusPointToPointCommandContract: NewCBusPointToPointCommand(bridgeAddressCountPeek, calData),
 		BridgeAddress:                   bridgeAddress,
 		NetworkRoute:                    networkRoute,
 		UnitAddress:                     unitAddress,
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommand.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommand.go
index c12f07e9b71..85ef172cc38 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommand.go
@@ -56,8 +56,6 @@ type CBusPointToPointToMultiPointCommandContract interface {
 	GetNetworkRoute() NetworkRoute
 	// GetPeekedApplication returns PeekedApplication (property field)
 	GetPeekedApplication() byte
-	// GetCBusOptions() returns a parser argument
-	GetCBusOptions() CBusOptions
 	// IsCBusPointToPointToMultiPointCommand is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsCBusPointToPointToMultiPointCommand()
 	// CreateBuilder creates a CBusPointToPointToMultiPointCommandBuilder
@@ -81,22 +79,19 @@ type _CBusPointToPointToMultiPointCommand struct {
 	BridgeAddress     BridgeAddress
 	NetworkRoute      NetworkRoute
 	PeekedApplication byte
-
-	// Arguments.
-	CBusOptions CBusOptions
 }
 
 var _ CBusPointToPointToMultiPointCommandContract = (*_CBusPointToPointToMultiPointCommand)(nil)
 
 // NewCBusPointToPointToMultiPointCommand factory function for _CBusPointToPointToMultiPointCommand
-func NewCBusPointToPointToMultiPointCommand(bridgeAddress BridgeAddress, networkRoute NetworkRoute, peekedApplication byte, cBusOptions CBusOptions) *_CBusPointToPointToMultiPointCommand {
+func NewCBusPointToPointToMultiPointCommand(bridgeAddress BridgeAddress, networkRoute NetworkRoute, peekedApplication byte) *_CBusPointToPointToMultiPointCommand {
 	if bridgeAddress == nil {
 		panic("bridgeAddress of type BridgeAddress for CBusPointToPointToMultiPointCommand must not be nil")
 	}
 	if networkRoute == nil {
 		panic("networkRoute of type NetworkRoute for CBusPointToPointToMultiPointCommand must not be nil")
 	}
-	return &_CBusPointToPointToMultiPointCommand{BridgeAddress: bridgeAddress, NetworkRoute: networkRoute, PeekedApplication: peekedApplication, CBusOptions: cBusOptions}
+	return &_CBusPointToPointToMultiPointCommand{BridgeAddress: bridgeAddress, NetworkRoute: networkRoute, PeekedApplication: peekedApplication}
 }
 
 ///////////////////////////////////////////////////////////
@@ -119,8 +114,6 @@ type CBusPointToPointToMultiPointCommandBuilder interface {
 	WithNetworkRouteBuilder(func(NetworkRouteBuilder) NetworkRouteBuilder) CBusPointToPointToMultiPointCommandBuilder
 	// WithPeekedApplication adds PeekedApplication (property field)
 	WithPeekedApplication(byte) CBusPointToPointToMultiPointCommandBuilder
-	// WithArgCBusOptions sets a parser argument
-	WithArgCBusOptions(CBusOptions) CBusPointToPointToMultiPointCommandBuilder
 	// AsCBusPointToPointToMultiPointCommandStatus converts this build to a subType of CBusPointToPointToMultiPointCommand. It is always possible to return to current builder using Done()
 	AsCBusPointToPointToMultiPointCommandStatus() CBusPointToPointToMultiPointCommandStatusBuilder
 	// AsCBusPointToPointToMultiPointCommandNormal converts this build to a subType of CBusPointToPointToMultiPointCommand. It is always possible to return to current builder using Done()
@@ -195,11 +188,6 @@ func (b *_CBusPointToPointToMultiPointCommandBuilder) WithPeekedApplication(peek
 	return b
 }
 
-func (b *_CBusPointToPointToMultiPointCommandBuilder) WithArgCBusOptions(cBusOptions CBusOptions) CBusPointToPointToMultiPointCommandBuilder {
-	b.CBusOptions = cBusOptions
-	return b
-}
-
 func (b *_CBusPointToPointToMultiPointCommandBuilder) PartialBuild() (CBusPointToPointToMultiPointCommandContract, error) {
 	if b.BridgeAddress == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'bridgeAddress' not set"))
@@ -357,7 +345,7 @@ func CBusPointToPointToMultiPointCommandParseWithBufferProducer[T CBusPointToPoi
 }
 
 func CBusPointToPointToMultiPointCommandParseWithBuffer[T CBusPointToPointToMultiPointCommand](ctx context.Context, readBuffer utils.ReadBuffer, cBusOptions CBusOptions) (T, error) {
-	v, err := (&_CBusPointToPointToMultiPointCommand{CBusOptions: cBusOptions}).parse(ctx, readBuffer, cBusOptions)
+	v, err := (new(_CBusPointToPointToMultiPointCommand)).parse(ctx, readBuffer, cBusOptions)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -450,16 +438,6 @@ func (pm *_CBusPointToPointToMultiPointCommand) serializeParent(ctx context.Cont
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_CBusPointToPointToMultiPointCommand) GetCBusOptions() CBusOptions {
-	return m.CBusOptions
-}
-
-//
-////
-
 func (m *_CBusPointToPointToMultiPointCommand) IsCBusPointToPointToMultiPointCommand() {}
 
 func (m *_CBusPointToPointToMultiPointCommand) DeepCopy() any {
@@ -475,7 +453,6 @@ func (m *_CBusPointToPointToMultiPointCommand) deepCopy() *_CBusPointToPointToMu
 		utils.DeepCopy[BridgeAddress](m.BridgeAddress),
 		utils.DeepCopy[NetworkRoute](m.NetworkRoute),
 		m.PeekedApplication,
-		m.CBusOptions,
 	}
 	return _CBusPointToPointToMultiPointCommandCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandNormal.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandNormal.go
index 77919fbfeff..97543b3333f 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandNormal.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandNormal.go
@@ -62,12 +62,12 @@ var _ CBusPointToPointToMultiPointCommandNormal = (*_CBusPointToPointToMultiPoin
 var _ CBusPointToPointToMultiPointCommandRequirements = (*_CBusPointToPointToMultiPointCommandNormal)(nil)
 
 // NewCBusPointToPointToMultiPointCommandNormal factory function for _CBusPointToPointToMultiPointCommandNormal
-func NewCBusPointToPointToMultiPointCommandNormal(bridgeAddress BridgeAddress, networkRoute NetworkRoute, peekedApplication byte, application ApplicationIdContainer, salData SALData, cBusOptions CBusOptions) *_CBusPointToPointToMultiPointCommandNormal {
+func NewCBusPointToPointToMultiPointCommandNormal(bridgeAddress BridgeAddress, networkRoute NetworkRoute, peekedApplication byte, application ApplicationIdContainer, salData SALData) *_CBusPointToPointToMultiPointCommandNormal {
 	if salData == nil {
 		panic("salData of type SALData for CBusPointToPointToMultiPointCommandNormal must not be nil")
 	}
 	_result := &_CBusPointToPointToMultiPointCommandNormal{
-		CBusPointToPointToMultiPointCommandContract: NewCBusPointToPointToMultiPointCommand(bridgeAddress, networkRoute, peekedApplication, cBusOptions),
+		CBusPointToPointToMultiPointCommandContract: NewCBusPointToPointToMultiPointCommand(bridgeAddress, networkRoute, peekedApplication),
 		Application: application,
 		SalData:     salData,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandStatus.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandStatus.go
index fcbdba6dea5..05f3d5e72aa 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandStatus.go
@@ -61,12 +61,12 @@ var _ CBusPointToPointToMultiPointCommandStatus = (*_CBusPointToPointToMultiPoin
 var _ CBusPointToPointToMultiPointCommandRequirements = (*_CBusPointToPointToMultiPointCommandStatus)(nil)
 
 // NewCBusPointToPointToMultiPointCommandStatus factory function for _CBusPointToPointToMultiPointCommandStatus
-func NewCBusPointToPointToMultiPointCommandStatus(bridgeAddress BridgeAddress, networkRoute NetworkRoute, peekedApplication byte, statusRequest StatusRequest, cBusOptions CBusOptions) *_CBusPointToPointToMultiPointCommandStatus {
+func NewCBusPointToPointToMultiPointCommandStatus(bridgeAddress BridgeAddress, networkRoute NetworkRoute, peekedApplication byte, statusRequest StatusRequest) *_CBusPointToPointToMultiPointCommandStatus {
 	if statusRequest == nil {
 		panic("statusRequest of type StatusRequest for CBusPointToPointToMultiPointCommandStatus must not be nil")
 	}
 	_result := &_CBusPointToPointToMultiPointCommandStatus{
-		CBusPointToPointToMultiPointCommandContract: NewCBusPointToPointToMultiPointCommand(bridgeAddress, networkRoute, peekedApplication, cBusOptions),
+		CBusPointToPointToMultiPointCommandContract: NewCBusPointToPointToMultiPointCommand(bridgeAddress, networkRoute, peekedApplication),
 		StatusRequest: statusRequest,
 	}
 	_result.CBusPointToPointToMultiPointCommandContract.(*_CBusPointToPointToMultiPointCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/Checksum.go b/plc4go/protocols/cbus/readwrite/model/Checksum.go
index ad3f9dfa086..e1d0fcffde2 100644
--- a/plc4go/protocols/cbus/readwrite/model/Checksum.go
+++ b/plc4go/protocols/cbus/readwrite/model/Checksum.go
@@ -189,7 +189,7 @@ func ChecksumParseWithBufferProducer() func(ctx context.Context, readBuffer util
 }
 
 func ChecksumParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (Checksum, error) {
-	v, err := (&_Checksum{}).parse(ctx, readBuffer)
+	v, err := (new(_Checksum)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingData.go b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingData.go
index 3fef9b29471..62a7d1a85a1 100644
--- a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingData.go
+++ b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingData.go
@@ -329,7 +329,7 @@ func ClockAndTimekeepingDataParseWithBufferProducer[T ClockAndTimekeepingData]()
 }
 
 func ClockAndTimekeepingDataParseWithBuffer[T ClockAndTimekeepingData](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_ClockAndTimekeepingData{}).parse(ctx, readBuffer)
+	v, err := (new(_ClockAndTimekeepingData)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/cbus/readwrite/model/Confirmation.go b/plc4go/protocols/cbus/readwrite/model/Confirmation.go
index 965d6c49c3a..810e7be0fc8 100644
--- a/plc4go/protocols/cbus/readwrite/model/Confirmation.go
+++ b/plc4go/protocols/cbus/readwrite/model/Confirmation.go
@@ -276,7 +276,7 @@ func ConfirmationParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func ConfirmationParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (Confirmation, error) {
-	v, err := (&_Confirmation{}).parse(ctx, readBuffer)
+	v, err := (new(_Confirmation)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/Constants.go b/plc4go/protocols/cbus/readwrite/model/Constants.go
new file mode 100644
index 00000000000..0c54cb4c8f1
--- /dev/null
+++ b/plc4go/protocols/cbus/readwrite/model/Constants.go
@@ -0,0 +1,24 @@
+/*
+ * 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 model
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Constant values.
+var Constant_CBUSTCPDEFAULTPORT uint16 = uint16(10001)
diff --git a/plc4go/protocols/cbus/readwrite/model/CustomManufacturer.go b/plc4go/protocols/cbus/readwrite/model/CustomManufacturer.go
index 4dc3bd87af2..bfd45b05981 100644
--- a/plc4go/protocols/cbus/readwrite/model/CustomManufacturer.go
+++ b/plc4go/protocols/cbus/readwrite/model/CustomManufacturer.go
@@ -40,6 +40,8 @@ type CustomManufacturer interface {
 	utils.LengthAware
 	utils.Serializable
 	utils.Copyable
+	// GetNumBytes returns NumBytes (property field)
+	GetNumBytes() uint8
 	// GetCustomString returns CustomString (property field)
 	GetCustomString() string
 	// IsCustomManufacturer is a marker method to prevent unintentional type checks (interfaces of same signature)
@@ -50,17 +52,15 @@ type CustomManufacturer interface {
 
 // _CustomManufacturer is the data-structure of this message
 type _CustomManufacturer struct {
+	NumBytes     uint8
 	CustomString string
-
-	// Arguments.
-	NumBytes uint8
 }
 
 var _ CustomManufacturer = (*_CustomManufacturer)(nil)
 
 // NewCustomManufacturer factory function for _CustomManufacturer
-func NewCustomManufacturer(customString string, numBytes uint8) *_CustomManufacturer {
-	return &_CustomManufacturer{CustomString: customString, NumBytes: numBytes}
+func NewCustomManufacturer(numBytes uint8, customString string) *_CustomManufacturer {
+	return &_CustomManufacturer{NumBytes: numBytes, CustomString: customString}
 }
 
 ///////////////////////////////////////////////////////////
@@ -72,11 +72,11 @@ func NewCustomManufacturer(customString string, numBytes uint8) *_CustomManufact
 type CustomManufacturerBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
-	WithMandatoryFields(customString string) CustomManufacturerBuilder
+	WithMandatoryFields(numBytes uint8, customString string) CustomManufacturerBuilder
+	// WithNumBytes adds NumBytes (property field)
+	WithNumBytes(uint8) CustomManufacturerBuilder
 	// WithCustomString adds CustomString (property field)
 	WithCustomString(string) CustomManufacturerBuilder
-	// WithArgNumBytes sets a parser argument
-	WithArgNumBytes(uint8) CustomManufacturerBuilder
 	// Build builds the CustomManufacturer or returns an error if something is wrong
 	Build() (CustomManufacturer, error)
 	// MustBuild does the same as Build but panics on error
@@ -96,17 +96,17 @@ type _CustomManufacturerBuilder struct {
 
 var _ (CustomManufacturerBuilder) = (*_CustomManufacturerBuilder)(nil)
 
-func (b *_CustomManufacturerBuilder) WithMandatoryFields(customString string) CustomManufacturerBuilder {
-	return b.WithCustomString(customString)
+func (b *_CustomManufacturerBuilder) WithMandatoryFields(numBytes uint8, customString string) CustomManufacturerBuilder {
+	return b.WithNumBytes(numBytes).WithCustomString(customString)
 }
 
-func (b *_CustomManufacturerBuilder) WithCustomString(customString string) CustomManufacturerBuilder {
-	b.CustomString = customString
+func (b *_CustomManufacturerBuilder) WithNumBytes(numBytes uint8) CustomManufacturerBuilder {
+	b.NumBytes = numBytes
 	return b
 }
 
-func (b *_CustomManufacturerBuilder) WithArgNumBytes(numBytes uint8) CustomManufacturerBuilder {
-	b.NumBytes = numBytes
+func (b *_CustomManufacturerBuilder) WithCustomString(customString string) CustomManufacturerBuilder {
+	b.CustomString = customString
 	return b
 }
 
@@ -151,6 +151,10 @@ func (b *_CustomManufacturer) CreateCustomManufacturerBuilder() CustomManufactur
 /////////////////////// Accessors for property fields.
 ///////////////////////
 
+func (m *_CustomManufacturer) GetNumBytes() uint8 {
+	return m.NumBytes
+}
+
 func (m *_CustomManufacturer) GetCustomString() string {
 	return m.CustomString
 }
@@ -199,7 +203,7 @@ func CustomManufacturerParseWithBufferProducer(numBytes uint8) func(ctx context.
 }
 
 func CustomManufacturerParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, numBytes uint8) (CustomManufacturer, error) {
-	v, err := (&_CustomManufacturer{NumBytes: numBytes}).parse(ctx, readBuffer, numBytes)
+	v, err := (new(_CustomManufacturer)).parse(ctx, readBuffer, numBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -214,6 +218,7 @@ func (m *_CustomManufacturer) parse(ctx context.Context, readBuffer utils.ReadBu
 	}
 	currentPos := positionAware.GetPos()
 	_ = currentPos
+	m.NumBytes = numBytes
 
 	customString, err := ReadSimpleField(ctx, "customString", ReadString(readBuffer, uint32(int32(int32(8))*int32(numBytes))))
 	if err != nil {
@@ -255,16 +260,6 @@ func (m *_CustomManufacturer) SerializeWithWriteBuffer(ctx context.Context, writ
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_CustomManufacturer) GetNumBytes() uint8 {
-	return m.NumBytes
-}
-
-//
-////
-
 func (m *_CustomManufacturer) IsCustomManufacturer() {}
 
 func (m *_CustomManufacturer) DeepCopy() any {
@@ -276,8 +271,8 @@ func (m *_CustomManufacturer) deepCopy() *_CustomManufacturer {
 		return nil
 	}
 	_CustomManufacturerCopy := &_CustomManufacturer{
-		m.CustomString,
 		m.NumBytes,
+		m.CustomString,
 	}
 	return _CustomManufacturerCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/CustomTypes.go b/plc4go/protocols/cbus/readwrite/model/CustomTypes.go
index 1914fc5f846..80be8cd6ace 100644
--- a/plc4go/protocols/cbus/readwrite/model/CustomTypes.go
+++ b/plc4go/protocols/cbus/readwrite/model/CustomTypes.go
@@ -40,6 +40,8 @@ type CustomTypes interface {
 	utils.LengthAware
 	utils.Serializable
 	utils.Copyable
+	// GetNumBytes returns NumBytes (property field)
+	GetNumBytes() uint8
 	// GetCustomString returns CustomString (property field)
 	GetCustomString() string
 	// IsCustomTypes is a marker method to prevent unintentional type checks (interfaces of same signature)
@@ -50,17 +52,15 @@ type CustomTypes interface {
 
 // _CustomTypes is the data-structure of this message
 type _CustomTypes struct {
+	NumBytes     uint8
 	CustomString string
-
-	// Arguments.
-	NumBytes uint8
 }
 
 var _ CustomTypes = (*_CustomTypes)(nil)
 
 // NewCustomTypes factory function for _CustomTypes
-func NewCustomTypes(customString string, numBytes uint8) *_CustomTypes {
-	return &_CustomTypes{CustomString: customString, NumBytes: numBytes}
+func NewCustomTypes(numBytes uint8, customString string) *_CustomTypes {
+	return &_CustomTypes{NumBytes: numBytes, CustomString: customString}
 }
 
 ///////////////////////////////////////////////////////////
@@ -72,11 +72,11 @@ func NewCustomTypes(customString string, numBytes uint8) *_CustomTypes {
 type CustomTypesBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
-	WithMandatoryFields(customString string) CustomTypesBuilder
+	WithMandatoryFields(numBytes uint8, customString string) CustomTypesBuilder
+	// WithNumBytes adds NumBytes (property field)
+	WithNumBytes(uint8) CustomTypesBuilder
 	// WithCustomString adds CustomString (property field)
 	WithCustomString(string) CustomTypesBuilder
-	// WithArgNumBytes sets a parser argument
-	WithArgNumBytes(uint8) CustomTypesBuilder
 	// Build builds the CustomTypes or returns an error if something is wrong
 	Build() (CustomTypes, error)
 	// MustBuild does the same as Build but panics on error
@@ -96,17 +96,17 @@ type _CustomTypesBuilder struct {
 
 var _ (CustomTypesBuilder) = (*_CustomTypesBuilder)(nil)
 
-func (b *_CustomTypesBuilder) WithMandatoryFields(customString string) CustomTypesBuilder {
-	return b.WithCustomString(customString)
+func (b *_CustomTypesBuilder) WithMandatoryFields(numBytes uint8, customString string) CustomTypesBuilder {
+	return b.WithNumBytes(numBytes).WithCustomString(customString)
 }
 
-func (b *_CustomTypesBuilder) WithCustomString(customString string) CustomTypesBuilder {
-	b.CustomString = customString
+func (b *_CustomTypesBuilder) WithNumBytes(numBytes uint8) CustomTypesBuilder {
+	b.NumBytes = numBytes
 	return b
 }
 
-func (b *_CustomTypesBuilder) WithArgNumBytes(numBytes uint8) CustomTypesBuilder {
-	b.NumBytes = numBytes
+func (b *_CustomTypesBuilder) WithCustomString(customString string) CustomTypesBuilder {
+	b.CustomString = customString
 	return b
 }
 
@@ -151,6 +151,10 @@ func (b *_CustomTypes) CreateCustomTypesBuilder() CustomTypesBuilder {
 /////////////////////// Accessors for property fields.
 ///////////////////////
 
+func (m *_CustomTypes) GetNumBytes() uint8 {
+	return m.NumBytes
+}
+
 func (m *_CustomTypes) GetCustomString() string {
 	return m.CustomString
 }
@@ -199,7 +203,7 @@ func CustomTypesParseWithBufferProducer(numBytes uint8) func(ctx context.Context
 }
 
 func CustomTypesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, numBytes uint8) (CustomTypes, error) {
-	v, err := (&_CustomTypes{NumBytes: numBytes}).parse(ctx, readBuffer, numBytes)
+	v, err := (new(_CustomTypes)).parse(ctx, readBuffer, numBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -214,6 +218,7 @@ func (m *_CustomTypes) parse(ctx context.Context, readBuffer utils.ReadBuffer, n
 	}
 	currentPos := positionAware.GetPos()
 	_ = currentPos
+	m.NumBytes = numBytes
 
 	customString, err := ReadSimpleField(ctx, "customString", ReadString(readBuffer, uint32(int32(int32(8))*int32(numBytes))))
 	if err != nil {
@@ -255,16 +260,6 @@ func (m *_CustomTypes) SerializeWithWriteBuffer(ctx context.Context, writeBuffer
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_CustomTypes) GetNumBytes() uint8 {
-	return m.NumBytes
-}
-
-//
-////
-
 func (m *_CustomTypes) IsCustomTypes() {}
 
 func (m *_CustomTypes) DeepCopy() any {
@@ -276,8 +271,8 @@ func (m *_CustomTypes) deepCopy() *_CustomTypes {
 		return nil
 	}
 	_CustomTypesCopy := &_CustomTypes{
-		m.CustomString,
 		m.NumBytes,
+		m.CustomString,
 	}
 	return _CustomTypesCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/EnableControlData.go b/plc4go/protocols/cbus/readwrite/model/EnableControlData.go
index 8b239d4e2a8..fe5c06729b4 100644
--- a/plc4go/protocols/cbus/readwrite/model/EnableControlData.go
+++ b/plc4go/protocols/cbus/readwrite/model/EnableControlData.go
@@ -242,7 +242,7 @@ func EnableControlDataParseWithBufferProducer() func(ctx context.Context, readBu
 }
 
 func EnableControlDataParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (EnableControlData, error) {
-	v, err := (&_EnableControlData{}).parse(ctx, readBuffer)
+	v, err := (new(_EnableControlData)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/EncodedReply.go b/plc4go/protocols/cbus/readwrite/model/EncodedReply.go
index 3153f3f60d5..a650a1459c6 100644
--- a/plc4go/protocols/cbus/readwrite/model/EncodedReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/EncodedReply.go
@@ -50,14 +50,12 @@ type EncodedReply interface {
 
 // EncodedReplyContract provides a set of functions which can be overwritten by a sub struct
 type EncodedReplyContract interface {
+	// GetRequestContext returns RequestContext (property field)
+	GetRequestContext() RequestContext
 	// GetPeekedByte returns PeekedByte (property field)
 	GetPeekedByte() byte
 	// GetIsMonitoredSAL returns IsMonitoredSAL (virtual field)
 	GetIsMonitoredSAL() bool
-	// GetCBusOptions() returns a parser argument
-	GetCBusOptions() CBusOptions
-	// GetRequestContext() returns a parser argument
-	GetRequestContext() RequestContext
 	// IsEncodedReply is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsEncodedReply()
 	// CreateBuilder creates a EncodedReplyBuilder
@@ -78,18 +76,15 @@ type _EncodedReply struct {
 		EncodedReplyContract
 		EncodedReplyRequirements
 	}
-	PeekedByte byte
-
-	// Arguments.
-	CBusOptions    CBusOptions
 	RequestContext RequestContext
+	PeekedByte     byte
 }
 
 var _ EncodedReplyContract = (*_EncodedReply)(nil)
 
 // NewEncodedReply factory function for _EncodedReply
-func NewEncodedReply(peekedByte byte, cBusOptions CBusOptions, requestContext RequestContext) *_EncodedReply {
-	return &_EncodedReply{PeekedByte: peekedByte, CBusOptions: cBusOptions, RequestContext: requestContext}
+func NewEncodedReply(requestContext RequestContext, peekedByte byte) *_EncodedReply {
+	return &_EncodedReply{RequestContext: requestContext, PeekedByte: peekedByte}
 }
 
 ///////////////////////////////////////////////////////////
@@ -101,13 +96,13 @@ func NewEncodedReply(peekedByte byte, cBusOptions CBusOptions, requestContext Re
 type EncodedReplyBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
-	WithMandatoryFields(peekedByte byte) EncodedReplyBuilder
+	WithMandatoryFields(requestContext RequestContext, peekedByte byte) EncodedReplyBuilder
+	// WithRequestContext adds RequestContext (property field)
+	WithRequestContext(RequestContext) EncodedReplyBuilder
+	// WithRequestContextBuilder adds RequestContext (property field) which is build by the builder
+	WithRequestContextBuilder(func(RequestContextBuilder) RequestContextBuilder) EncodedReplyBuilder
 	// WithPeekedByte adds PeekedByte (property field)
 	WithPeekedByte(byte) EncodedReplyBuilder
-	// WithArgCBusOptions sets a parser argument
-	WithArgCBusOptions(CBusOptions) EncodedReplyBuilder
-	// WithArgRequestContext sets a parser argument
-	WithArgRequestContext(RequestContext) EncodedReplyBuilder
 	// AsMonitoredSALReply converts this build to a subType of EncodedReply. It is always possible to return to current builder using Done()
 	AsMonitoredSALReply() MonitoredSALReplyBuilder
 	// AsEncodedReplyCALReply converts this build to a subType of EncodedReply. It is always possible to return to current builder using Done()
@@ -143,25 +138,34 @@ type _EncodedReplyBuilder struct {
 
 var _ (EncodedReplyBuilder) = (*_EncodedReplyBuilder)(nil)
 
-func (b *_EncodedReplyBuilder) WithMandatoryFields(peekedByte byte) EncodedReplyBuilder {
-	return b.WithPeekedByte(peekedByte)
+func (b *_EncodedReplyBuilder) WithMandatoryFields(requestContext RequestContext, peekedByte byte) EncodedReplyBuilder {
+	return b.WithRequestContext(requestContext).WithPeekedByte(peekedByte)
 }
 
-func (b *_EncodedReplyBuilder) WithPeekedByte(peekedByte byte) EncodedReplyBuilder {
-	b.PeekedByte = peekedByte
+func (b *_EncodedReplyBuilder) WithRequestContext(requestContext RequestContext) EncodedReplyBuilder {
+	b.RequestContext = requestContext
 	return b
 }
 
-func (b *_EncodedReplyBuilder) WithArgCBusOptions(cBusOptions CBusOptions) EncodedReplyBuilder {
-	b.CBusOptions = cBusOptions
+func (b *_EncodedReplyBuilder) WithRequestContextBuilder(builderSupplier func(RequestContextBuilder) RequestContextBuilder) EncodedReplyBuilder {
+	builder := builderSupplier(b.RequestContext.CreateRequestContextBuilder())
+	var err error
+	b.RequestContext, err = builder.Build()
+	if err != nil {
+		b.collectedErr = append(b.collectedErr, errors.Wrap(err, "RequestContextBuilder failed"))
+	}
 	return b
 }
-func (b *_EncodedReplyBuilder) WithArgRequestContext(requestContext RequestContext) EncodedReplyBuilder {
-	b.RequestContext = requestContext
+
+func (b *_EncodedReplyBuilder) WithPeekedByte(peekedByte byte) EncodedReplyBuilder {
+	b.PeekedByte = peekedByte
 	return b
 }
 
 func (b *_EncodedReplyBuilder) PartialBuild() (EncodedReplyContract, error) {
+	if b.RequestContext == nil {
+		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'requestContext' not set"))
+	}
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
 	}
@@ -244,6 +248,10 @@ func (b *_EncodedReply) CreateEncodedReplyBuilder() EncodedReplyBuilder {
 /////////////////////// Accessors for property fields.
 ///////////////////////
 
+func (m *_EncodedReply) GetRequestContext() RequestContext {
+	return m.RequestContext
+}
+
 func (m *_EncodedReply) GetPeekedByte() byte {
 	return m.PeekedByte
 }
@@ -316,7 +324,7 @@ func EncodedReplyParseWithBufferProducer[T EncodedReply](cBusOptions CBusOptions
 }
 
 func EncodedReplyParseWithBuffer[T EncodedReply](ctx context.Context, readBuffer utils.ReadBuffer, cBusOptions CBusOptions, requestContext RequestContext) (T, error) {
-	v, err := (&_EncodedReply{CBusOptions: cBusOptions, RequestContext: requestContext}).parse(ctx, readBuffer, cBusOptions, requestContext)
+	v, err := (new(_EncodedReply)).parse(ctx, readBuffer, cBusOptions, requestContext)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -337,6 +345,7 @@ func (m *_EncodedReply) parse(ctx context.Context, readBuffer utils.ReadBuffer,
 	}
 	currentPos := positionAware.GetPos()
 	_ = currentPos
+	m.RequestContext = requestContext
 
 	peekedByte, err := ReadPeekField[byte](ctx, "peekedByte", ReadByte(readBuffer, 8), 0)
 	if err != nil {
@@ -401,19 +410,6 @@ func (pm *_EncodedReply) serializeParent(ctx context.Context, writeBuffer utils.
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_EncodedReply) GetCBusOptions() CBusOptions {
-	return m.CBusOptions
-}
-func (m *_EncodedReply) GetRequestContext() RequestContext {
-	return m.RequestContext
-}
-
-//
-////
-
 func (m *_EncodedReply) IsEncodedReply() {}
 
 func (m *_EncodedReply) DeepCopy() any {
@@ -426,9 +422,8 @@ func (m *_EncodedReply) deepCopy() *_EncodedReply {
 	}
 	_EncodedReplyCopy := &_EncodedReply{
 		nil, // will be set by child
+		utils.DeepCopy[RequestContext](m.RequestContext),
 		m.PeekedByte,
-		m.CBusOptions,
-		m.RequestContext,
 	}
 	return _EncodedReplyCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/EncodedReplyCALReply.go b/plc4go/protocols/cbus/readwrite/model/EncodedReplyCALReply.go
index c7f31aff9c5..0ae410357be 100644
--- a/plc4go/protocols/cbus/readwrite/model/EncodedReplyCALReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/EncodedReplyCALReply.go
@@ -59,12 +59,12 @@ var _ EncodedReplyCALReply = (*_EncodedReplyCALReply)(nil)
 var _ EncodedReplyRequirements = (*_EncodedReplyCALReply)(nil)
 
 // NewEncodedReplyCALReply factory function for _EncodedReplyCALReply
-func NewEncodedReplyCALReply(peekedByte byte, calReply CALReply, cBusOptions CBusOptions, requestContext RequestContext) *_EncodedReplyCALReply {
+func NewEncodedReplyCALReply(requestContext RequestContext, peekedByte byte, calReply CALReply) *_EncodedReplyCALReply {
 	if calReply == nil {
 		panic("calReply of type CALReply for EncodedReplyCALReply must not be nil")
 	}
 	_result := &_EncodedReplyCALReply{
-		EncodedReplyContract: NewEncodedReply(peekedByte, cBusOptions, requestContext),
+		EncodedReplyContract: NewEncodedReply(requestContext, peekedByte),
 		CalReply:             calReply,
 	}
 	_result.EncodedReplyContract.(*_EncodedReply)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingData.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingData.go
index f08fb56f962..9bdb4ace4fb 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingData.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingData.go
@@ -286,7 +286,7 @@ func ErrorReportingDataParseWithBufferProducer[T ErrorReportingData]() func(ctx
 }
 
 func ErrorReportingDataParseWithBuffer[T ErrorReportingData](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_ErrorReportingData{}).parse(ctx, readBuffer)
+	v, err := (new(_ErrorReportingData)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategory.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategory.go
index d8921cd25f9..ebfe983ba4f 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategory.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategory.go
@@ -241,7 +241,7 @@ func ErrorReportingSystemCategoryParseWithBufferProducer() func(ctx context.Cont
 }
 
 func ErrorReportingSystemCategoryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ErrorReportingSystemCategory, error) {
-	v, err := (&_ErrorReportingSystemCategory{}).parse(ctx, readBuffer)
+	v, err := (new(_ErrorReportingSystemCategory)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryType.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryType.go
index 2610b43c2a6..176c9f09993 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryType.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryType.go
@@ -297,7 +297,7 @@ func ErrorReportingSystemCategoryTypeParseWithBufferProducer[T ErrorReportingSys
 }
 
 func ErrorReportingSystemCategoryTypeParseWithBuffer[T ErrorReportingSystemCategoryType](ctx context.Context, readBuffer utils.ReadBuffer, errorReportingSystemCategoryClass ErrorReportingSystemCategoryClass) (T, error) {
-	v, err := (&_ErrorReportingSystemCategoryType{}).parse(ctx, readBuffer, errorReportingSystemCategoryClass)
+	v, err := (new(_ErrorReportingSystemCategoryType)).parse(ctx, readBuffer, errorReportingSystemCategoryClass)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACAuxiliaryLevel.go b/plc4go/protocols/cbus/readwrite/model/HVACAuxiliaryLevel.go
index db48468c7b7..33d8832c551 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACAuxiliaryLevel.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACAuxiliaryLevel.go
@@ -260,7 +260,7 @@ func HVACAuxiliaryLevelParseWithBufferProducer() func(ctx context.Context, readB
 }
 
 func HVACAuxiliaryLevelParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (HVACAuxiliaryLevel, error) {
-	v, err := (&_HVACAuxiliaryLevel{}).parse(ctx, readBuffer)
+	v, err := (new(_HVACAuxiliaryLevel)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACHumidity.go b/plc4go/protocols/cbus/readwrite/model/HVACHumidity.go
index 427c6879d3b..34440c7e77f 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACHumidity.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACHumidity.go
@@ -208,7 +208,7 @@ func HVACHumidityParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func HVACHumidityParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (HVACHumidity, error) {
-	v, err := (&_HVACHumidity{}).parse(ctx, readBuffer)
+	v, err := (new(_HVACHumidity)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlags.go b/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlags.go
index 3459df3136c..6f1932513e3 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlags.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlags.go
@@ -351,7 +351,7 @@ func HVACHumidityModeAndFlagsParseWithBufferProducer() func(ctx context.Context,
 }
 
 func HVACHumidityModeAndFlagsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (HVACHumidityModeAndFlags, error) {
-	v, err := (&_HVACHumidityModeAndFlags{}).parse(ctx, readBuffer)
+	v, err := (new(_HVACHumidityModeAndFlags)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACHumidityStatusFlags.go b/plc4go/protocols/cbus/readwrite/model/HVACHumidityStatusFlags.go
index 1ada86a670d..b912cf15c88 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACHumidityStatusFlags.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACHumidityStatusFlags.go
@@ -325,7 +325,7 @@ func HVACHumidityStatusFlagsParseWithBufferProducer() func(ctx context.Context,
 }
 
 func HVACHumidityStatusFlagsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (HVACHumidityStatusFlags, error) {
-	v, err := (&_HVACHumidityStatusFlags{}).parse(ctx, readBuffer)
+	v, err := (new(_HVACHumidityStatusFlags)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlags.go b/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlags.go
index 8af8b2daa07..aff0f776fce 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlags.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlags.go
@@ -351,7 +351,7 @@ func HVACModeAndFlagsParseWithBufferProducer() func(ctx context.Context, readBuf
 }
 
 func HVACModeAndFlagsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (HVACModeAndFlags, error) {
-	v, err := (&_HVACModeAndFlags{}).parse(ctx, readBuffer)
+	v, err := (new(_HVACModeAndFlags)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACRawLevels.go b/plc4go/protocols/cbus/readwrite/model/HVACRawLevels.go
index 68b4761d4bd..1d0842edf5a 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACRawLevels.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACRawLevels.go
@@ -208,7 +208,7 @@ func HVACRawLevelsParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func HVACRawLevelsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (HVACRawLevels, error) {
-	v, err := (&_HVACRawLevels{}).parse(ctx, readBuffer)
+	v, err := (new(_HVACRawLevels)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACStartTime.go b/plc4go/protocols/cbus/readwrite/model/HVACStartTime.go
index a641ac0e7a3..ad66ebf7d1d 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACStartTime.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACStartTime.go
@@ -248,7 +248,7 @@ func HVACStartTimeParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func HVACStartTimeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (HVACStartTime, error) {
-	v, err := (&_HVACStartTime{}).parse(ctx, readBuffer)
+	v, err := (new(_HVACStartTime)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACStatusFlags.go b/plc4go/protocols/cbus/readwrite/model/HVACStatusFlags.go
index 52e27234bdb..812f725d286 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACStatusFlags.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACStatusFlags.go
@@ -325,7 +325,7 @@ func HVACStatusFlagsParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func HVACStatusFlagsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (HVACStatusFlags, error) {
-	v, err := (&_HVACStatusFlags{}).parse(ctx, readBuffer)
+	v, err := (new(_HVACStatusFlags)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACTemperature.go b/plc4go/protocols/cbus/readwrite/model/HVACTemperature.go
index 6326da0e9c2..4e8bbd87f56 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACTemperature.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACTemperature.go
@@ -208,7 +208,7 @@ func HVACTemperatureParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func HVACTemperatureParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (HVACTemperature, error) {
-	v, err := (&_HVACTemperature{}).parse(ctx, readBuffer)
+	v, err := (new(_HVACTemperature)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACZoneList.go b/plc4go/protocols/cbus/readwrite/model/HVACZoneList.go
index 3e0e2774628..a03a8be1627 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACZoneList.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACZoneList.go
@@ -327,7 +327,7 @@ func HVACZoneListParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func HVACZoneListParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (HVACZoneList, error) {
-	v, err := (&_HVACZoneList{}).parse(ctx, readBuffer)
+	v, err := (new(_HVACZoneList)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommand.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommand.go
index 24148c621ed..93b08626c93 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommand.go
@@ -48,8 +48,6 @@ type IdentifyReplyCommand interface {
 
 // IdentifyReplyCommandContract provides a set of functions which can be overwritten by a sub struct
 type IdentifyReplyCommandContract interface {
-	// GetNumBytes() returns a parser argument
-	GetNumBytes() uint8
 	// IsIdentifyReplyCommand is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsIdentifyReplyCommand()
 	// CreateBuilder creates a IdentifyReplyCommandBuilder
@@ -70,16 +68,13 @@ type _IdentifyReplyCommand struct {
 		IdentifyReplyCommandContract
 		IdentifyReplyCommandRequirements
 	}
-
-	// Arguments.
-	NumBytes uint8
 }
 
 var _ IdentifyReplyCommandContract = (*_IdentifyReplyCommand)(nil)
 
 // NewIdentifyReplyCommand factory function for _IdentifyReplyCommand
-func NewIdentifyReplyCommand(numBytes uint8) *_IdentifyReplyCommand {
-	return &_IdentifyReplyCommand{NumBytes: numBytes}
+func NewIdentifyReplyCommand() *_IdentifyReplyCommand {
+	return &_IdentifyReplyCommand{}
 }
 
 ///////////////////////////////////////////////////////////
@@ -92,8 +87,6 @@ type IdentifyReplyCommandBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
 	WithMandatoryFields() IdentifyReplyCommandBuilder
-	// WithArgNumBytes sets a parser argument
-	WithArgNumBytes(uint8) IdentifyReplyCommandBuilder
 	// AsIdentifyReplyCommandManufacturer converts this build to a subType of IdentifyReplyCommand. It is always possible to return to current builder using Done()
 	AsIdentifyReplyCommandManufacturer() IdentifyReplyCommandManufacturerBuilder
 	// AsIdentifyReplyCommandType converts this build to a subType of IdentifyReplyCommand. It is always possible to return to current builder using Done()
@@ -165,11 +158,6 @@ func (b *_IdentifyReplyCommandBuilder) WithMandatoryFields() IdentifyReplyComman
 	return b
 }
 
-func (b *_IdentifyReplyCommandBuilder) WithArgNumBytes(numBytes uint8) IdentifyReplyCommandBuilder {
-	b.NumBytes = numBytes
-	return b
-}
-
 func (b *_IdentifyReplyCommandBuilder) PartialBuild() (IdentifyReplyCommandContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -453,7 +441,7 @@ func IdentifyReplyCommandParseWithBufferProducer[T IdentifyReplyCommand](attribu
 }
 
 func IdentifyReplyCommandParseWithBuffer[T IdentifyReplyCommand](ctx context.Context, readBuffer utils.ReadBuffer, attribute Attribute, numBytes uint8) (T, error) {
-	v, err := (&_IdentifyReplyCommand{NumBytes: numBytes}).parse(ctx, readBuffer, attribute, numBytes)
+	v, err := (new(_IdentifyReplyCommand)).parse(ctx, readBuffer, attribute, numBytes)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -584,16 +572,6 @@ func (pm *_IdentifyReplyCommand) serializeParent(ctx context.Context, writeBuffe
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_IdentifyReplyCommand) GetNumBytes() uint8 {
-	return m.NumBytes
-}
-
-//
-////
-
 func (m *_IdentifyReplyCommand) IsIdentifyReplyCommand() {}
 
 func (m *_IdentifyReplyCommand) DeepCopy() any {
@@ -606,7 +584,6 @@ func (m *_IdentifyReplyCommand) deepCopy() *_IdentifyReplyCommand {
 	}
 	_IdentifyReplyCommandCopy := &_IdentifyReplyCommand{
 		nil, // will be set by child
-		m.NumBytes,
 	}
 	return _IdentifyReplyCommandCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandCurrentSenseLevels.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandCurrentSenseLevels.go
index 4f6d767e12d..2c50c279f5f 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandCurrentSenseLevels.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandCurrentSenseLevels.go
@@ -59,9 +59,9 @@ var _ IdentifyReplyCommandCurrentSenseLevels = (*_IdentifyReplyCommandCurrentSen
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandCurrentSenseLevels)(nil)
 
 // NewIdentifyReplyCommandCurrentSenseLevels factory function for _IdentifyReplyCommandCurrentSenseLevels
-func NewIdentifyReplyCommandCurrentSenseLevels(currentSenseLevels []byte, numBytes uint8) *_IdentifyReplyCommandCurrentSenseLevels {
+func NewIdentifyReplyCommandCurrentSenseLevels(currentSenseLevels []byte) *_IdentifyReplyCommandCurrentSenseLevels {
 	_result := &_IdentifyReplyCommandCurrentSenseLevels{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		CurrentSenseLevels:           currentSenseLevels,
 	}
 	_result.IdentifyReplyCommandContract.(*_IdentifyReplyCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go
index 26bc126c1ff..5a953c46898 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go
@@ -86,9 +86,9 @@ var _ IdentifyReplyCommandDSIStatus = (*_IdentifyReplyCommandDSIStatus)(nil)
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandDSIStatus)(nil)
 
 // NewIdentifyReplyCommandDSIStatus factory function for _IdentifyReplyCommandDSIStatus
-func NewIdentifyReplyCommandDSIStatus(channelStatus1 ChannelStatus, channelStatus2 ChannelStatus, channelStatus3 ChannelStatus, channelStatus4 ChannelStatus, channelStatus5 ChannelStatus, channelStatus6 ChannelStatus, channelStatus7 ChannelStatus, channelStatus8 ChannelStatus, unitStatus UnitStatus, dimmingUCRevisionNumber byte, numBytes uint8) *_IdentifyReplyCommandDSIStatus {
+func NewIdentifyReplyCommandDSIStatus(channelStatus1 ChannelStatus, channelStatus2 ChannelStatus, channelStatus3 ChannelStatus, channelStatus4 ChannelStatus, channelStatus5 ChannelStatus, channelStatus6 ChannelStatus, channelStatus7 ChannelStatus, channelStatus8 ChannelStatus, unitStatus UnitStatus, dimmingUCRevisionNumber byte) *_IdentifyReplyCommandDSIStatus {
 	_result := &_IdentifyReplyCommandDSIStatus{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		ChannelStatus1:               channelStatus1,
 		ChannelStatus2:               channelStatus2,
 		ChannelStatus3:               channelStatus3,
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDelays.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDelays.go
index ddb41c77d98..291c772f66d 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDelays.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDelays.go
@@ -62,9 +62,9 @@ var _ IdentifyReplyCommandDelays = (*_IdentifyReplyCommandDelays)(nil)
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandDelays)(nil)
 
 // NewIdentifyReplyCommandDelays factory function for _IdentifyReplyCommandDelays
-func NewIdentifyReplyCommandDelays(terminalLevels []byte, reStrikeDelay byte, numBytes uint8) *_IdentifyReplyCommandDelays {
+func NewIdentifyReplyCommandDelays(terminalLevels []byte, reStrikeDelay byte) *_IdentifyReplyCommandDelays {
 	_result := &_IdentifyReplyCommandDelays{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		TerminalLevels:               terminalLevels,
 		ReStrikeDelay:                reStrikeDelay,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go
index 12c6f82c623..90209424906 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go
@@ -119,9 +119,9 @@ var _ IdentifyReplyCommandExtendedDiagnosticSummary = (*_IdentifyReplyCommandExt
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandExtendedDiagnosticSummary)(nil)
 
 // NewIdentifyReplyCommandExtendedDiagnosticSummary factory function for _IdentifyReplyCommandExtendedDiagnosticSummary
-func NewIdentifyReplyCommandExtendedDiagnosticSummary(lowApplication ApplicationIdContainer, highApplication ApplicationIdContainer, area byte, crc uint16, serialNumber uint32, networkVoltage byte, unitInLearnMode bool, networkVoltageLow bool, networkVoltageMarginal bool, enableChecksumAlarm bool, outputUnit bool, installationMMIError bool, EEWriteError bool, EEChecksumError bool, EEDataError bool, microReset bool, commsTxError bool, internalStackOverflow bool, microPowerReset bool, numBytes uint8) *_IdentifyReplyCommandExtendedDiagnosticSummary {
+func NewIdentifyReplyCommandExtendedDiagnosticSummary(lowApplication ApplicationIdContainer, highApplication ApplicationIdContainer, area byte, crc uint16, serialNumber uint32, networkVoltage byte, unitInLearnMode bool, networkVoltageLow bool, networkVoltageMarginal bool, enableChecksumAlarm bool, outputUnit bool, installationMMIError bool, EEWriteError bool, EEChecksumError bool, EEDataError bool, microReset bool, commsTxError bool, internalStackOverflow bool, microPowerReset bool) *_IdentifyReplyCommandExtendedDiagnosticSummary {
 	_result := &_IdentifyReplyCommandExtendedDiagnosticSummary{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		LowApplication:               lowApplication,
 		HighApplication:              highApplication,
 		Area:                         area,
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go
index cd1fa2bca75..e36ee5d488c 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go
@@ -59,9 +59,9 @@ var _ IdentifyReplyCommandFirmwareVersion = (*_IdentifyReplyCommandFirmwareVersi
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandFirmwareVersion)(nil)
 
 // NewIdentifyReplyCommandFirmwareVersion factory function for _IdentifyReplyCommandFirmwareVersion
-func NewIdentifyReplyCommandFirmwareVersion(firmwareVersion string, numBytes uint8) *_IdentifyReplyCommandFirmwareVersion {
+func NewIdentifyReplyCommandFirmwareVersion(firmwareVersion string) *_IdentifyReplyCommandFirmwareVersion {
 	_result := &_IdentifyReplyCommandFirmwareVersion{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		FirmwareVersion:              firmwareVersion,
 	}
 	_result.IdentifyReplyCommandContract.(*_IdentifyReplyCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go
index c1fc8854c17..cfca0f9b078 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go
@@ -59,9 +59,9 @@ var _ IdentifyReplyCommandGAVPhysicalAddresses = (*_IdentifyReplyCommandGAVPhysi
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandGAVPhysicalAddresses)(nil)
 
 // NewIdentifyReplyCommandGAVPhysicalAddresses factory function for _IdentifyReplyCommandGAVPhysicalAddresses
-func NewIdentifyReplyCommandGAVPhysicalAddresses(values []byte, numBytes uint8) *_IdentifyReplyCommandGAVPhysicalAddresses {
+func NewIdentifyReplyCommandGAVPhysicalAddresses(values []byte) *_IdentifyReplyCommandGAVPhysicalAddresses {
 	_result := &_IdentifyReplyCommandGAVPhysicalAddresses{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		Values:                       values,
 	}
 	_result.IdentifyReplyCommandContract.(*_IdentifyReplyCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go
index 50e8b4d0172..ef7a937da13 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go
@@ -59,9 +59,9 @@ var _ IdentifyReplyCommandGAVValuesCurrent = (*_IdentifyReplyCommandGAVValuesCur
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandGAVValuesCurrent)(nil)
 
 // NewIdentifyReplyCommandGAVValuesCurrent factory function for _IdentifyReplyCommandGAVValuesCurrent
-func NewIdentifyReplyCommandGAVValuesCurrent(values []byte, numBytes uint8) *_IdentifyReplyCommandGAVValuesCurrent {
+func NewIdentifyReplyCommandGAVValuesCurrent(values []byte) *_IdentifyReplyCommandGAVValuesCurrent {
 	_result := &_IdentifyReplyCommandGAVValuesCurrent{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		Values:                       values,
 	}
 	_result.IdentifyReplyCommandContract.(*_IdentifyReplyCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go
index 00af93b0ffc..bfcb8971290 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go
@@ -59,9 +59,9 @@ var _ IdentifyReplyCommandGAVValuesStored = (*_IdentifyReplyCommandGAVValuesStor
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandGAVValuesStored)(nil)
 
 // NewIdentifyReplyCommandGAVValuesStored factory function for _IdentifyReplyCommandGAVValuesStored
-func NewIdentifyReplyCommandGAVValuesStored(values []byte, numBytes uint8) *_IdentifyReplyCommandGAVValuesStored {
+func NewIdentifyReplyCommandGAVValuesStored(values []byte) *_IdentifyReplyCommandGAVValuesStored {
 	_result := &_IdentifyReplyCommandGAVValuesStored{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		Values:                       values,
 	}
 	_result.IdentifyReplyCommandContract.(*_IdentifyReplyCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandLogicalAssignment.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandLogicalAssignment.go
index b82ba831556..685c8315e2d 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandLogicalAssignment.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandLogicalAssignment.go
@@ -59,9 +59,9 @@ var _ IdentifyReplyCommandLogicalAssignment = (*_IdentifyReplyCommandLogicalAssi
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandLogicalAssignment)(nil)
 
 // NewIdentifyReplyCommandLogicalAssignment factory function for _IdentifyReplyCommandLogicalAssignment
-func NewIdentifyReplyCommandLogicalAssignment(logicAssigment []LogicAssignment, numBytes uint8) *_IdentifyReplyCommandLogicalAssignment {
+func NewIdentifyReplyCommandLogicalAssignment(logicAssigment []LogicAssignment) *_IdentifyReplyCommandLogicalAssignment {
 	_result := &_IdentifyReplyCommandLogicalAssignment{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		LogicAssigment:               logicAssigment,
 	}
 	_result.IdentifyReplyCommandContract.(*_IdentifyReplyCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go
index 5ebb849b7bc..25c2758277b 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go
@@ -59,9 +59,9 @@ var _ IdentifyReplyCommandManufacturer = (*_IdentifyReplyCommandManufacturer)(ni
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandManufacturer)(nil)
 
 // NewIdentifyReplyCommandManufacturer factory function for _IdentifyReplyCommandManufacturer
-func NewIdentifyReplyCommandManufacturer(manufacturerName string, numBytes uint8) *_IdentifyReplyCommandManufacturer {
+func NewIdentifyReplyCommandManufacturer(manufacturerName string) *_IdentifyReplyCommandManufacturer {
 	_result := &_IdentifyReplyCommandManufacturer{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		ManufacturerName:             manufacturerName,
 	}
 	_result.IdentifyReplyCommandContract.(*_IdentifyReplyCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMaximumLevels.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMaximumLevels.go
index 03162136c47..a50019e894c 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMaximumLevels.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMaximumLevels.go
@@ -59,9 +59,9 @@ var _ IdentifyReplyCommandMaximumLevels = (*_IdentifyReplyCommandMaximumLevels)(
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandMaximumLevels)(nil)
 
 // NewIdentifyReplyCommandMaximumLevels factory function for _IdentifyReplyCommandMaximumLevels
-func NewIdentifyReplyCommandMaximumLevels(maximumLevels []byte, numBytes uint8) *_IdentifyReplyCommandMaximumLevels {
+func NewIdentifyReplyCommandMaximumLevels(maximumLevels []byte) *_IdentifyReplyCommandMaximumLevels {
 	_result := &_IdentifyReplyCommandMaximumLevels{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		MaximumLevels:                maximumLevels,
 	}
 	_result.IdentifyReplyCommandContract.(*_IdentifyReplyCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMinimumLevels.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMinimumLevels.go
index 0b3bdb288ee..d02cb899e7c 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMinimumLevels.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMinimumLevels.go
@@ -59,9 +59,9 @@ var _ IdentifyReplyCommandMinimumLevels = (*_IdentifyReplyCommandMinimumLevels)(
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandMinimumLevels)(nil)
 
 // NewIdentifyReplyCommandMinimumLevels factory function for _IdentifyReplyCommandMinimumLevels
-func NewIdentifyReplyCommandMinimumLevels(minimumLevels []byte, numBytes uint8) *_IdentifyReplyCommandMinimumLevels {
+func NewIdentifyReplyCommandMinimumLevels(minimumLevels []byte) *_IdentifyReplyCommandMinimumLevels {
 	_result := &_IdentifyReplyCommandMinimumLevels{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		MinimumLevels:                minimumLevels,
 	}
 	_result.IdentifyReplyCommandContract.(*_IdentifyReplyCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkTerminalLevels.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkTerminalLevels.go
index bdea9aa72db..ca3935499e9 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkTerminalLevels.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkTerminalLevels.go
@@ -59,9 +59,9 @@ var _ IdentifyReplyCommandNetworkTerminalLevels = (*_IdentifyReplyCommandNetwork
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandNetworkTerminalLevels)(nil)
 
 // NewIdentifyReplyCommandNetworkTerminalLevels factory function for _IdentifyReplyCommandNetworkTerminalLevels
-func NewIdentifyReplyCommandNetworkTerminalLevels(networkTerminalLevels []byte, numBytes uint8) *_IdentifyReplyCommandNetworkTerminalLevels {
+func NewIdentifyReplyCommandNetworkTerminalLevels(networkTerminalLevels []byte) *_IdentifyReplyCommandNetworkTerminalLevels {
 	_result := &_IdentifyReplyCommandNetworkTerminalLevels{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		NetworkTerminalLevels:        networkTerminalLevels,
 	}
 	_result.IdentifyReplyCommandContract.(*_IdentifyReplyCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go
index 1d8e1ae89d1..2d3023b39f0 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go
@@ -66,9 +66,9 @@ var _ IdentifyReplyCommandNetworkVoltage = (*_IdentifyReplyCommandNetworkVoltage
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandNetworkVoltage)(nil)
 
 // NewIdentifyReplyCommandNetworkVoltage factory function for _IdentifyReplyCommandNetworkVoltage
-func NewIdentifyReplyCommandNetworkVoltage(volts string, voltsDecimalPlace string, numBytes uint8) *_IdentifyReplyCommandNetworkVoltage {
+func NewIdentifyReplyCommandNetworkVoltage(volts string, voltsDecimalPlace string) *_IdentifyReplyCommandNetworkVoltage {
 	_result := &_IdentifyReplyCommandNetworkVoltage{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		Volts:                        volts,
 		VoltsDecimalPlace:            voltsDecimalPlace,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandOutputUnitSummary.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandOutputUnitSummary.go
index 2a079d0c583..d4c18192a1f 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandOutputUnitSummary.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandOutputUnitSummary.go
@@ -68,12 +68,12 @@ var _ IdentifyReplyCommandOutputUnitSummary = (*_IdentifyReplyCommandOutputUnitS
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandOutputUnitSummary)(nil)
 
 // NewIdentifyReplyCommandOutputUnitSummary factory function for _IdentifyReplyCommandOutputUnitSummary
-func NewIdentifyReplyCommandOutputUnitSummary(unitFlags IdentifyReplyCommandUnitSummary, gavStoreEnabledByte1 *byte, gavStoreEnabledByte2 *byte, timeFromLastRecoverOfMainsInSeconds uint8, numBytes uint8) *_IdentifyReplyCommandOutputUnitSummary {
+func NewIdentifyReplyCommandOutputUnitSummary(unitFlags IdentifyReplyCommandUnitSummary, gavStoreEnabledByte1 *byte, gavStoreEnabledByte2 *byte, timeFromLastRecoverOfMainsInSeconds uint8) *_IdentifyReplyCommandOutputUnitSummary {
 	if unitFlags == nil {
 		panic("unitFlags of type IdentifyReplyCommandUnitSummary for IdentifyReplyCommandOutputUnitSummary must not be nil")
 	}
 	_result := &_IdentifyReplyCommandOutputUnitSummary{
-		IdentifyReplyCommandContract:        NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract:        NewIdentifyReplyCommand(),
 		UnitFlags:                           unitFlags,
 		GavStoreEnabledByte1:                gavStoreEnabledByte1,
 		GavStoreEnabledByte2:                gavStoreEnabledByte2,
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandSummary.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandSummary.go
index 3849e4aeca2..f8b595388a1 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandSummary.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandSummary.go
@@ -65,9 +65,9 @@ var _ IdentifyReplyCommandSummary = (*_IdentifyReplyCommandSummary)(nil)
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandSummary)(nil)
 
 // NewIdentifyReplyCommandSummary factory function for _IdentifyReplyCommandSummary
-func NewIdentifyReplyCommandSummary(partName string, unitServiceType byte, version string, numBytes uint8) *_IdentifyReplyCommandSummary {
+func NewIdentifyReplyCommandSummary(partName string, unitServiceType byte, version string) *_IdentifyReplyCommandSummary {
 	_result := &_IdentifyReplyCommandSummary{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		PartName:                     partName,
 		UnitServiceType:              unitServiceType,
 		Version:                      version,
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandTerminalLevels.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandTerminalLevels.go
index 4a1b3b0aaba..fdef05a84cb 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandTerminalLevels.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandTerminalLevels.go
@@ -59,9 +59,9 @@ var _ IdentifyReplyCommandTerminalLevels = (*_IdentifyReplyCommandTerminalLevels
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandTerminalLevels)(nil)
 
 // NewIdentifyReplyCommandTerminalLevels factory function for _IdentifyReplyCommandTerminalLevels
-func NewIdentifyReplyCommandTerminalLevels(terminalLevels []byte, numBytes uint8) *_IdentifyReplyCommandTerminalLevels {
+func NewIdentifyReplyCommandTerminalLevels(terminalLevels []byte) *_IdentifyReplyCommandTerminalLevels {
 	_result := &_IdentifyReplyCommandTerminalLevels{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		TerminalLevels:               terminalLevels,
 	}
 	_result.IdentifyReplyCommandContract.(*_IdentifyReplyCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandType.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandType.go
index a1b689cec27..213bfe36f23 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandType.go
@@ -59,9 +59,9 @@ var _ IdentifyReplyCommandType = (*_IdentifyReplyCommandType)(nil)
 var _ IdentifyReplyCommandRequirements = (*_IdentifyReplyCommandType)(nil)
 
 // NewIdentifyReplyCommandType factory function for _IdentifyReplyCommandType
-func NewIdentifyReplyCommandType(unitType string, numBytes uint8) *_IdentifyReplyCommandType {
+func NewIdentifyReplyCommandType(unitType string) *_IdentifyReplyCommandType {
 	_result := &_IdentifyReplyCommandType{
-		IdentifyReplyCommandContract: NewIdentifyReplyCommand(numBytes),
+		IdentifyReplyCommandContract: NewIdentifyReplyCommand(),
 		UnitType:                     unitType,
 	}
 	_result.IdentifyReplyCommandContract.(*_IdentifyReplyCommand)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandUnitSummary.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandUnitSummary.go
index 42bf85c229f..13382adc90c 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandUnitSummary.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandUnitSummary.go
@@ -308,7 +308,7 @@ func IdentifyReplyCommandUnitSummaryParseWithBufferProducer() func(ctx context.C
 }
 
 func IdentifyReplyCommandUnitSummaryParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (IdentifyReplyCommandUnitSummary, error) {
-	v, err := (&_IdentifyReplyCommandUnitSummary{}).parse(ctx, readBuffer)
+	v, err := (new(_IdentifyReplyCommandUnitSummary)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1.go b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1.go
index 7342b16fc86..9d3e747c958 100644
--- a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1.go
+++ b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1.go
@@ -283,7 +283,7 @@ func InterfaceOptions1ParseWithBufferProducer() func(ctx context.Context, readBu
 }
 
 func InterfaceOptions1ParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (InterfaceOptions1, error) {
-	v, err := (&_InterfaceOptions1{}).parse(ctx, readBuffer)
+	v, err := (new(_InterfaceOptions1)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1PowerUpSettings.go b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1PowerUpSettings.go
index 7b4a96bc7ad..9bc6cd04b43 100644
--- a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1PowerUpSettings.go
+++ b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1PowerUpSettings.go
@@ -207,7 +207,7 @@ func InterfaceOptions1PowerUpSettingsParseWithBufferProducer() func(ctx context.
 }
 
 func InterfaceOptions1PowerUpSettingsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (InterfaceOptions1PowerUpSettings, error) {
-	v, err := (&_InterfaceOptions1PowerUpSettings{}).parse(ctx, readBuffer)
+	v, err := (new(_InterfaceOptions1PowerUpSettings)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions2.go b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions2.go
index fac3627e65f..8e93d6aa6fc 100644
--- a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions2.go
+++ b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions2.go
@@ -231,7 +231,7 @@ func InterfaceOptions2ParseWithBufferProducer() func(ctx context.Context, readBu
 }
 
 func InterfaceOptions2ParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (InterfaceOptions2, error) {
-	v, err := (&_InterfaceOptions2{}).parse(ctx, readBuffer)
+	v, err := (new(_InterfaceOptions2)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions3.go b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions3.go
index 8d13a7c13f2..979aae07e6e 100644
--- a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions3.go
+++ b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions3.go
@@ -257,7 +257,7 @@ func InterfaceOptions3ParseWithBufferProducer() func(ctx context.Context, readBu
 }
 
 func InterfaceOptions3ParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (InterfaceOptions3, error) {
-	v, err := (&_InterfaceOptions3{}).parse(ctx, readBuffer)
+	v, err := (new(_InterfaceOptions3)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/LevelInformation.go b/plc4go/protocols/cbus/readwrite/model/LevelInformation.go
index 66579a59676..4b4bb91945b 100644
--- a/plc4go/protocols/cbus/readwrite/model/LevelInformation.go
+++ b/plc4go/protocols/cbus/readwrite/model/LevelInformation.go
@@ -386,7 +386,7 @@ func LevelInformationParseWithBufferProducer[T LevelInformation]() func(ctx cont
 }
 
 func LevelInformationParseWithBuffer[T LevelInformation](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_LevelInformation{}).parse(ctx, readBuffer)
+	v, err := (new(_LevelInformation)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingData.go b/plc4go/protocols/cbus/readwrite/model/LightingData.go
index 6533b12de19..c65abab5feb 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingData.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingData.go
@@ -334,7 +334,7 @@ func LightingDataParseWithBufferProducer[T LightingData]() func(ctx context.Cont
 }
 
 func LightingDataParseWithBuffer[T LightingData](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_LightingData{}).parse(ctx, readBuffer)
+	v, err := (new(_LightingData)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingLabelOptions.go b/plc4go/protocols/cbus/readwrite/model/LightingLabelOptions.go
index 28c61cfbeb5..d20b51e95c6 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingLabelOptions.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingLabelOptions.go
@@ -223,7 +223,7 @@ func LightingLabelOptionsParseWithBufferProducer() func(ctx context.Context, rea
 }
 
 func LightingLabelOptionsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (LightingLabelOptions, error) {
-	v, err := (&_LightingLabelOptions{}).parse(ctx, readBuffer)
+	v, err := (new(_LightingLabelOptions)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/LogicAssignment.go b/plc4go/protocols/cbus/readwrite/model/LogicAssignment.go
index e6a07c0da76..f1a383951a8 100644
--- a/plc4go/protocols/cbus/readwrite/model/LogicAssignment.go
+++ b/plc4go/protocols/cbus/readwrite/model/LogicAssignment.go
@@ -283,7 +283,7 @@ func LogicAssignmentParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func LogicAssignmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (LogicAssignment, error) {
-	v, err := (&_LogicAssignment{}).parse(ctx, readBuffer)
+	v, err := (new(_LogicAssignment)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/MeasurementData.go b/plc4go/protocols/cbus/readwrite/model/MeasurementData.go
index 6a79e321354..5052652d246 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeasurementData.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeasurementData.go
@@ -286,7 +286,7 @@ func MeasurementDataParseWithBufferProducer[T MeasurementData]() func(ctx contex
 }
 
 func MeasurementDataParseWithBuffer[T MeasurementData](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_MeasurementData{}).parse(ctx, readBuffer)
+	v, err := (new(_MeasurementData)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlData.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlData.go
index 2456cfc3737..d7ffc868fc0 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlData.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlData.go
@@ -543,7 +543,7 @@ func MediaTransportControlDataParseWithBufferProducer[T MediaTransportControlDat
 }
 
 func MediaTransportControlDataParseWithBuffer[T MediaTransportControlData](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_MediaTransportControlData{}).parse(ctx, readBuffer)
+	v, err := (new(_MediaTransportControlData)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringData.go b/plc4go/protocols/cbus/readwrite/model/MeteringData.go
index 08f0f8ffdd9..d9bc657503b 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringData.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringData.go
@@ -413,7 +413,7 @@ func MeteringDataParseWithBufferProducer[T MeteringData]() func(ctx context.Cont
 }
 
 func MeteringDataParseWithBuffer[T MeteringData](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_MeteringData{}).parse(ctx, readBuffer)
+	v, err := (new(_MeteringData)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/cbus/readwrite/model/MonitoredSAL.go b/plc4go/protocols/cbus/readwrite/model/MonitoredSAL.go
index 7e3c97801f2..391e7626a02 100644
--- a/plc4go/protocols/cbus/readwrite/model/MonitoredSAL.go
+++ b/plc4go/protocols/cbus/readwrite/model/MonitoredSAL.go
@@ -52,8 +52,6 @@ type MonitoredSAL interface {
 type MonitoredSALContract interface {
 	// GetSalType returns SalType (property field)
 	GetSalType() byte
-	// GetCBusOptions() returns a parser argument
-	GetCBusOptions() CBusOptions
 	// IsMonitoredSAL is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsMonitoredSAL()
 	// CreateBuilder creates a MonitoredSALBuilder
@@ -75,16 +73,13 @@ type _MonitoredSAL struct {
 		MonitoredSALRequirements
 	}
 	SalType byte
-
-	// Arguments.
-	CBusOptions CBusOptions
 }
 
 var _ MonitoredSALContract = (*_MonitoredSAL)(nil)
 
 // NewMonitoredSAL factory function for _MonitoredSAL
-func NewMonitoredSAL(salType byte, cBusOptions CBusOptions) *_MonitoredSAL {
-	return &_MonitoredSAL{SalType: salType, CBusOptions: cBusOptions}
+func NewMonitoredSAL(salType byte) *_MonitoredSAL {
+	return &_MonitoredSAL{SalType: salType}
 }
 
 ///////////////////////////////////////////////////////////
@@ -99,8 +94,6 @@ type MonitoredSALBuilder interface {
 	WithMandatoryFields(salType byte) MonitoredSALBuilder
 	// WithSalType adds SalType (property field)
 	WithSalType(byte) MonitoredSALBuilder
-	// WithArgCBusOptions sets a parser argument
-	WithArgCBusOptions(CBusOptions) MonitoredSALBuilder
 	// AsMonitoredSALLongFormSmartMode converts this build to a subType of MonitoredSAL. It is always possible to return to current builder using Done()
 	AsMonitoredSALLongFormSmartMode() MonitoredSALLongFormSmartModeBuilder
 	// AsMonitoredSALShortFormBasicMode converts this build to a subType of MonitoredSAL. It is always possible to return to current builder using Done()
@@ -145,11 +138,6 @@ func (b *_MonitoredSALBuilder) WithSalType(salType byte) MonitoredSALBuilder {
 	return b
 }
 
-func (b *_MonitoredSALBuilder) WithArgCBusOptions(cBusOptions CBusOptions) MonitoredSALBuilder {
-	b.CBusOptions = cBusOptions
-	return b
-}
-
 func (b *_MonitoredSALBuilder) PartialBuild() (MonitoredSALContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -287,7 +275,7 @@ func MonitoredSALParseWithBufferProducer[T MonitoredSAL](cBusOptions CBusOptions
 }
 
 func MonitoredSALParseWithBuffer[T MonitoredSAL](ctx context.Context, readBuffer utils.ReadBuffer, cBusOptions CBusOptions) (T, error) {
-	v, err := (&_MonitoredSAL{CBusOptions: cBusOptions}).parse(ctx, readBuffer, cBusOptions)
+	v, err := (new(_MonitoredSAL)).parse(ctx, readBuffer, cBusOptions)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -360,16 +348,6 @@ func (pm *_MonitoredSAL) serializeParent(ctx context.Context, writeBuffer utils.
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_MonitoredSAL) GetCBusOptions() CBusOptions {
-	return m.CBusOptions
-}
-
-//
-////
-
 func (m *_MonitoredSAL) IsMonitoredSAL() {}
 
 func (m *_MonitoredSAL) DeepCopy() any {
@@ -383,7 +361,6 @@ func (m *_MonitoredSAL) deepCopy() *_MonitoredSAL {
 	_MonitoredSALCopy := &_MonitoredSAL{
 		nil, // will be set by child
 		m.SalType,
-		m.CBusOptions,
 	}
 	return _MonitoredSALCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go b/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go
index 6629d82c5ee..f2b50ed2710 100644
--- a/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go
@@ -81,9 +81,9 @@ var _ MonitoredSALLongFormSmartMode = (*_MonitoredSALLongFormSmartMode)(nil)
 var _ MonitoredSALRequirements = (*_MonitoredSALLongFormSmartMode)(nil)
 
 // NewMonitoredSALLongFormSmartMode factory function for _MonitoredSALLongFormSmartMode
-func NewMonitoredSALLongFormSmartMode(salType byte, terminatingByte uint32, unitAddress UnitAddress, bridgeAddress BridgeAddress, application ApplicationIdContainer, reservedByte *byte, replyNetwork ReplyNetwork, salData SALData, cBusOptions CBusOptions) *_MonitoredSALLongFormSmartMode {
+func NewMonitoredSALLongFormSmartMode(salType byte, terminatingByte uint32, unitAddress UnitAddress, bridgeAddress BridgeAddress, application ApplicationIdContainer, reservedByte *byte, replyNetwork ReplyNetwork, salData SALData) *_MonitoredSALLongFormSmartMode {
 	_result := &_MonitoredSALLongFormSmartMode{
-		MonitoredSALContract: NewMonitoredSAL(salType, cBusOptions),
+		MonitoredSALContract: NewMonitoredSAL(salType),
 		TerminatingByte:      terminatingByte,
 		UnitAddress:          unitAddress,
 		BridgeAddress:        bridgeAddress,
diff --git a/plc4go/protocols/cbus/readwrite/model/MonitoredSALReply.go b/plc4go/protocols/cbus/readwrite/model/MonitoredSALReply.go
index 311f9e154c4..7a9bdc0e20f 100644
--- a/plc4go/protocols/cbus/readwrite/model/MonitoredSALReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/MonitoredSALReply.go
@@ -59,12 +59,12 @@ var _ MonitoredSALReply = (*_MonitoredSALReply)(nil)
 var _ EncodedReplyRequirements = (*_MonitoredSALReply)(nil)
 
 // NewMonitoredSALReply factory function for _MonitoredSALReply
-func NewMonitoredSALReply(peekedByte byte, monitoredSAL MonitoredSAL, cBusOptions CBusOptions, requestContext RequestContext) *_MonitoredSALReply {
+func NewMonitoredSALReply(requestContext RequestContext, peekedByte byte, monitoredSAL MonitoredSAL) *_MonitoredSALReply {
 	if monitoredSAL == nil {
 		panic("monitoredSAL of type MonitoredSAL for MonitoredSALReply must not be nil")
 	}
 	_result := &_MonitoredSALReply{
-		EncodedReplyContract: NewEncodedReply(peekedByte, cBusOptions, requestContext),
+		EncodedReplyContract: NewEncodedReply(requestContext, peekedByte),
 		MonitoredSAL:         monitoredSAL,
 	}
 	_result.EncodedReplyContract.(*_EncodedReply)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go b/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go
index 9cf11d26ab9..e5806b79bc4 100644
--- a/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go
@@ -74,9 +74,9 @@ var _ MonitoredSALShortFormBasicMode = (*_MonitoredSALShortFormBasicMode)(nil)
 var _ MonitoredSALRequirements = (*_MonitoredSALShortFormBasicMode)(nil)
 
 // NewMonitoredSALShortFormBasicMode factory function for _MonitoredSALShortFormBasicMode
-func NewMonitoredSALShortFormBasicMode(salType byte, counts byte, bridgeCount *uint8, networkNumber *uint8, noCounts *byte, application ApplicationIdContainer, salData SALData, cBusOptions CBusOptions) *_MonitoredSALShortFormBasicMode {
+func NewMonitoredSALShortFormBasicMode(salType byte, counts byte, bridgeCount *uint8, networkNumber *uint8, noCounts *byte, application ApplicationIdContainer, salData SALData) *_MonitoredSALShortFormBasicMode {
 	_result := &_MonitoredSALShortFormBasicMode{
-		MonitoredSALContract: NewMonitoredSAL(salType, cBusOptions),
+		MonitoredSALContract: NewMonitoredSAL(salType),
 		Counts:               counts,
 		BridgeCount:          bridgeCount,
 		NetworkNumber:        networkNumber,
diff --git a/plc4go/protocols/cbus/readwrite/model/NetworkProtocolControlInformation.go b/plc4go/protocols/cbus/readwrite/model/NetworkProtocolControlInformation.go
index f406c2468e4..227244e2635 100644
--- a/plc4go/protocols/cbus/readwrite/model/NetworkProtocolControlInformation.go
+++ b/plc4go/protocols/cbus/readwrite/model/NetworkProtocolControlInformation.go
@@ -211,7 +211,7 @@ func NetworkProtocolControlInformationParseWithBufferProducer() func(ctx context
 }
 
 func NetworkProtocolControlInformationParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (NetworkProtocolControlInformation, error) {
-	v, err := (&_NetworkProtocolControlInformation{}).parse(ctx, readBuffer)
+	v, err := (new(_NetworkProtocolControlInformation)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/NetworkRoute.go b/plc4go/protocols/cbus/readwrite/model/NetworkRoute.go
index 171f5293948..6abcf530e0a 100644
--- a/plc4go/protocols/cbus/readwrite/model/NetworkRoute.go
+++ b/plc4go/protocols/cbus/readwrite/model/NetworkRoute.go
@@ -229,7 +229,7 @@ func NetworkRouteParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func NetworkRouteParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (NetworkRoute, error) {
-	v, err := (&_NetworkRoute{}).parse(ctx, readBuffer)
+	v, err := (new(_NetworkRoute)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/PanicStatus.go b/plc4go/protocols/cbus/readwrite/model/PanicStatus.go
index 3ee41594af5..febbe6455c7 100644
--- a/plc4go/protocols/cbus/readwrite/model/PanicStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/PanicStatus.go
@@ -228,7 +228,7 @@ func PanicStatusParseWithBufferProducer() func(ctx context.Context, readBuffer u
 }
 
 func PanicStatusParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (PanicStatus, error) {
-	v, err := (&_PanicStatus{}).parse(ctx, readBuffer)
+	v, err := (new(_PanicStatus)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterChange.go b/plc4go/protocols/cbus/readwrite/model/ParameterChange.go
index 63cf6a0d200..dcd0013135d 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterChange.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterChange.go
@@ -190,7 +190,7 @@ func ParameterChangeParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func ParameterChangeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ParameterChange, error) {
-	v, err := (&_ParameterChange{}).parse(ctx, readBuffer)
+	v, err := (new(_ParameterChange)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterChangeReply.go b/plc4go/protocols/cbus/readwrite/model/ParameterChangeReply.go
index 6949570fbc6..8ab83420b8c 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterChangeReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterChangeReply.go
@@ -59,12 +59,12 @@ var _ ParameterChangeReply = (*_ParameterChangeReply)(nil)
 var _ ReplyRequirements = (*_ParameterChangeReply)(nil)
 
 // NewParameterChangeReply factory function for _ParameterChangeReply
-func NewParameterChangeReply(peekedByte byte, parameterChange ParameterChange, cBusOptions CBusOptions, requestContext RequestContext) *_ParameterChangeReply {
+func NewParameterChangeReply(peekedByte byte, parameterChange ParameterChange) *_ParameterChangeReply {
 	if parameterChange == nil {
 		panic("parameterChange of type ParameterChange for ParameterChangeReply must not be nil")
 	}
 	_result := &_ParameterChangeReply{
-		ReplyContract:   NewReply(peekedByte, cBusOptions, requestContext),
+		ReplyContract:   NewReply(peekedByte),
 		ParameterChange: parameterChange,
 	}
 	_result.ReplyContract.(*_Reply)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValue.go b/plc4go/protocols/cbus/readwrite/model/ParameterValue.go
index ef699e324cd..cb2acac9e5c 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValue.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValue.go
@@ -48,8 +48,6 @@ type ParameterValue interface {
 
 // ParameterValueContract provides a set of functions which can be overwritten by a sub struct
 type ParameterValueContract interface {
-	// GetNumBytes() returns a parser argument
-	GetNumBytes() uint8
 	// IsParameterValue is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsParameterValue()
 	// CreateBuilder creates a ParameterValueBuilder
@@ -70,16 +68,13 @@ type _ParameterValue struct {
 		ParameterValueContract
 		ParameterValueRequirements
 	}
-
-	// Arguments.
-	NumBytes uint8
 }
 
 var _ ParameterValueContract = (*_ParameterValue)(nil)
 
 // NewParameterValue factory function for _ParameterValue
-func NewParameterValue(numBytes uint8) *_ParameterValue {
-	return &_ParameterValue{NumBytes: numBytes}
+func NewParameterValue() *_ParameterValue {
+	return &_ParameterValue{}
 }
 
 ///////////////////////////////////////////////////////////
@@ -92,8 +87,6 @@ type ParameterValueBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
 	WithMandatoryFields() ParameterValueBuilder
-	// WithArgNumBytes sets a parser argument
-	WithArgNumBytes(uint8) ParameterValueBuilder
 	// AsParameterValueApplicationAddress1 converts this build to a subType of ParameterValue. It is always possible to return to current builder using Done()
 	AsParameterValueApplicationAddress1() ParameterValueApplicationAddress1Builder
 	// AsParameterValueApplicationAddress2 converts this build to a subType of ParameterValue. It is always possible to return to current builder using Done()
@@ -151,11 +144,6 @@ func (b *_ParameterValueBuilder) WithMandatoryFields() ParameterValueBuilder {
 	return b
 }
 
-func (b *_ParameterValueBuilder) WithArgNumBytes(numBytes uint8) ParameterValueBuilder {
-	b.NumBytes = numBytes
-	return b
-}
-
 func (b *_ParameterValueBuilder) PartialBuild() (ParameterValueContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -369,7 +357,7 @@ func ParameterValueParseWithBufferProducer[T ParameterValue](parameterType Param
 }
 
 func ParameterValueParseWithBuffer[T ParameterValue](ctx context.Context, readBuffer utils.ReadBuffer, parameterType ParameterType, numBytes uint8) (T, error) {
-	v, err := (&_ParameterValue{NumBytes: numBytes}).parse(ctx, readBuffer, parameterType, numBytes)
+	v, err := (new(_ParameterValue)).parse(ctx, readBuffer, parameterType, numBytes)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -472,16 +460,6 @@ func (pm *_ParameterValue) serializeParent(ctx context.Context, writeBuffer util
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_ParameterValue) GetNumBytes() uint8 {
-	return m.NumBytes
-}
-
-//
-////
-
 func (m *_ParameterValue) IsParameterValue() {}
 
 func (m *_ParameterValue) DeepCopy() any {
@@ -494,7 +472,6 @@ func (m *_ParameterValue) deepCopy() *_ParameterValue {
 	}
 	_ParameterValueCopy := &_ParameterValue{
 		nil, // will be set by child
-		m.NumBytes,
 	}
 	return _ParameterValueCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress1.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress1.go
index 181bacd71a7..7dea42e7e47 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress1.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress1.go
@@ -62,12 +62,12 @@ var _ ParameterValueApplicationAddress1 = (*_ParameterValueApplicationAddress1)(
 var _ ParameterValueRequirements = (*_ParameterValueApplicationAddress1)(nil)
 
 // NewParameterValueApplicationAddress1 factory function for _ParameterValueApplicationAddress1
-func NewParameterValueApplicationAddress1(value ApplicationAddress1, data []byte, numBytes uint8) *_ParameterValueApplicationAddress1 {
+func NewParameterValueApplicationAddress1(value ApplicationAddress1, data []byte) *_ParameterValueApplicationAddress1 {
 	if value == nil {
 		panic("value of type ApplicationAddress1 for ParameterValueApplicationAddress1 must not be nil")
 	}
 	_result := &_ParameterValueApplicationAddress1{
-		ParameterValueContract: NewParameterValue(numBytes),
+		ParameterValueContract: NewParameterValue(),
 		Value:                  value,
 		Data:                   data,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress2.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress2.go
index 355110f3ac2..ec79c5b2b38 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress2.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress2.go
@@ -62,12 +62,12 @@ var _ ParameterValueApplicationAddress2 = (*_ParameterValueApplicationAddress2)(
 var _ ParameterValueRequirements = (*_ParameterValueApplicationAddress2)(nil)
 
 // NewParameterValueApplicationAddress2 factory function for _ParameterValueApplicationAddress2
-func NewParameterValueApplicationAddress2(value ApplicationAddress2, data []byte, numBytes uint8) *_ParameterValueApplicationAddress2 {
+func NewParameterValueApplicationAddress2(value ApplicationAddress2, data []byte) *_ParameterValueApplicationAddress2 {
 	if value == nil {
 		panic("value of type ApplicationAddress2 for ParameterValueApplicationAddress2 must not be nil")
 	}
 	_result := &_ParameterValueApplicationAddress2{
-		ParameterValueContract: NewParameterValue(numBytes),
+		ParameterValueContract: NewParameterValue(),
 		Value:                  value,
 		Data:                   data,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueBaudRateSelector.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueBaudRateSelector.go
index 4f5bd7cc542..6814951a478 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueBaudRateSelector.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueBaudRateSelector.go
@@ -62,9 +62,9 @@ var _ ParameterValueBaudRateSelector = (*_ParameterValueBaudRateSelector)(nil)
 var _ ParameterValueRequirements = (*_ParameterValueBaudRateSelector)(nil)
 
 // NewParameterValueBaudRateSelector factory function for _ParameterValueBaudRateSelector
-func NewParameterValueBaudRateSelector(value BaudRateSelector, data []byte, numBytes uint8) *_ParameterValueBaudRateSelector {
+func NewParameterValueBaudRateSelector(value BaudRateSelector, data []byte) *_ParameterValueBaudRateSelector {
 	_result := &_ParameterValueBaudRateSelector{
-		ParameterValueContract: NewParameterValue(numBytes),
+		ParameterValueContract: NewParameterValue(),
 		Value:                  value,
 		Data:                   data,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomManufacturer.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomManufacturer.go
index cf20e1a95b0..a60ac67657a 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomManufacturer.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomManufacturer.go
@@ -59,12 +59,12 @@ var _ ParameterValueCustomManufacturer = (*_ParameterValueCustomManufacturer)(ni
 var _ ParameterValueRequirements = (*_ParameterValueCustomManufacturer)(nil)
 
 // NewParameterValueCustomManufacturer factory function for _ParameterValueCustomManufacturer
-func NewParameterValueCustomManufacturer(value CustomManufacturer, numBytes uint8) *_ParameterValueCustomManufacturer {
+func NewParameterValueCustomManufacturer(value CustomManufacturer) *_ParameterValueCustomManufacturer {
 	if value == nil {
 		panic("value of type CustomManufacturer for ParameterValueCustomManufacturer must not be nil")
 	}
 	_result := &_ParameterValueCustomManufacturer{
-		ParameterValueContract: NewParameterValue(numBytes),
+		ParameterValueContract: NewParameterValue(),
 		Value:                  value,
 	}
 	_result.ParameterValueContract.(*_ParameterValue)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomTypes.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomTypes.go
index 81b4f210a0a..27015d27c5d 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomTypes.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomTypes.go
@@ -59,12 +59,12 @@ var _ ParameterValueCustomTypes = (*_ParameterValueCustomTypes)(nil)
 var _ ParameterValueRequirements = (*_ParameterValueCustomTypes)(nil)
 
 // NewParameterValueCustomTypes factory function for _ParameterValueCustomTypes
-func NewParameterValueCustomTypes(value CustomTypes, numBytes uint8) *_ParameterValueCustomTypes {
+func NewParameterValueCustomTypes(value CustomTypes) *_ParameterValueCustomTypes {
 	if value == nil {
 		panic("value of type CustomTypes for ParameterValueCustomTypes must not be nil")
 	}
 	_result := &_ParameterValueCustomTypes{
-		ParameterValueContract: NewParameterValue(numBytes),
+		ParameterValueContract: NewParameterValue(),
 		Value:                  value,
 	}
 	_result.ParameterValueContract.(*_ParameterValue)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1.go
index 9aa7996e488..b98ead0ce66 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1.go
@@ -62,12 +62,12 @@ var _ ParameterValueInterfaceOptions1 = (*_ParameterValueInterfaceOptions1)(nil)
 var _ ParameterValueRequirements = (*_ParameterValueInterfaceOptions1)(nil)
 
 // NewParameterValueInterfaceOptions1 factory function for _ParameterValueInterfaceOptions1
-func NewParameterValueInterfaceOptions1(value InterfaceOptions1, data []byte, numBytes uint8) *_ParameterValueInterfaceOptions1 {
+func NewParameterValueInterfaceOptions1(value InterfaceOptions1, data []byte) *_ParameterValueInterfaceOptions1 {
 	if value == nil {
 		panic("value of type InterfaceOptions1 for ParameterValueInterfaceOptions1 must not be nil")
 	}
 	_result := &_ParameterValueInterfaceOptions1{
-		ParameterValueContract: NewParameterValue(numBytes),
+		ParameterValueContract: NewParameterValue(),
 		Value:                  value,
 		Data:                   data,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1PowerUpSettings.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1PowerUpSettings.go
index ff7010f4f30..3f3106eccd1 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1PowerUpSettings.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1PowerUpSettings.go
@@ -59,12 +59,12 @@ var _ ParameterValueInterfaceOptions1PowerUpSettings = (*_ParameterValueInterfac
 var _ ParameterValueRequirements = (*_ParameterValueInterfaceOptions1PowerUpSettings)(nil)
 
 // NewParameterValueInterfaceOptions1PowerUpSettings factory function for _ParameterValueInterfaceOptions1PowerUpSettings
-func NewParameterValueInterfaceOptions1PowerUpSettings(value InterfaceOptions1PowerUpSettings, numBytes uint8) *_ParameterValueInterfaceOptions1PowerUpSettings {
+func NewParameterValueInterfaceOptions1PowerUpSettings(value InterfaceOptions1PowerUpSettings) *_ParameterValueInterfaceOptions1PowerUpSettings {
 	if value == nil {
 		panic("value of type InterfaceOptions1PowerUpSettings for ParameterValueInterfaceOptions1PowerUpSettings must not be nil")
 	}
 	_result := &_ParameterValueInterfaceOptions1PowerUpSettings{
-		ParameterValueContract: NewParameterValue(numBytes),
+		ParameterValueContract: NewParameterValue(),
 		Value:                  value,
 	}
 	_result.ParameterValueContract.(*_ParameterValue)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions2.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions2.go
index a85875cd348..9da6a6ebd87 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions2.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions2.go
@@ -62,12 +62,12 @@ var _ ParameterValueInterfaceOptions2 = (*_ParameterValueInterfaceOptions2)(nil)
 var _ ParameterValueRequirements = (*_ParameterValueInterfaceOptions2)(nil)
 
 // NewParameterValueInterfaceOptions2 factory function for _ParameterValueInterfaceOptions2
-func NewParameterValueInterfaceOptions2(value InterfaceOptions2, data []byte, numBytes uint8) *_ParameterValueInterfaceOptions2 {
+func NewParameterValueInterfaceOptions2(value InterfaceOptions2, data []byte) *_ParameterValueInterfaceOptions2 {
 	if value == nil {
 		panic("value of type InterfaceOptions2 for ParameterValueInterfaceOptions2 must not be nil")
 	}
 	_result := &_ParameterValueInterfaceOptions2{
-		ParameterValueContract: NewParameterValue(numBytes),
+		ParameterValueContract: NewParameterValue(),
 		Value:                  value,
 		Data:                   data,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions3.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions3.go
index a4ebe871deb..0c50d513211 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions3.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions3.go
@@ -62,12 +62,12 @@ var _ ParameterValueInterfaceOptions3 = (*_ParameterValueInterfaceOptions3)(nil)
 var _ ParameterValueRequirements = (*_ParameterValueInterfaceOptions3)(nil)
 
 // NewParameterValueInterfaceOptions3 factory function for _ParameterValueInterfaceOptions3
-func NewParameterValueInterfaceOptions3(value InterfaceOptions3, data []byte, numBytes uint8) *_ParameterValueInterfaceOptions3 {
+func NewParameterValueInterfaceOptions3(value InterfaceOptions3, data []byte) *_ParameterValueInterfaceOptions3 {
 	if value == nil {
 		panic("value of type InterfaceOptions3 for ParameterValueInterfaceOptions3 must not be nil")
 	}
 	_result := &_ParameterValueInterfaceOptions3{
-		ParameterValueContract: NewParameterValue(numBytes),
+		ParameterValueContract: NewParameterValue(),
 		Value:                  value,
 		Data:                   data,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueRaw.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueRaw.go
index 2cda4bff599..665c4f32b24 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueRaw.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueRaw.go
@@ -59,9 +59,9 @@ var _ ParameterValueRaw = (*_ParameterValueRaw)(nil)
 var _ ParameterValueRequirements = (*_ParameterValueRaw)(nil)
 
 // NewParameterValueRaw factory function for _ParameterValueRaw
-func NewParameterValueRaw(data []byte, numBytes uint8) *_ParameterValueRaw {
+func NewParameterValueRaw(data []byte) *_ParameterValueRaw {
 	_result := &_ParameterValueRaw{
-		ParameterValueContract: NewParameterValue(numBytes),
+		ParameterValueContract: NewParameterValue(),
 		Data:                   data,
 	}
 	_result.ParameterValueContract.(*_ParameterValue)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueSerialNumber.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueSerialNumber.go
index bd96be02c0b..d19afc36dfd 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueSerialNumber.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueSerialNumber.go
@@ -62,12 +62,12 @@ var _ ParameterValueSerialNumber = (*_ParameterValueSerialNumber)(nil)
 var _ ParameterValueRequirements = (*_ParameterValueSerialNumber)(nil)
 
 // NewParameterValueSerialNumber factory function for _ParameterValueSerialNumber
-func NewParameterValueSerialNumber(value SerialNumber, data []byte, numBytes uint8) *_ParameterValueSerialNumber {
+func NewParameterValueSerialNumber(value SerialNumber, data []byte) *_ParameterValueSerialNumber {
 	if value == nil {
 		panic("value of type SerialNumber for ParameterValueSerialNumber must not be nil")
 	}
 	_result := &_ParameterValueSerialNumber{
-		ParameterValueContract: NewParameterValue(numBytes),
+		ParameterValueContract: NewParameterValue(),
 		Value:                  value,
 		Data:                   data,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/PowerUp.go b/plc4go/protocols/cbus/readwrite/model/PowerUp.go
index e400bb82010..dcaae3d3c56 100644
--- a/plc4go/protocols/cbus/readwrite/model/PowerUp.go
+++ b/plc4go/protocols/cbus/readwrite/model/PowerUp.go
@@ -190,7 +190,7 @@ func PowerUpParseWithBufferProducer() func(ctx context.Context, readBuffer utils
 }
 
 func PowerUpParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (PowerUp, error) {
-	v, err := (&_PowerUp{}).parse(ctx, readBuffer)
+	v, err := (new(_PowerUp)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/PowerUpReply.go b/plc4go/protocols/cbus/readwrite/model/PowerUpReply.go
index ffd7bfd8f56..e07f8b0dc85 100644
--- a/plc4go/protocols/cbus/readwrite/model/PowerUpReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/PowerUpReply.go
@@ -59,12 +59,12 @@ var _ PowerUpReply = (*_PowerUpReply)(nil)
 var _ ReplyRequirements = (*_PowerUpReply)(nil)
 
 // NewPowerUpReply factory function for _PowerUpReply
-func NewPowerUpReply(peekedByte byte, powerUpIndicator PowerUp, cBusOptions CBusOptions, requestContext RequestContext) *_PowerUpReply {
+func NewPowerUpReply(peekedByte byte, powerUpIndicator PowerUp) *_PowerUpReply {
 	if powerUpIndicator == nil {
 		panic("powerUpIndicator of type PowerUp for PowerUpReply must not be nil")
 	}
 	_result := &_PowerUpReply{
-		ReplyContract:    NewReply(peekedByte, cBusOptions, requestContext),
+		ReplyContract:    NewReply(peekedByte),
 		PowerUpIndicator: powerUpIndicator,
 	}
 	_result.ReplyContract.(*_Reply)._SubType = _result
diff --git a/plc4go/protocols/cbus/readwrite/model/Reply.go b/plc4go/protocols/cbus/readwrite/model/Reply.go
index c9f5141d0d6..f1283f98199 100644
--- a/plc4go/protocols/cbus/readwrite/model/Reply.go
+++ b/plc4go/protocols/cbus/readwrite/model/Reply.go
@@ -52,10 +52,6 @@ type Reply interface {
 type ReplyContract interface {
 	// GetPeekedByte returns PeekedByte (property field)
 	GetPeekedByte() byte
-	// GetCBusOptions() returns a parser argument
-	GetCBusOptions() CBusOptions
-	// GetRequestContext() returns a parser argument
-	GetRequestContext() RequestContext
 	// IsReply is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsReply()
 	// CreateBuilder creates a ReplyBuilder
@@ -77,17 +73,13 @@ type _Reply struct {
 		ReplyRequirements
 	}
 	PeekedByte byte
-
-	// Arguments.
-	CBusOptions    CBusOptions
-	RequestContext RequestContext
 }
 
 var _ ReplyContract = (*_Reply)(nil)
 
 // NewReply factory function for _Reply
-func NewReply(peekedByte byte, cBusOptions CBusOptions, requestContext RequestContext) *_Reply {
-	return &_Reply{PeekedByte: peekedByte, CBusOptions: cBusOptions, RequestContext: requestContext}
+func NewReply(peekedByte byte) *_Reply {
+	return &_Reply{PeekedByte: peekedByte}
 }
 
 ///////////////////////////////////////////////////////////
@@ -102,10 +94,6 @@ type ReplyBuilder interface {
 	WithMandatoryFields(peekedByte byte) ReplyBuilder
 	// WithPeekedByte adds PeekedByte (property field)
 	WithPeekedByte(byte) ReplyBuilder
-	// WithArgCBusOptions sets a parser argument
-	WithArgCBusOptions(CBusOptions) ReplyBuilder
-	// WithArgRequestContext sets a parser argument
-	WithArgRequestContext(RequestContext) ReplyBuilder
 	// AsPowerUpReply converts this build to a subType of Reply. It is always possible to return to current builder using Done()
 	AsPowerUpReply() PowerUpReplyBuilder
 	// AsParameterChangeReply converts this build to a subType of Reply. It is always possible to return to current builder using Done()
@@ -152,15 +140,6 @@ func (b *_ReplyBuilder) WithPeekedByte(peekedByte byte) ReplyBuilder {
 	return b
 }
 
-func (b *_ReplyBuilder) WithArgCBusOptions(cBusOptions CBusOptions) ReplyBuilder {
-	b.CBusOptions = cBusOptions
-	return b
-}
-func (b *_ReplyBuilder) WithArgRequestContext(requestContext RequestContext) ReplyBuilder {
-	b.RequestContext = requestContext
-	return b
-}
-
 func (b *_ReplyBuilder) PartialBuild() (ReplyContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -308,7 +287,7 @@ func ReplyParseWithBufferProducer[T Reply](cBusOptions CBusOptions, requestConte
 }
 
 func ReplyParseWithBuffer[T Reply](ctx context.Context, readBuffer utils.ReadBuffer, cBusOptions CBusOptions, requestContext RequestContext) (T, error) {
-	v, err := (&_Reply{CBusOptions: cBusOptions, RequestContext: requestContext}).parse(ctx, readBuffer, cBusOptions, requestContext)
+	v, err := (new(_Reply)).parse(ctx, readBuffer, cBusOptions, requestContext)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -385,19 +364,6 @@ func (pm *_Reply) serializeParent(ctx context.Context, writeBuffer utils.WriteBu
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_Reply) GetCBusOptions() CBusOptions {
-	return m.CBusOptions
-}
-func (m *_Reply) GetRequestContext() RequestContext {
-	return m.RequestContext
-}
-
-//
-////
-
 func (m *_Reply) IsReply() {}
 
 func (m *_Reply) DeepCopy() any {
@@ -411,8 +377,6 @@ func (m *_Reply) deepCopy() *_Reply {
 	_ReplyCopy := &_Reply{
 		nil, // will be set by child
 		m.PeekedByte,
-		m.CBusOptions,
-		m.RequestContext,
 	}
 	return _ReplyCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/ReplyEncodedReply.go b/plc4go/protocols/cbus/readwrite/model/ReplyEncodedReply.go
index ba2d7e6c481..eb2b29a4ad2 100644
--- a/plc4go/protocols/cbus/readwrite/model/ReplyEncodedReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/ReplyEncodedReply.go
@@ -40,6 +40,8 @@ type ReplyEncodedReply interface {
 	utils.Serializable
 	utils.Copyable
 	Reply
+	// GetCBusOptions returns CBusOptions (property field)
+	GetCBusOptions() CBusOptions
 	// GetEncodedReply returns EncodedReply (property field)
 	GetEncodedReply() EncodedReply
 	// GetChksum returns Chksum (property field)
@@ -57,6 +59,7 @@ type ReplyEncodedReply interface {
 // _ReplyEncodedReply is the data-structure of this message
 type _ReplyEncodedReply struct {
 	ReplyContract
+	CBusOptions  CBusOptions
 	EncodedReply EncodedReply
 	Chksum       Checksum
 }
@@ -65,9 +68,10 @@ var _ ReplyEncodedReply = (*_ReplyEncodedReply)(nil)
 var _ ReplyRequirements = (*_ReplyEncodedReply)(nil)
 
 // NewReplyEncodedReply factory function for _ReplyEncodedReply
-func NewReplyEncodedReply(peekedByte byte, encodedReply EncodedReply, chksum Checksum, cBusOptions CBusOptions, requestContext RequestContext) *_ReplyEncodedReply {
+func NewReplyEncodedReply(peekedByte byte, cBusOptions CBusOptions, encodedReply EncodedReply, chksum Checksum) *_ReplyEncodedReply {
 	_result := &_ReplyEncodedReply{
-		ReplyContract: NewReply(peekedByte, cBusOptions, requestContext),
+		ReplyContract: NewReply(peekedByte),
+		CBusOptions:   cBusOptions,
 		EncodedReply:  encodedReply,
 		Chksum:        chksum,
 	}
@@ -84,7 +88,11 @@ func NewReplyEncodedReply(peekedByte byte, encodedReply EncodedReply, chksum Che
 type ReplyEncodedReplyBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
-	WithMandatoryFields(encodedReply EncodedReply, chksum Checksum) ReplyEncodedReplyBuilder
+	WithMandatoryFields(cBusOptions CBusOptions, encodedReply EncodedReply, chksum Checksum) ReplyEncodedReplyBuilder
+	// WithCBusOptions adds CBusOptions (property field)
+	WithCBusOptions(CBusOptions) ReplyEncodedReplyBuilder
+	// WithCBusOptionsBuilder adds CBusOptions (property field) which is build by the builder
+	WithCBusOptionsBuilder(func(CBusOptionsBuilder) CBusOptionsBuilder) ReplyEncodedReplyBuilder
 	// WithEncodedReply adds EncodedReply (property field)
 	WithEncodedReply(EncodedReply) ReplyEncodedReplyBuilder
 	// WithEncodedReplyBuilder adds EncodedReply (property field) which is build by the builder
@@ -121,8 +129,23 @@ func (b *_ReplyEncodedReplyBuilder) setParent(contract ReplyContract) {
 	contract.(*_Reply)._SubType = b._ReplyEncodedReply
 }
 
-func (b *_ReplyEncodedReplyBuilder) WithMandatoryFields(encodedReply EncodedReply, chksum Checksum) ReplyEncodedReplyBuilder {
-	return b.WithEncodedReply(encodedReply).WithChksum(chksum)
+func (b *_ReplyEncodedReplyBuilder) WithMandatoryFields(cBusOptions CBusOptions, encodedReply EncodedReply, chksum Checksum) ReplyEncodedReplyBuilder {
+	return b.WithCBusOptions(cBusOptions).WithEncodedReply(encodedReply).WithChksum(chksum)
+}
+
+func (b *_ReplyEncodedReplyBuilder) WithCBusOptions(cBusOptions CBusOptions) ReplyEncodedReplyBuilder {
+	b.CBusOptions = cBusOptions
+	return b
+}
+
+func (b *_ReplyEncodedReplyBuilder) WithCBusOptionsBuilder(builderSupplier func(CBusOptionsBuilder) CBusOptionsBuilder) ReplyEncodedReplyBuilder {
+	builder := builderSupplier(b.CBusOptions.CreateCBusOptionsBuilder())
+	var err error
+	b.CBusOptions, err = builder.Build()
+	if err != nil {
+		b.collectedErr = append(b.collectedErr, errors.Wrap(err, "CBusOptionsBuilder failed"))
+	}
+	return b
 }
 
 func (b *_ReplyEncodedReplyBuilder) WithEncodedReply(encodedReply EncodedReply) ReplyEncodedReplyBuilder {
@@ -156,6 +179,9 @@ func (b *_ReplyEncodedReplyBuilder) WithChksumBuilder(builderSupplier func(Check
 }
 
 func (b *_ReplyEncodedReplyBuilder) Build() (ReplyEncodedReply, error) {
+	if b.CBusOptions == nil {
+		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'cBusOptions' not set"))
+	}
 	if b.EncodedReply == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'encodedReply' not set"))
 	}
@@ -227,6 +253,10 @@ func (m *_ReplyEncodedReply) GetParent() ReplyContract {
 /////////////////////// Accessors for property fields.
 ///////////////////////
 
+func (m *_ReplyEncodedReply) GetCBusOptions() CBusOptions {
+	return m.CBusOptions
+}
+
 func (m *_ReplyEncodedReply) GetEncodedReply() EncodedReply {
 	return m.EncodedReply
 }
@@ -306,6 +336,7 @@ func (m *_ReplyEncodedReply) parse(ctx context.Context, readBuffer utils.ReadBuf
 	}
 	currentPos := positionAware.GetPos()
 	_ = currentPos
+	m.CBusOptions = cBusOptions
 
 	encodedReply, err := ReadManualField[EncodedReply](ctx, "encodedReply", readBuffer, EnsureType[EncodedReply](ReadEncodedReply(ctx, readBuffer, cBusOptions, requestContext, cBusOptions.GetSrchk())))
 	if err != nil {
@@ -398,6 +429,7 @@ func (m *_ReplyEncodedReply) deepCopy() *_ReplyEncodedReply {
 	}
 	_ReplyEncodedReplyCopy := &_ReplyEncodedReply{
 		m.ReplyContract.(*_Reply).deepCopy(),
+		utils.DeepCopy[CBusOptions](m.CBusOptions),
 		utils.DeepCopy[EncodedReply](m.EncodedReply),
 		utils.DeepCopy[Checksum](m.Chksum),
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ReplyNetwork.go b/plc4go/protocols/cbus/readwrite/model/ReplyNetwork.go
index 51d0f7b7ab3..e48ea741d6f 100644
--- a/plc4go/protocols/cbus/readwrite/model/ReplyNetwork.go
+++ b/plc4go/protocols/cbus/readwrite/model/ReplyNetwork.go
@@ -242,7 +242,7 @@ func ReplyNetworkParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func ReplyNetworkParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ReplyNetwork, error) {
-	v, err := (&_ReplyNetwork{}).parse(ctx, readBuffer)
+	v, err := (new(_ReplyNetwork)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmation.go b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmation.go
index c5a2fcbe60d..ce33a8590c4 100644
--- a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmation.go
+++ b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmation.go
@@ -54,10 +54,6 @@ type ReplyOrConfirmationContract interface {
 	GetPeekedByte() byte
 	// GetIsAlpha returns IsAlpha (virtual field)
 	GetIsAlpha() bool
-	// GetCBusOptions() returns a parser argument
-	GetCBusOptions() CBusOptions
-	// GetRequestContext() returns a parser argument
-	GetRequestContext() RequestContext
 	// IsReplyOrConfirmation is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsReplyOrConfirmation()
 	// CreateBuilder creates a ReplyOrConfirmationBuilder
@@ -81,17 +77,13 @@ type _ReplyOrConfirmation struct {
 		ReplyOrConfirmationRequirements
 	}
 	PeekedByte byte
-
-	// Arguments.
-	CBusOptions    CBusOptions
-	RequestContext RequestContext
 }
 
 var _ ReplyOrConfirmationContract = (*_ReplyOrConfirmation)(nil)
 
 // NewReplyOrConfirmation factory function for _ReplyOrConfirmation
-func NewReplyOrConfirmation(peekedByte byte, cBusOptions CBusOptions, requestContext RequestContext) *_ReplyOrConfirmation {
-	return &_ReplyOrConfirmation{PeekedByte: peekedByte, CBusOptions: cBusOptions, RequestContext: requestContext}
+func NewReplyOrConfirmation(peekedByte byte) *_ReplyOrConfirmation {
+	return &_ReplyOrConfirmation{PeekedByte: peekedByte}
 }
 
 ///////////////////////////////////////////////////////////
@@ -106,10 +98,6 @@ type ReplyOrConfirmationBuilder interface {
 	WithMandatoryFields(peekedByte byte) ReplyOrConfirmationBuilder
 	// WithPeekedByte adds PeekedByte (property field)
 	WithPeekedByte(byte) ReplyOrConfirmationBuilder
-	// WithArgCBusOptions sets a parser argument
-	WithArgCBusOptions(CBusOptions) ReplyOrConfirmationBuilder
-	// WithArgRequestContext sets a parser argument
-	WithArgRequestContext(RequestContext) ReplyOrConfirmationBuilder
 	// AsServerErrorReply converts this build to a subType of ReplyOrConfirmation. It is always possible to return to current builder using Done()
 	AsServerErrorReply() ServerErrorReplyBuilder
 	// AsReplyOrConfirmationConfirmation converts this build to a subType of ReplyOrConfirmation. It is always possible to return to current builder using Done()
@@ -156,15 +144,6 @@ func (b *_ReplyOrConfirmationBuilder) WithPeekedByte(peekedByte byte) ReplyOrCon
 	return b
 }
 
-func (b *_ReplyOrConfirmationBuilder) WithArgCBusOptions(cBusOptions CBusOptions) ReplyOrConfirmationBuilder {
-	b.CBusOptions = cBusOptions
-	return b
-}
-func (b *_ReplyOrConfirmationBuilder) WithArgRequestContext(requestContext RequestContext) ReplyOrConfirmationBuilder {
-	b.RequestContext = requestContext
-	return b
-}
-
 func (b *_ReplyOrConfirmationBuilder) PartialBuild() (ReplyOrConfirmationContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -330,7 +309,7 @@ func ReplyOrConfirmationParseWithBufferProducer[T ReplyOrConfirmation](cBusOptio
 }
 
 func ReplyOrConfirmationParseWithBuffer[T ReplyOrConfirmation](ctx context.Context, readBuffer utils.ReadBuffer, cBusOptions CBusOptions, requestContext RequestContext) (T, error) {
-	v, err := (&_ReplyOrConfirmation{CBusOptions: cBusOptions, RequestContext: requestContext}).parse(ctx, readBuffer, cBusOptions, requestContext)
+	v, err := (new(_ReplyOrConfirmation)).parse(ctx, readBuffer, cBusOptions, requestContext)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -419,19 +398,6 @@ func (pm *_ReplyOrConfirmation) serializeParent(ctx context.Context, writeBuffer
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_ReplyOrConfirmation) GetCBusOptions() CBusOptions {
-	return m.CBusOptions
-}
-func (m *_ReplyOrConfirmation) GetRequestContext() RequestContext {
-	return m.RequestContext
-}
-
-//
-////
-
 func (m *_ReplyOrConfirmation) IsReplyOrConfirmation() {}
 
 func (m *_ReplyOrConfirmation) DeepCopy() any {
@@ -445,8 +411,6 @@ func (m *_ReplyOrConfirmation) deepCopy() *_ReplyOrConfirmation {
 	_ReplyOrConfirmationCopy := &_ReplyOrConfirmation{
 		nil, // will be set by child
 		m.PeekedByte,
-		m.CBusOptions,
-		m.RequestContext,
 	}
 	return _ReplyOrConfirmationCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationConfirmation.go b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationConfirmation.go
index cbda659aaf5..b85e99b02f8 100644
--- a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationConfirmation.go
+++ b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationConfirmation.go
@@ -62,12 +62,12 @@ var _ ReplyOrConfirmationConfirmation = (*_ReplyOrConfirmationConfirmation)(nil)
 var _ ReplyOrConfirmationRequirements = (*_ReplyOrConfirmationConfirmation)(nil)
 
 // NewReplyOrConfirmationConfirmation factory function for _ReplyOrConfirmationConfirmation
-func NewReplyOrConfirmationConfirmation(peekedByte byte, confirmation Confirmation, embeddedReply ReplyOrConfirmation, cBusOptions CBusOptions, requestContext RequestContext) *_ReplyOrConfirmationConfirmation {
+func NewReplyOrConfirmationConfirmation(peekedByte byte, confirmation Confirmation, embeddedReply ReplyOrConfirmation) *_ReplyOrConfirmationConfirmation {
 	if confirmation == nil {
 		panic("confirmation of type Confirmation for ReplyOrConfirmationConfirmation must not be nil")
 	}
 	_result := &_ReplyOrConfirmationConfirmation{
-		ReplyOrConfirmationContract: NewReplyOrConfirmation(peekedByte, cBusOptions, requestContext),
+		ReplyOrConfirmationContract: NewReplyOrConfirmation(peekedByte),
 		Confirmation:                confirmation,
 		EmbeddedReply:               embeddedReply,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationReply.go b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationReply.go
index a3f3cd13d7a..b7be9ec5aae 100644
--- a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationReply.go
@@ -62,7 +62,7 @@ var _ ReplyOrConfirmationReply = (*_ReplyOrConfirmationReply)(nil)
 var _ ReplyOrConfirmationRequirements = (*_ReplyOrConfirmationReply)(nil)
 
 // NewReplyOrConfirmationReply factory function for _ReplyOrConfirmationReply
-func NewReplyOrConfirmationReply(peekedByte byte, reply Reply, termination ResponseTermination, cBusOptions CBusOptions, requestContext RequestContext) *_ReplyOrConfirmationReply {
+func NewReplyOrConfirmationReply(peekedByte byte, reply Reply, termination ResponseTermination) *_ReplyOrConfirmationReply {
 	if reply == nil {
 		panic("reply of type Reply for ReplyOrConfirmationReply must not be nil")
 	}
@@ -70,7 +70,7 @@ func NewReplyOrConfirmationReply(peekedByte byte, reply Reply, termination Respo
 		panic("termination of type ResponseTermination for ReplyOrConfirmationReply must not be nil")
 	}
 	_result := &_ReplyOrConfirmationReply{
-		ReplyOrConfirmationContract: NewReplyOrConfirmation(peekedByte, cBusOptions, requestContext),
+		ReplyOrConfirmationContract: NewReplyOrConfirmation(peekedByte),
 		Reply:                       reply,
 		Termination:                 termination,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/Request.go b/plc4go/protocols/cbus/readwrite/model/Request.go
index caaf878b847..e0ddd77ef10 100644
--- a/plc4go/protocols/cbus/readwrite/model/Request.go
+++ b/plc4go/protocols/cbus/readwrite/model/Request.go
@@ -62,8 +62,6 @@ type RequestContract interface {
 	GetTermination() RequestTermination
 	// GetActualPeek returns ActualPeek (virtual field)
 	GetActualPeek() RequestType
-	// GetCBusOptions() returns a parser argument
-	GetCBusOptions() CBusOptions
 	// IsRequest is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsRequest()
 	// CreateBuilder creates a RequestBuilder
@@ -89,19 +87,16 @@ type _Request struct {
 	ResetMode   *RequestType
 	SecondPeek  RequestType
 	Termination RequestTermination
-
-	// Arguments.
-	CBusOptions CBusOptions
 }
 
 var _ RequestContract = (*_Request)(nil)
 
 // NewRequest factory function for _Request
-func NewRequest(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination, cBusOptions CBusOptions) *_Request {
+func NewRequest(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination) *_Request {
 	if termination == nil {
 		panic("termination of type RequestTermination for Request must not be nil")
 	}
-	return &_Request{PeekedByte: peekedByte, StartingCR: startingCR, ResetMode: resetMode, SecondPeek: secondPeek, Termination: termination, CBusOptions: cBusOptions}
+	return &_Request{PeekedByte: peekedByte, StartingCR: startingCR, ResetMode: resetMode, SecondPeek: secondPeek, Termination: termination}
 }
 
 ///////////////////////////////////////////////////////////
@@ -126,8 +121,6 @@ type RequestBuilder interface {
 	WithTermination(RequestTermination) RequestBuilder
 	// WithTerminationBuilder adds Termination (property field) which is build by the builder
 	WithTerminationBuilder(func(RequestTerminationBuilder) RequestTerminationBuilder) RequestBuilder
-	// WithArgCBusOptions sets a parser argument
-	WithArgCBusOptions(CBusOptions) RequestBuilder
 	// AsRequestSmartConnectShortcut converts this build to a subType of Request. It is always possible to return to current builder using Done()
 	AsRequestSmartConnectShortcut() RequestSmartConnectShortcutBuilder
 	// AsRequestReset converts this build to a subType of Request. It is always possible to return to current builder using Done()
@@ -212,11 +205,6 @@ func (b *_RequestBuilder) WithTerminationBuilder(builderSupplier func(RequestTer
 	return b
 }
 
-func (b *_RequestBuilder) WithArgCBusOptions(cBusOptions CBusOptions) RequestBuilder {
-	b.CBusOptions = cBusOptions
-	return b
-}
-
 func (b *_RequestBuilder) PartialBuild() (RequestContract, error) {
 	if b.Termination == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'termination' not set"))
@@ -458,7 +446,7 @@ func RequestParseWithBufferProducer[T Request](cBusOptions CBusOptions) func(ctx
 }
 
 func RequestParseWithBuffer[T Request](ctx context.Context, readBuffer utils.ReadBuffer, cBusOptions CBusOptions) (T, error) {
-	v, err := (&_Request{CBusOptions: cBusOptions}).parse(ctx, readBuffer, cBusOptions)
+	v, err := (new(_Request)).parse(ctx, readBuffer, cBusOptions)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -601,16 +589,6 @@ func (pm *_Request) serializeParent(ctx context.Context, writeBuffer utils.Write
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_Request) GetCBusOptions() CBusOptions {
-	return m.CBusOptions
-}
-
-//
-////
-
 func (m *_Request) IsRequest() {}
 
 func (m *_Request) DeepCopy() any {
@@ -628,7 +606,6 @@ func (m *_Request) deepCopy() *_Request {
 		utils.CopyPtr[RequestType](m.ResetMode),
 		m.SecondPeek,
 		utils.DeepCopy[RequestTermination](m.Termination),
-		m.CBusOptions,
 	}
 	return _RequestCopy
 }
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestCommand.go b/plc4go/protocols/cbus/readwrite/model/RequestCommand.go
index d6005cc9107..08291b3d569 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestCommand.go
@@ -44,6 +44,8 @@ type RequestCommand interface {
 	utils.Serializable
 	utils.Copyable
 	Request
+	// GetCBusOptions returns CBusOptions (property field)
+	GetCBusOptions() CBusOptions
 	// GetCbusCommand returns CbusCommand (property field)
 	GetCbusCommand() CBusCommand
 	// GetChksum returns Chksum (property field)
@@ -63,6 +65,7 @@ type RequestCommand interface {
 // _RequestCommand is the data-structure of this message
 type _RequestCommand struct {
 	RequestContract
+	CBusOptions CBusOptions
 	CbusCommand CBusCommand
 	Chksum      Checksum
 	Alpha       Alpha
@@ -72,9 +75,10 @@ var _ RequestCommand = (*_RequestCommand)(nil)
 var _ RequestRequirements = (*_RequestCommand)(nil)
 
 // NewRequestCommand factory function for _RequestCommand
-func NewRequestCommand(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination, cbusCommand CBusCommand, chksum Checksum, alpha Alpha, cBusOptions CBusOptions) *_RequestCommand {
+func NewRequestCommand(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination, cBusOptions CBusOptions, cbusCommand CBusCommand, chksum Checksum, alpha Alpha) *_RequestCommand {
 	_result := &_RequestCommand{
-		RequestContract: NewRequest(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions),
+		RequestContract: NewRequest(peekedByte, startingCR, resetMode, secondPeek, termination),
+		CBusOptions:     cBusOptions,
 		CbusCommand:     cbusCommand,
 		Chksum:          chksum,
 		Alpha:           alpha,
@@ -92,7 +96,11 @@ func NewRequestCommand(peekedByte RequestType, startingCR *RequestType, resetMod
 type RequestCommandBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
-	WithMandatoryFields(cbusCommand CBusCommand, chksum Checksum) RequestCommandBuilder
+	WithMandatoryFields(cBusOptions CBusOptions, cbusCommand CBusCommand, chksum Checksum) RequestCommandBuilder
+	// WithCBusOptions adds CBusOptions (property field)
+	WithCBusOptions(CBusOptions) RequestCommandBuilder
+	// WithCBusOptionsBuilder adds CBusOptions (property field) which is build by the builder
+	WithCBusOptionsBuilder(func(CBusOptionsBuilder) CBusOptionsBuilder) RequestCommandBuilder
 	// WithCbusCommand adds CbusCommand (property field)
 	WithCbusCommand(CBusCommand) RequestCommandBuilder
 	// WithCbusCommandBuilder adds CbusCommand (property field) which is build by the builder
@@ -133,8 +141,23 @@ func (b *_RequestCommandBuilder) setParent(contract RequestContract) {
 	contract.(*_Request)._SubType = b._RequestCommand
 }
 
-func (b *_RequestCommandBuilder) WithMandatoryFields(cbusCommand CBusCommand, chksum Checksum) RequestCommandBuilder {
-	return b.WithCbusCommand(cbusCommand).WithChksum(chksum)
+func (b *_RequestCommandBuilder) WithMandatoryFields(cBusOptions CBusOptions, cbusCommand CBusCommand, chksum Checksum) RequestCommandBuilder {
+	return b.WithCBusOptions(cBusOptions).WithCbusCommand(cbusCommand).WithChksum(chksum)
+}
+
+func (b *_RequestCommandBuilder) WithCBusOptions(cBusOptions CBusOptions) RequestCommandBuilder {
+	b.CBusOptions = cBusOptions
+	return b
+}
+
+func (b *_RequestCommandBuilder) WithCBusOptionsBuilder(builderSupplier func(CBusOptionsBuilder) CBusOptionsBuilder) RequestCommandBuilder {
+	builder := builderSupplier(b.CBusOptions.CreateCBusOptionsBuilder())
+	var err error
+	b.CBusOptions, err = builder.Build()
+	if err != nil {
+		b.collectedErr = append(b.collectedErr, errors.Wrap(err, "CBusOptionsBuilder failed"))
+	}
+	return b
 }
 
 func (b *_RequestCommandBuilder) WithCbusCommand(cbusCommand CBusCommand) RequestCommandBuilder {
@@ -183,6 +206,9 @@ func (b *_RequestCommandBuilder) WithOptionalAlphaBuilder(builderSupplier func(A
 }
 
 func (b *_RequestCommandBuilder) Build() (RequestCommand, error) {
+	if b.CBusOptions == nil {
+		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'cBusOptions' not set"))
+	}
 	if b.CbusCommand == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'cbusCommand' not set"))
 	}
@@ -254,6 +280,10 @@ func (m *_RequestCommand) GetParent() RequestContract {
 /////////////////////// Accessors for property fields.
 ///////////////////////
 
+func (m *_RequestCommand) GetCBusOptions() CBusOptions {
+	return m.CBusOptions
+}
+
 func (m *_RequestCommand) GetCbusCommand() CBusCommand {
 	return m.CbusCommand
 }
@@ -362,6 +392,7 @@ func (m *_RequestCommand) parse(ctx context.Context, readBuffer utils.ReadBuffer
 	}
 	currentPos := positionAware.GetPos()
 	_ = currentPos
+	m.CBusOptions = cBusOptions
 
 	initiator, err := ReadConstField[byte](ctx, "initiator", ReadByte(readBuffer, 8), RequestCommand_INITIATOR)
 	if err != nil {
@@ -478,6 +509,7 @@ func (m *_RequestCommand) deepCopy() *_RequestCommand {
 	}
 	_RequestCommandCopy := &_RequestCommand{
 		m.RequestContract.(*_Request).deepCopy(),
+		utils.DeepCopy[CBusOptions](m.CBusOptions),
 		utils.DeepCopy[CBusCommand](m.CbusCommand),
 		utils.DeepCopy[Checksum](m.Chksum),
 		utils.DeepCopy[Alpha](m.Alpha),
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestContext.go b/plc4go/protocols/cbus/readwrite/model/RequestContext.go
index 7b9721a914a..cb2fea0a8c2 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestContext.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestContext.go
@@ -189,7 +189,7 @@ func RequestContextParseWithBufferProducer() func(ctx context.Context, readBuffe
 }
 
 func RequestContextParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (RequestContext, error) {
-	v, err := (&_RequestContext{}).parse(ctx, readBuffer)
+	v, err := (new(_RequestContext)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestDirectCommandAccess.go b/plc4go/protocols/cbus/readwrite/model/RequestDirectCommandAccess.go
index d6852d30c81..ecc792b8067 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestDirectCommandAccess.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestDirectCommandAccess.go
@@ -67,9 +67,9 @@ var _ RequestDirectCommandAccess = (*_RequestDirectCommandAccess)(nil)
 var _ RequestRequirements = (*_RequestDirectCommandAccess)(nil)
 
 // NewRequestDirectCommandAccess factory function for _RequestDirectCommandAccess
-func NewRequestDirectCommandAccess(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination, calData CALData, alpha Alpha, cBusOptions CBusOptions) *_RequestDirectCommandAccess {
+func NewRequestDirectCommandAccess(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination, calData CALData, alpha Alpha) *_RequestDirectCommandAccess {
 	_result := &_RequestDirectCommandAccess{
-		RequestContract: NewRequest(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions),
+		RequestContract: NewRequest(peekedByte, startingCR, resetMode, secondPeek, termination),
 		CalData:         calData,
 		Alpha:           alpha,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestEmpty.go b/plc4go/protocols/cbus/readwrite/model/RequestEmpty.go
index 1e9fcda31a0..7063a1f7f77 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestEmpty.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestEmpty.go
@@ -54,9 +54,9 @@ var _ RequestEmpty = (*_RequestEmpty)(nil)
 var _ RequestRequirements = (*_RequestEmpty)(nil)
 
 // NewRequestEmpty factory function for _RequestEmpty
-func NewRequestEmpty(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination, cBusOptions CBusOptions) *_RequestEmpty {
+func NewRequestEmpty(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination) *_RequestEmpty {
 	_result := &_RequestEmpty{
-		RequestContract: NewRequest(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions),
+		RequestContract: NewRequest(peekedByte, startingCR, resetMode, secondPeek, termination),
 	}
 	_result.RequestContract.(*_Request)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestNull.go b/plc4go/protocols/cbus/readwrite/model/RequestNull.go
index cc4e72a5776..b4eb0b94386 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestNull.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestNull.go
@@ -59,9 +59,9 @@ var _ RequestNull = (*_RequestNull)(nil)
 var _ RequestRequirements = (*_RequestNull)(nil)
 
 // NewRequestNull factory function for _RequestNull
-func NewRequestNull(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination, cBusOptions CBusOptions) *_RequestNull {
+func NewRequestNull(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination) *_RequestNull {
 	_result := &_RequestNull{
-		RequestContract: NewRequest(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions),
+		RequestContract: NewRequest(peekedByte, startingCR, resetMode, secondPeek, termination),
 	}
 	_result.RequestContract.(*_Request)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestObsolete.go b/plc4go/protocols/cbus/readwrite/model/RequestObsolete.go
index 32eb4466aaf..802267232e9 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestObsolete.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestObsolete.go
@@ -64,9 +64,9 @@ var _ RequestObsolete = (*_RequestObsolete)(nil)
 var _ RequestRequirements = (*_RequestObsolete)(nil)
 
 // NewRequestObsolete factory function for _RequestObsolete
-func NewRequestObsolete(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination, calData CALData, alpha Alpha, cBusOptions CBusOptions) *_RequestObsolete {
+func NewRequestObsolete(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination, calData CALData, alpha Alpha) *_RequestObsolete {
 	_result := &_RequestObsolete{
-		RequestContract: NewRequest(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions),
+		RequestContract: NewRequest(peekedByte, startingCR, resetMode, secondPeek, termination),
 		CalData:         calData,
 		Alpha:           alpha,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestReset.go b/plc4go/protocols/cbus/readwrite/model/RequestReset.go
index f97a37855db..80177babb49 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestReset.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestReset.go
@@ -68,9 +68,9 @@ var _ RequestReset = (*_RequestReset)(nil)
 var _ RequestRequirements = (*_RequestReset)(nil)
 
 // NewRequestReset factory function for _RequestReset
-func NewRequestReset(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination, tildePeek RequestType, secondTilde *RequestType, tildePeek2 RequestType, thirdTilde *RequestType, cBusOptions CBusOptions) *_RequestReset {
+func NewRequestReset(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination, tildePeek RequestType, secondTilde *RequestType, tildePeek2 RequestType, thirdTilde *RequestType) *_RequestReset {
 	_result := &_RequestReset{
-		RequestContract: NewRequest(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions),
+		RequestContract: NewRequest(peekedByte, startingCR, resetMode, secondPeek, termination),
 		TildePeek:       tildePeek,
 		SecondTilde:     secondTilde,
 		TildePeek2:      tildePeek2,
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestSmartConnectShortcut.go b/plc4go/protocols/cbus/readwrite/model/RequestSmartConnectShortcut.go
index 76add5901d3..ddbe3431767 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestSmartConnectShortcut.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestSmartConnectShortcut.go
@@ -65,9 +65,9 @@ var _ RequestSmartConnectShortcut = (*_RequestSmartConnectShortcut)(nil)
 var _ RequestRequirements = (*_RequestSmartConnectShortcut)(nil)
 
 // NewRequestSmartConnectShortcut factory function for _RequestSmartConnectShortcut
-func NewRequestSmartConnectShortcut(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination, pipePeek RequestType, secondPipe *byte, cBusOptions CBusOptions) *_RequestSmartConnectShortcut {
+func NewRequestSmartConnectShortcut(peekedByte RequestType, startingCR *RequestType, resetMode *RequestType, secondPeek RequestType, termination RequestTermination, pipePeek RequestType, secondPipe *byte) *_RequestSmartConnectShortcut {
 	_result := &_RequestSmartConnectShortcut{
-		RequestContract: NewRequest(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions),
+		RequestContract: NewRequest(peekedByte, startingCR, resetMode, secondPeek, termination),
 		PipePeek:        pipePeek,
 		SecondPipe:      secondPipe,
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestTermination.go b/plc4go/protocols/cbus/readwrite/model/RequestTermination.go
index 6d7a17642d5..b7fc7c0b9de 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestTermination.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestTermination.go
@@ -182,7 +182,7 @@ func RequestTerminationParseWithBufferProducer() func(ctx context.Context, readB
 }
 
 func RequestTerminationParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (RequestTermination, error) {
-	v, err := (&_RequestTermination{}).parse(ctx, readBuffer)
+	v, err := (new(_RequestTermination)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ResponseTermination.go b/plc4go/protocols/cbus/readwrite/model/ResponseTermination.go
index 5944b7180d9..cb183fcc7bc 100644
--- a/plc4go/protocols/cbus/readwrite/model/ResponseTermination.go
+++ b/plc4go/protocols/cbus/readwrite/model/ResponseTermination.go
@@ -190,7 +190,7 @@ func ResponseTerminationParseWithBufferProducer() func(ctx context.Context, read
 }
 
 func ResponseTerminationParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ResponseTermination, error) {
-	v, err := (&_ResponseTermination{}).parse(ctx, readBuffer)
+	v, err := (new(_ResponseTermination)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/SALData.go b/plc4go/protocols/cbus/readwrite/model/SALData.go
index f7cf6618915..b70ef33084f 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALData.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALData.go
@@ -544,7 +544,7 @@ func SALDataParseWithBufferProducer[T SALData](applicationId ApplicationId) func
 }
 
 func SALDataParseWithBuffer[T SALData](ctx context.Context, readBuffer utils.ReadBuffer, applicationId ApplicationId) (T, error) {
-	v, err := (&_SALData{}).parse(ctx, readBuffer, applicationId)
+	v, err := (new(_SALData)).parse(ctx, readBuffer, applicationId)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityArmCode.go b/plc4go/protocols/cbus/readwrite/model/SecurityArmCode.go
index a8f9e5bf260..7d91ec9bbd7 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityArmCode.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityArmCode.go
@@ -248,7 +248,7 @@ func SecurityArmCodeParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func SecurityArmCodeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (SecurityArmCode, error) {
-	v, err := (&_SecurityArmCode{}).parse(ctx, readBuffer)
+	v, err := (new(_SecurityArmCode)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityData.go b/plc4go/protocols/cbus/readwrite/model/SecurityData.go
index 598c59af5b7..77fa5533c70 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityData.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityData.go
@@ -869,7 +869,7 @@ func SecurityDataParseWithBufferProducer[T SecurityData]() func(ctx context.Cont
 }
 
 func SecurityDataParseWithBuffer[T SecurityData](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_SecurityData{}).parse(ctx, readBuffer)
+	v, err := (new(_SecurityData)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/cbus/readwrite/model/SerialInterfaceAddress.go b/plc4go/protocols/cbus/readwrite/model/SerialInterfaceAddress.go
index b0b75d51f23..0b08105f711 100644
--- a/plc4go/protocols/cbus/readwrite/model/SerialInterfaceAddress.go
+++ b/plc4go/protocols/cbus/readwrite/model/SerialInterfaceAddress.go
@@ -189,7 +189,7 @@ func SerialInterfaceAddressParseWithBufferProducer() func(ctx context.Context, r
 }
 
 func SerialInterfaceAddressParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (SerialInterfaceAddress, error) {
-	v, err := (&_SerialInterfaceAddress{}).parse(ctx, readBuffer)
+	v, err := (new(_SerialInterfaceAddress)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/SerialNumber.go b/plc4go/protocols/cbus/readwrite/model/SerialNumber.go
index 3d34e4409ec..41c3cc84604 100644
--- a/plc4go/protocols/cbus/readwrite/model/SerialNumber.go
+++ b/plc4go/protocols/cbus/readwrite/model/SerialNumber.go
@@ -240,7 +240,7 @@ func SerialNumberParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func SerialNumberParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (SerialNumber, error) {
-	v, err := (&_SerialNumber{}).parse(ctx, readBuffer)
+	v, err := (new(_SerialNumber)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ServerErrorReply.go b/plc4go/protocols/cbus/readwrite/model/ServerErrorReply.go
index f17b28dbb86..4dd288e9fc8 100644
--- a/plc4go/protocols/cbus/readwrite/model/ServerErrorReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/ServerErrorReply.go
@@ -59,9 +59,9 @@ var _ ServerErrorReply = (*_ServerErrorReply)(nil)
 var _ ReplyOrConfirmationRequirements = (*_ServerErrorReply)(nil)
 
 // NewServerErrorReply factory function for _ServerErrorReply
-func NewServerErrorReply(peekedByte byte, cBusOptions CBusOptions, requestContext RequestContext) *_ServerErrorReply {
+func NewServerErrorReply(peekedByte byte) *_ServerErrorReply {
 	_result := &_ServerErrorReply{
-		ReplyOrConfirmationContract: NewReplyOrConfirmation(peekedByte, cBusOptions, requestContext),
+		ReplyOrConfirmationContract: NewReplyOrConfirmation(peekedByte),
 	}
 	_result.ReplyOrConfirmationContract.(*_ReplyOrConfirmation)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/cbus/readwrite/model/StaticHelper_test.go b/plc4go/protocols/cbus/readwrite/model/StaticHelper_test.go
index 85325717316..c8de2db13ae 100644
--- a/plc4go/protocols/cbus/readwrite/model/StaticHelper_test.go
+++ b/plc4go/protocols/cbus/readwrite/model/StaticHelper_test.go
@@ -500,7 +500,7 @@ func TestReadCALData(t *testing.T) {
 			args: args{
 				readBuffer: utils.NewReadBufferByteBased([]byte("2101")),
 			},
-			want: NewCALDataIdentify(CALCommandTypeContainer_CALCommandIdentify, nil, Attribute_Type, nil),
+			want: NewCALDataIdentify(nil, CALCommandTypeContainer_CALCommandIdentify, nil, Attribute_Type),
 		},
 	}
 	for _, tt := range tests {
@@ -551,19 +551,17 @@ func TestReadCBusCommand(t *testing.T) {
 				NewCBusPointToPointCommandIndirect(
 					12553,
 					NewCALDataWrite(
+						nil,
 						CALCommandTypeContainer_CALCommandWrite_4Bytes,
 						nil,
 						Parameter_UNKNOWN_01,
 						65,
-						NewParameterValueRaw([]byte{6, 00}, 2),
-						nil,
+						NewParameterValueRaw([]byte{6, 00}),
 					),
 					NewBridgeAddress(49),
 					NewNetworkRoute(NewNetworkProtocolControlInformation(1, 1), nil),
 					NewUnitAddress(0),
-					nil,
 				),
-				nil,
 			),
 		},
 	}
@@ -639,7 +637,7 @@ func TestWriteCALData(t *testing.T) {
 			name: "write something",
 			args: args{
 				writeBuffer: utils.NewWriteBufferBoxBased(),
-				calData:     NewCALDataReset(0, nil, nil),
+				calData:     NewCALDataReset(nil, 0, nil),
 			},
 		},
 	}
@@ -666,7 +664,7 @@ func TestWriteCBusCommand(t *testing.T) {
 			name: "write something",
 			args: args{
 				writeBuffer: utils.NewWriteBufferBoxBased(),
-				cbusCommand: NewCBusCommandDeviceManagement(NewCBusHeader(0, false, 0, 0), 0, 0, nil),
+				cbusCommand: NewCBusCommandDeviceManagement(NewCBusHeader(0, false, 0, 0), 0, 0),
 			},
 		},
 	}
@@ -694,19 +692,16 @@ func TestWriteEncodedReply(t *testing.T) {
 			args: args{
 				writeBuffer: utils.NewWriteBufferBoxBased(),
 				encodedReply: NewEncodedReplyCALReply(
+					NewRequestContext(false),
 					0,
 					NewCALReplyShort(
 						0,
 						NewCALDataReset(
+							NewRequestContext(false),
 							0,
 							nil,
-							NewRequestContext(false),
 						),
-						nil,
-						NewRequestContext(false),
 					),
-					nil,
-					NewRequestContext(false),
 				),
 			},
 		},
diff --git a/plc4go/protocols/cbus/readwrite/model/StatusByte.go b/plc4go/protocols/cbus/readwrite/model/StatusByte.go
index d24207cb537..43a0da6b85a 100644
--- a/plc4go/protocols/cbus/readwrite/model/StatusByte.go
+++ b/plc4go/protocols/cbus/readwrite/model/StatusByte.go
@@ -240,7 +240,7 @@ func StatusByteParseWithBufferProducer() func(ctx context.Context, readBuffer ut
 }
 
 func StatusByteParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (StatusByte, error) {
-	v, err := (&_StatusByte{}).parse(ctx, readBuffer)
+	v, err := (new(_StatusByte)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/StatusRequest.go b/plc4go/protocols/cbus/readwrite/model/StatusRequest.go
index d900b32563b..e4bf2a4ca5d 100644
--- a/plc4go/protocols/cbus/readwrite/model/StatusRequest.go
+++ b/plc4go/protocols/cbus/readwrite/model/StatusRequest.go
@@ -287,7 +287,7 @@ func StatusRequestParseWithBufferProducer[T StatusRequest]() func(ctx context.Co
 }
 
 func StatusRequestParseWithBuffer[T StatusRequest](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_StatusRequest{}).parse(ctx, readBuffer)
+	v, err := (new(_StatusRequest)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/cbus/readwrite/model/TamperStatus.go b/plc4go/protocols/cbus/readwrite/model/TamperStatus.go
index 0138582d4e5..c53265bf9b3 100644
--- a/plc4go/protocols/cbus/readwrite/model/TamperStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/TamperStatus.go
@@ -228,7 +228,7 @@ func TamperStatusParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func TamperStatusParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (TamperStatus, error) {
-	v, err := (&_TamperStatus{}).parse(ctx, readBuffer)
+	v, err := (new(_TamperStatus)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyData.go b/plc4go/protocols/cbus/readwrite/model/TelephonyData.go
index 95f683ea0f2..697ae36e863 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyData.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyData.go
@@ -437,7 +437,7 @@ func TelephonyDataParseWithBufferProducer[T TelephonyData]() func(ctx context.Co
 }
 
 func TelephonyDataParseWithBuffer[T TelephonyData](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_TelephonyData{}).parse(ctx, readBuffer)
+	v, err := (new(_TelephonyData)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastData.go b/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastData.go
index c0162de1d36..7466b906566 100644
--- a/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastData.go
+++ b/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastData.go
@@ -252,7 +252,7 @@ func TemperatureBroadcastDataParseWithBufferProducer() func(ctx context.Context,
 }
 
 func TemperatureBroadcastDataParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (TemperatureBroadcastData, error) {
-	v, err := (&_TemperatureBroadcastData{}).parse(ctx, readBuffer)
+	v, err := (new(_TemperatureBroadcastData)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlData.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlData.go
index bdc8788b885..961e304ec9d 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlData.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlData.go
@@ -362,7 +362,7 @@ func TriggerControlDataParseWithBufferProducer[T TriggerControlData]() func(ctx
 }
 
 func TriggerControlDataParseWithBuffer[T TriggerControlData](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_TriggerControlData{}).parse(ctx, readBuffer)
+	v, err := (new(_TriggerControlData)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelOptions.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelOptions.go
index 0cea3f8b3db..01feaa34b98 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelOptions.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelOptions.go
@@ -223,7 +223,7 @@ func TriggerControlLabelOptionsParseWithBufferProducer() func(ctx context.Contex
 }
 
 func TriggerControlLabelOptionsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (TriggerControlLabelOptions, error) {
-	v, err := (&_TriggerControlLabelOptions{}).parse(ctx, readBuffer)
+	v, err := (new(_TriggerControlLabelOptions)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/UnitAddress.go b/plc4go/protocols/cbus/readwrite/model/UnitAddress.go
index 05dd8022d99..8873578cb36 100644
--- a/plc4go/protocols/cbus/readwrite/model/UnitAddress.go
+++ b/plc4go/protocols/cbus/readwrite/model/UnitAddress.go
@@ -189,7 +189,7 @@ func UnitAddressParseWithBufferProducer() func(ctx context.Context, readBuffer u
 }
 
 func UnitAddressParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (UnitAddress, error) {
-	v, err := (&_UnitAddress{}).parse(ctx, readBuffer)
+	v, err := (new(_UnitAddress)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/ZoneStatus.go b/plc4go/protocols/cbus/readwrite/model/ZoneStatus.go
index 6593bfef3f4..a2acb7bd8b4 100644
--- a/plc4go/protocols/cbus/readwrite/model/ZoneStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/ZoneStatus.go
@@ -189,7 +189,7 @@ func ZoneStatusParseWithBufferProducer() func(ctx context.Context, readBuffer ut
 }
 
 func ZoneStatusParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ZoneStatus, error) {
-	v, err := (&_ZoneStatus{}).parse(ctx, readBuffer)
+	v, err := (new(_ZoneStatus)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/df1/readwrite/model/DF1Command.go b/plc4go/protocols/df1/readwrite/model/DF1Command.go
index 6aea6d39fe1..10952a0fcbb 100644
--- a/plc4go/protocols/df1/readwrite/model/DF1Command.go
+++ b/plc4go/protocols/df1/readwrite/model/DF1Command.go
@@ -297,7 +297,7 @@ func DF1CommandParseWithBufferProducer[T DF1Command]() func(ctx context.Context,
 }
 
 func DF1CommandParseWithBuffer[T DF1Command](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_DF1Command{}).parse(ctx, readBuffer)
+	v, err := (new(_DF1Command)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/df1/readwrite/model/DF1Symbol.go b/plc4go/protocols/df1/readwrite/model/DF1Symbol.go
index 8c1d7eb0e0e..720dd7d3094 100644
--- a/plc4go/protocols/df1/readwrite/model/DF1Symbol.go
+++ b/plc4go/protocols/df1/readwrite/model/DF1Symbol.go
@@ -287,7 +287,7 @@ func DF1SymbolParseWithBufferProducer[T DF1Symbol]() func(ctx context.Context, r
 }
 
 func DF1SymbolParseWithBuffer[T DF1Symbol](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_DF1Symbol{}).parse(ctx, readBuffer)
+	v, err := (new(_DF1Symbol)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/eip/readwrite/ParserHelper.go b/plc4go/protocols/eip/readwrite/ParserHelper.go
index 6a98e27fb87..1cdaa3693f0 100644
--- a/plc4go/protocols/eip/readwrite/ParserHelper.go
+++ b/plc4go/protocols/eip/readwrite/ParserHelper.go
@@ -37,8 +37,6 @@ func (m EipParserHelper) Parse(typeName string, arguments []string, io utils.Rea
 	switch typeName {
 	case "PathSegment":
 		return PathSegmentParseWithBuffer[PathSegment](context.Background(), io)
-	case "EipConstants":
-		return EipConstantsParseWithBuffer(context.Background(), io)
 	case "TransportType":
 		return TransportTypeParseWithBuffer(context.Background(), io)
 	case "PortSegmentType":
diff --git a/plc4go/protocols/eip/readwrite/XmlParserHelper.go b/plc4go/protocols/eip/readwrite/XmlParserHelper.go
index 52fc84ed3b7..4c5196a18bc 100644
--- a/plc4go/protocols/eip/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/eip/readwrite/XmlParserHelper.go
@@ -47,8 +47,6 @@ func (m EipXmlParserHelper) Parse(typeName string, xmlString string, parserArgum
 	switch typeName {
 	case "PathSegment":
 		return PathSegmentParseWithBuffer[PathSegment](context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
-	case "EipConstants":
-		return EipConstantsParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
 	case "TransportType":
 		return TransportTypeParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
 	case "PortSegmentType":
diff --git a/plc4go/protocols/eip/readwrite/model/CIPAttributes.go b/plc4go/protocols/eip/readwrite/model/CIPAttributes.go
index 12d7bf23dac..f1683be1346 100644
--- a/plc4go/protocols/eip/readwrite/model/CIPAttributes.go
+++ b/plc4go/protocols/eip/readwrite/model/CIPAttributes.go
@@ -60,16 +60,13 @@ type _CIPAttributes struct {
 	NumberAvailable *uint16
 	NumberActive    *uint16
 	Data            []byte
-
-	// Arguments.
-	PacketLength uint16
 }
 
 var _ CIPAttributes = (*_CIPAttributes)(nil)
 
 // NewCIPAttributes factory function for _CIPAttributes
-func NewCIPAttributes(classId []uint16, numberAvailable *uint16, numberActive *uint16, data []byte, packetLength uint16) *_CIPAttributes {
-	return &_CIPAttributes{ClassId: classId, NumberAvailable: numberAvailable, NumberActive: numberActive, Data: data, PacketLength: packetLength}
+func NewCIPAttributes(classId []uint16, numberAvailable *uint16, numberActive *uint16, data []byte) *_CIPAttributes {
+	return &_CIPAttributes{ClassId: classId, NumberAvailable: numberAvailable, NumberActive: numberActive, Data: data}
 }
 
 ///////////////////////////////////////////////////////////
@@ -90,8 +87,6 @@ type CIPAttributesBuilder interface {
 	WithOptionalNumberActive(uint16) CIPAttributesBuilder
 	// WithData adds Data (property field)
 	WithData(...byte) CIPAttributesBuilder
-	// WithArgPacketLength sets a parser argument
-	WithArgPacketLength(uint16) CIPAttributesBuilder
 	// Build builds the CIPAttributes or returns an error if something is wrong
 	Build() (CIPAttributes, error)
 	// MustBuild does the same as Build but panics on error
@@ -135,11 +130,6 @@ func (b *_CIPAttributesBuilder) WithData(data ...byte) CIPAttributesBuilder {
 	return b
 }
 
-func (b *_CIPAttributesBuilder) WithArgPacketLength(packetLength uint16) CIPAttributesBuilder {
-	b.PacketLength = packetLength
-	return b
-}
-
 func (b *_CIPAttributesBuilder) Build() (CIPAttributes, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -261,7 +251,7 @@ func CIPAttributesParseWithBufferProducer(packetLength uint16) func(ctx context.
 }
 
 func CIPAttributesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, packetLength uint16) (CIPAttributes, error) {
-	v, err := (&_CIPAttributes{PacketLength: packetLength}).parse(ctx, readBuffer, packetLength)
+	v, err := (new(_CIPAttributes)).parse(ctx, readBuffer, packetLength)
 	if err != nil {
 		return nil, err
 	}
@@ -361,16 +351,6 @@ func (m *_CIPAttributes) SerializeWithWriteBuffer(ctx context.Context, writeBuff
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_CIPAttributes) GetPacketLength() uint16 {
-	return m.PacketLength
-}
-
-//
-////
-
 func (m *_CIPAttributes) IsCIPAttributes() {}
 
 func (m *_CIPAttributes) DeepCopy() any {
@@ -386,7 +366,6 @@ func (m *_CIPAttributes) deepCopy() *_CIPAttributes {
 		utils.CopyPtr[uint16](m.NumberAvailable),
 		utils.CopyPtr[uint16](m.NumberActive),
 		utils.DeepCopySlice[byte, byte](m.Data),
-		m.PacketLength,
 	}
 	return _CIPAttributesCopy
 }
diff --git a/plc4go/protocols/eip/readwrite/model/CIPData.go b/plc4go/protocols/eip/readwrite/model/CIPData.go
index 7566bde998b..b0e7ef3df16 100644
--- a/plc4go/protocols/eip/readwrite/model/CIPData.go
+++ b/plc4go/protocols/eip/readwrite/model/CIPData.go
@@ -54,16 +54,13 @@ type CIPData interface {
 type _CIPData struct {
 	DataType CIPDataTypeCode
 	Data     []byte
-
-	// Arguments.
-	PacketLength uint16
 }
 
 var _ CIPData = (*_CIPData)(nil)
 
 // NewCIPData factory function for _CIPData
-func NewCIPData(dataType CIPDataTypeCode, data []byte, packetLength uint16) *_CIPData {
-	return &_CIPData{DataType: dataType, Data: data, PacketLength: packetLength}
+func NewCIPData(dataType CIPDataTypeCode, data []byte) *_CIPData {
+	return &_CIPData{DataType: dataType, Data: data}
 }
 
 ///////////////////////////////////////////////////////////
@@ -80,8 +77,6 @@ type CIPDataBuilder interface {
 	WithDataType(CIPDataTypeCode) CIPDataBuilder
 	// WithData adds Data (property field)
 	WithData(...byte) CIPDataBuilder
-	// WithArgPacketLength sets a parser argument
-	WithArgPacketLength(uint16) CIPDataBuilder
 	// Build builds the CIPData or returns an error if something is wrong
 	Build() (CIPData, error)
 	// MustBuild does the same as Build but panics on error
@@ -115,11 +110,6 @@ func (b *_CIPDataBuilder) WithData(data ...byte) CIPDataBuilder {
 	return b
 }
 
-func (b *_CIPDataBuilder) WithArgPacketLength(packetLength uint16) CIPDataBuilder {
-	b.PacketLength = packetLength
-	return b
-}
-
 func (b *_CIPDataBuilder) Build() (CIPData, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -218,7 +208,7 @@ func CIPDataParseWithBufferProducer(packetLength uint16) func(ctx context.Contex
 }
 
 func CIPDataParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, packetLength uint16) (CIPData, error) {
-	v, err := (&_CIPData{PacketLength: packetLength}).parse(ctx, readBuffer, packetLength)
+	v, err := (new(_CIPData)).parse(ctx, readBuffer, packetLength)
 	if err != nil {
 		return nil, err
 	}
@@ -284,16 +274,6 @@ func (m *_CIPData) SerializeWithWriteBuffer(ctx context.Context, writeBuffer uti
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_CIPData) GetPacketLength() uint16 {
-	return m.PacketLength
-}
-
-//
-////
-
 func (m *_CIPData) IsCIPData() {}
 
 func (m *_CIPData) DeepCopy() any {
@@ -307,7 +287,6 @@ func (m *_CIPData) deepCopy() *_CIPData {
 	_CIPDataCopy := &_CIPData{
 		m.DataType,
 		utils.DeepCopySlice[byte, byte](m.Data),
-		m.PacketLength,
 	}
 	return _CIPDataCopy
 }
diff --git a/plc4go/protocols/eip/readwrite/model/CIPDataConnected.go b/plc4go/protocols/eip/readwrite/model/CIPDataConnected.go
index 88843fcf3e4..ce24f320ef6 100644
--- a/plc4go/protocols/eip/readwrite/model/CIPDataConnected.go
+++ b/plc4go/protocols/eip/readwrite/model/CIPDataConnected.go
@@ -206,7 +206,7 @@ func CIPDataConnectedParseWithBufferProducer() func(ctx context.Context, readBuf
 }
 
 func CIPDataConnectedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (CIPDataConnected, error) {
-	v, err := (&_CIPDataConnected{}).parse(ctx, readBuffer)
+	v, err := (new(_CIPDataConnected)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectedRequest.go b/plc4go/protocols/eip/readwrite/model/CipConnectedRequest.go
index 60cbc575428..63fa1bad290 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectedRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectedRequest.go
@@ -62,9 +62,9 @@ var _ CipConnectedRequest = (*_CipConnectedRequest)(nil)
 var _ CipServiceRequirements = (*_CipConnectedRequest)(nil)
 
 // NewCipConnectedRequest factory function for _CipConnectedRequest
-func NewCipConnectedRequest(pathSegments []byte, serviceLen uint16) *_CipConnectedRequest {
+func NewCipConnectedRequest(pathSegments []byte) *_CipConnectedRequest {
 	_result := &_CipConnectedRequest{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 		PathSegments:       pathSegments,
 	}
 	_result.CipServiceContract.(*_CipService)._SubType = _result
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectedResponse.go b/plc4go/protocols/eip/readwrite/model/CipConnectedResponse.go
index fbfc2aafd28..a53fbb35e4c 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectedResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectedResponse.go
@@ -67,9 +67,9 @@ var _ CipConnectedResponse = (*_CipConnectedResponse)(nil)
 var _ CipServiceRequirements = (*_CipConnectedResponse)(nil)
 
 // NewCipConnectedResponse factory function for _CipConnectedResponse
-func NewCipConnectedResponse(status uint8, additionalStatusWords uint8, data CIPDataConnected, serviceLen uint16) *_CipConnectedResponse {
+func NewCipConnectedResponse(status uint8, additionalStatusWords uint8, data CIPDataConnected) *_CipConnectedResponse {
 	_result := &_CipConnectedResponse{
-		CipServiceContract:    NewCipService(serviceLen),
+		CipServiceContract:    NewCipService(),
 		Status:                status,
 		AdditionalStatusWords: additionalStatusWords,
 		Data:                  data,
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseRequest.go b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseRequest.go
index d24e074287b..872e05af2c4 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseRequest.go
@@ -91,7 +91,7 @@ var _ CipConnectionManagerCloseRequest = (*_CipConnectionManagerCloseRequest)(ni
 var _ CipServiceRequirements = (*_CipConnectionManagerCloseRequest)(nil)
 
 // NewCipConnectionManagerCloseRequest factory function for _CipConnectionManagerCloseRequest
-func NewCipConnectionManagerCloseRequest(requestPathSize uint8, classSegment PathSegment, instanceSegment PathSegment, priority uint8, tickTime uint8, timeoutTicks uint8, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, connectionPathSize uint8, connectionPaths []PathSegment, serviceLen uint16) *_CipConnectionManagerCloseRequest {
+func NewCipConnectionManagerCloseRequest(requestPathSize uint8, classSegment PathSegment, instanceSegment PathSegment, priority uint8, tickTime uint8, timeoutTicks uint8, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, connectionPathSize uint8, connectionPaths []PathSegment) *_CipConnectionManagerCloseRequest {
 	if classSegment == nil {
 		panic("classSegment of type PathSegment for CipConnectionManagerCloseRequest must not be nil")
 	}
@@ -99,7 +99,7 @@ func NewCipConnectionManagerCloseRequest(requestPathSize uint8, classSegment Pat
 		panic("instanceSegment of type PathSegment for CipConnectionManagerCloseRequest must not be nil")
 	}
 	_result := &_CipConnectionManagerCloseRequest{
-		CipServiceContract:     NewCipService(serviceLen),
+		CipServiceContract:     NewCipService(),
 		RequestPathSize:        requestPathSize,
 		ClassSegment:           classSegment,
 		InstanceSegment:        instanceSegment,
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseResponse.go b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseResponse.go
index c04c45724a1..63ec1d92ee8 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseResponse.go
@@ -77,9 +77,9 @@ var _ CipConnectionManagerCloseResponse = (*_CipConnectionManagerCloseResponse)(
 var _ CipServiceRequirements = (*_CipConnectionManagerCloseResponse)(nil)
 
 // NewCipConnectionManagerCloseResponse factory function for _CipConnectionManagerCloseResponse
-func NewCipConnectionManagerCloseResponse(status uint8, additionalStatusWords uint8, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, applicationReplySize uint8, serviceLen uint16) *_CipConnectionManagerCloseResponse {
+func NewCipConnectionManagerCloseResponse(status uint8, additionalStatusWords uint8, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, applicationReplySize uint8) *_CipConnectionManagerCloseResponse {
 	_result := &_CipConnectionManagerCloseResponse{
-		CipServiceContract:     NewCipService(serviceLen),
+		CipServiceContract:     NewCipService(),
 		Status:                 status,
 		AdditionalStatusWords:  additionalStatusWords,
 		ConnectionSerialNumber: connectionSerialNumber,
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerRequest.go b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerRequest.go
index 2a0352b71af..447dac1567e 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerRequest.go
@@ -112,7 +112,7 @@ var _ CipConnectionManagerRequest = (*_CipConnectionManagerRequest)(nil)
 var _ CipServiceRequirements = (*_CipConnectionManagerRequest)(nil)
 
 // NewCipConnectionManagerRequest factory function for _CipConnectionManagerRequest
-func NewCipConnectionManagerRequest(classSegment PathSegment, instanceSegment PathSegment, priority uint8, tickTime uint8, timeoutTicks uint8, otConnectionId uint32, toConnectionId uint32, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, timeoutMultiplier uint8, otRpi uint32, otConnectionParameters NetworkConnectionParameters, toRpi uint32, toConnectionParameters NetworkConnectionParameters, transportType TransportType, connectionPathSize uint8, connectionPaths []PathSegment, serviceLen uint16) *_CipConnectionManagerRequest {
+func NewCipConnectionManagerRequest(classSegment PathSegment, instanceSegment PathSegment, priority uint8, tickTime uint8, timeoutTicks uint8, otConnectionId uint32, toConnectionId uint32, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, timeoutMultiplier uint8, otRpi uint32, otConnectionParameters NetworkConnectionParameters, toRpi uint32, toConnectionParameters NetworkConnectionParameters, transportType TransportType, connectionPathSize uint8, connectionPaths []PathSegment) *_CipConnectionManagerRequest {
 	if classSegment == nil {
 		panic("classSegment of type PathSegment for CipConnectionManagerRequest must not be nil")
 	}
@@ -129,7 +129,7 @@ func NewCipConnectionManagerRequest(classSegment PathSegment, instanceSegment Pa
 		panic("transportType of type TransportType for CipConnectionManagerRequest must not be nil")
 	}
 	_result := &_CipConnectionManagerRequest{
-		CipServiceContract:     NewCipService(serviceLen),
+		CipServiceContract:     NewCipService(),
 		ClassSegment:           classSegment,
 		InstanceSegment:        instanceSegment,
 		Priority:               priority,
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerResponse.go b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerResponse.go
index 89c462f31c9..8e9595d3c37 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerResponse.go
@@ -80,9 +80,9 @@ var _ CipConnectionManagerResponse = (*_CipConnectionManagerResponse)(nil)
 var _ CipServiceRequirements = (*_CipConnectionManagerResponse)(nil)
 
 // NewCipConnectionManagerResponse factory function for _CipConnectionManagerResponse
-func NewCipConnectionManagerResponse(otConnectionId uint32, toConnectionId uint32, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, otApi uint32, toApi uint32, serviceLen uint16) *_CipConnectionManagerResponse {
+func NewCipConnectionManagerResponse(otConnectionId uint32, toConnectionId uint32, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, otApi uint32, toApi uint32) *_CipConnectionManagerResponse {
 	_result := &_CipConnectionManagerResponse{
-		CipServiceContract:     NewCipService(serviceLen),
+		CipServiceContract:     NewCipService(),
 		OtConnectionId:         otConnectionId,
 		ToConnectionId:         toConnectionId,
 		ConnectionSerialNumber: connectionSerialNumber,
diff --git a/plc4go/protocols/eip/readwrite/model/CipReadRequest.go b/plc4go/protocols/eip/readwrite/model/CipReadRequest.go
index b4ccc88f0fd..54a1f05ebe1 100644
--- a/plc4go/protocols/eip/readwrite/model/CipReadRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipReadRequest.go
@@ -62,9 +62,9 @@ var _ CipReadRequest = (*_CipReadRequest)(nil)
 var _ CipServiceRequirements = (*_CipReadRequest)(nil)
 
 // NewCipReadRequest factory function for _CipReadRequest
-func NewCipReadRequest(tag []byte, elementNb uint16, serviceLen uint16) *_CipReadRequest {
+func NewCipReadRequest(tag []byte, elementNb uint16) *_CipReadRequest {
 	_result := &_CipReadRequest{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 		Tag:                tag,
 		ElementNb:          elementNb,
 	}
diff --git a/plc4go/protocols/eip/readwrite/model/CipReadResponse.go b/plc4go/protocols/eip/readwrite/model/CipReadResponse.go
index 57f5a36af17..8cfd010e7c8 100644
--- a/plc4go/protocols/eip/readwrite/model/CipReadResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipReadResponse.go
@@ -67,9 +67,9 @@ var _ CipReadResponse = (*_CipReadResponse)(nil)
 var _ CipServiceRequirements = (*_CipReadResponse)(nil)
 
 // NewCipReadResponse factory function for _CipReadResponse
-func NewCipReadResponse(status uint8, extStatus uint8, data CIPData, serviceLen uint16) *_CipReadResponse {
+func NewCipReadResponse(status uint8, extStatus uint8, data CIPData) *_CipReadResponse {
 	_result := &_CipReadResponse{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 		Status:             status,
 		ExtStatus:          extStatus,
 		Data:               data,
diff --git a/plc4go/protocols/eip/readwrite/model/CipService.go b/plc4go/protocols/eip/readwrite/model/CipService.go
index 42013c1c82c..6e0303134f5 100644
--- a/plc4go/protocols/eip/readwrite/model/CipService.go
+++ b/plc4go/protocols/eip/readwrite/model/CipService.go
@@ -50,8 +50,6 @@ type CipService interface {
 
 // CipServiceContract provides a set of functions which can be overwritten by a sub struct
 type CipServiceContract interface {
-	// GetServiceLen() returns a parser argument
-	GetServiceLen() uint16
 	// IsCipService is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsCipService()
 	// CreateBuilder creates a CipServiceBuilder
@@ -76,16 +74,13 @@ type _CipService struct {
 		CipServiceContract
 		CipServiceRequirements
 	}
-
-	// Arguments.
-	ServiceLen uint16
 }
 
 var _ CipServiceContract = (*_CipService)(nil)
 
 // NewCipService factory function for _CipService
-func NewCipService(serviceLen uint16) *_CipService {
-	return &_CipService{ServiceLen: serviceLen}
+func NewCipService() *_CipService {
+	return &_CipService{}
 }
 
 ///////////////////////////////////////////////////////////
@@ -98,8 +93,6 @@ type CipServiceBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
 	WithMandatoryFields() CipServiceBuilder
-	// WithArgServiceLen sets a parser argument
-	WithArgServiceLen(uint16) CipServiceBuilder
 	// AsGetAttributeAllRequest converts this build to a subType of CipService. It is always possible to return to current builder using Done()
 	AsGetAttributeAllRequest() GetAttributeAllRequestBuilder
 	// AsGetAttributeAllResponse converts this build to a subType of CipService. It is always possible to return to current builder using Done()
@@ -185,11 +178,6 @@ func (b *_CipServiceBuilder) WithMandatoryFields() CipServiceBuilder {
 	return b
 }
 
-func (b *_CipServiceBuilder) WithArgServiceLen(serviceLen uint16) CipServiceBuilder {
-	b.ServiceLen = serviceLen
-	return b
-}
-
 func (b *_CipServiceBuilder) PartialBuild() (CipServiceContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -547,7 +535,7 @@ func CipServiceParseWithBufferProducer[T CipService](connected bool, serviceLen
 }
 
 func CipServiceParseWithBuffer[T CipService](ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (T, error) {
-	v, err := (&_CipService{ServiceLen: serviceLen}).parse(ctx, readBuffer, connected, serviceLen)
+	v, err := (new(_CipService)).parse(ctx, readBuffer, connected, serviceLen)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -724,16 +712,6 @@ func (pm *_CipService) serializeParent(ctx context.Context, writeBuffer utils.Wr
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_CipService) GetServiceLen() uint16 {
-	return m.ServiceLen
-}
-
-//
-////
-
 func (m *_CipService) IsCipService() {}
 
 func (m *_CipService) DeepCopy() any {
@@ -746,7 +724,6 @@ func (m *_CipService) deepCopy() *_CipService {
 	}
 	_CipServiceCopy := &_CipService{
 		nil, // will be set by child
-		m.ServiceLen,
 	}
 	return _CipServiceCopy
 }
diff --git a/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go b/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go
index c25fa2792f1..0f6e6a833f4 100644
--- a/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go
@@ -76,7 +76,7 @@ var _ CipUnconnectedRequest = (*_CipUnconnectedRequest)(nil)
 var _ CipServiceRequirements = (*_CipUnconnectedRequest)(nil)
 
 // NewCipUnconnectedRequest factory function for _CipUnconnectedRequest
-func NewCipUnconnectedRequest(classSegment PathSegment, instanceSegment PathSegment, unconnectedService CipService, backPlane int8, slot int8, serviceLen uint16) *_CipUnconnectedRequest {
+func NewCipUnconnectedRequest(classSegment PathSegment, instanceSegment PathSegment, unconnectedService CipService, backPlane int8, slot int8) *_CipUnconnectedRequest {
 	if classSegment == nil {
 		panic("classSegment of type PathSegment for CipUnconnectedRequest must not be nil")
 	}
@@ -87,7 +87,7 @@ func NewCipUnconnectedRequest(classSegment PathSegment, instanceSegment PathSegm
 		panic("unconnectedService of type CipService for CipUnconnectedRequest must not be nil")
 	}
 	_result := &_CipUnconnectedRequest{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 		ClassSegment:       classSegment,
 		InstanceSegment:    instanceSegment,
 		UnconnectedService: unconnectedService,
diff --git a/plc4go/protocols/eip/readwrite/model/CipWriteRequest.go b/plc4go/protocols/eip/readwrite/model/CipWriteRequest.go
index dab959e8036..19235681a03 100644
--- a/plc4go/protocols/eip/readwrite/model/CipWriteRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipWriteRequest.go
@@ -68,9 +68,9 @@ var _ CipWriteRequest = (*_CipWriteRequest)(nil)
 var _ CipServiceRequirements = (*_CipWriteRequest)(nil)
 
 // NewCipWriteRequest factory function for _CipWriteRequest
-func NewCipWriteRequest(tag []byte, dataType CIPDataTypeCode, elementNb uint16, data []byte, serviceLen uint16) *_CipWriteRequest {
+func NewCipWriteRequest(tag []byte, dataType CIPDataTypeCode, elementNb uint16, data []byte) *_CipWriteRequest {
 	_result := &_CipWriteRequest{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 		Tag:                tag,
 		DataType:           dataType,
 		ElementNb:          elementNb,
diff --git a/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go b/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go
index 8b8e1053af3..cd82acfd26a 100644
--- a/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go
@@ -64,9 +64,9 @@ var _ CipWriteResponse = (*_CipWriteResponse)(nil)
 var _ CipServiceRequirements = (*_CipWriteResponse)(nil)
 
 // NewCipWriteResponse factory function for _CipWriteResponse
-func NewCipWriteResponse(status uint8, extStatus uint8, serviceLen uint16) *_CipWriteResponse {
+func NewCipWriteResponse(status uint8, extStatus uint8) *_CipWriteResponse {
 	_result := &_CipWriteResponse{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 		Status:             status,
 		ExtStatus:          extStatus,
 	}
diff --git a/plc4go/protocols/eip/readwrite/model/ClassSegment.go b/plc4go/protocols/eip/readwrite/model/ClassSegment.go
index 7dbe87e1c05..622ad4a315f 100644
--- a/plc4go/protocols/eip/readwrite/model/ClassSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/ClassSegment.go
@@ -240,7 +240,7 @@ func ClassSegmentParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func ClassSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ClassSegment, error) {
-	v, err := (&_ClassSegment{}).parse(ctx, readBuffer)
+	v, err := (new(_ClassSegment)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/eip/readwrite/model/CommandSpecificDataItem.go b/plc4go/protocols/eip/readwrite/model/CommandSpecificDataItem.go
index f1a4d6f9ab2..12e6dbbb2b1 100644
--- a/plc4go/protocols/eip/readwrite/model/CommandSpecificDataItem.go
+++ b/plc4go/protocols/eip/readwrite/model/CommandSpecificDataItem.go
@@ -253,7 +253,7 @@ func CommandSpecificDataItemParseWithBufferProducer[T CommandSpecificDataItem]()
 }
 
 func CommandSpecificDataItemParseWithBuffer[T CommandSpecificDataItem](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_CommandSpecificDataItem{}).parse(ctx, readBuffer)
+	v, err := (new(_CommandSpecificDataItem)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/eip/readwrite/model/Constants.go b/plc4go/protocols/eip/readwrite/model/Constants.go
new file mode 100644
index 00000000000..418a400773d
--- /dev/null
+++ b/plc4go/protocols/eip/readwrite/model/Constants.go
@@ -0,0 +1,25 @@
+/*
+ * 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 model
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Constant values.
+var Constant_EIPUDPDISCOVERYDEFAULTPORT uint16 = uint16(44818)
+var Constant_EIPTCPDEFAULTPORT uint16 = uint16(44818)
diff --git a/plc4go/protocols/eip/readwrite/model/DataSegmentType.go b/plc4go/protocols/eip/readwrite/model/DataSegmentType.go
index 5bdb75dc86b..17ce54f06dc 100644
--- a/plc4go/protocols/eip/readwrite/model/DataSegmentType.go
+++ b/plc4go/protocols/eip/readwrite/model/DataSegmentType.go
@@ -241,7 +241,7 @@ func DataSegmentTypeParseWithBufferProducer[T DataSegmentType]() func(ctx contex
 }
 
 func DataSegmentTypeParseWithBuffer[T DataSegmentType](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_DataSegmentType{}).parse(ctx, readBuffer)
+	v, err := (new(_DataSegmentType)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/eip/readwrite/model/EipPacket.go b/plc4go/protocols/eip/readwrite/model/EipPacket.go
index fab002ce53f..4989a1f2ab9 100644
--- a/plc4go/protocols/eip/readwrite/model/EipPacket.go
+++ b/plc4go/protocols/eip/readwrite/model/EipPacket.go
@@ -472,7 +472,7 @@ func EipPacketParseWithBufferProducer[T EipPacket](response bool) func(ctx conte
 }
 
 func EipPacketParseWithBuffer[T EipPacket](ctx context.Context, readBuffer utils.ReadBuffer, response bool) (T, error) {
-	v, err := (&_EipPacket{}).parse(ctx, readBuffer, response)
+	v, err := (new(_EipPacket)).parse(ctx, readBuffer, response)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/eip/readwrite/model/GetAttributeAllRequest.go b/plc4go/protocols/eip/readwrite/model/GetAttributeAllRequest.go
index f113aabf8af..d2fff5ed26f 100644
--- a/plc4go/protocols/eip/readwrite/model/GetAttributeAllRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/GetAttributeAllRequest.go
@@ -62,7 +62,7 @@ var _ GetAttributeAllRequest = (*_GetAttributeAllRequest)(nil)
 var _ CipServiceRequirements = (*_GetAttributeAllRequest)(nil)
 
 // NewGetAttributeAllRequest factory function for _GetAttributeAllRequest
-func NewGetAttributeAllRequest(classSegment PathSegment, instanceSegment PathSegment, serviceLen uint16) *_GetAttributeAllRequest {
+func NewGetAttributeAllRequest(classSegment PathSegment, instanceSegment PathSegment) *_GetAttributeAllRequest {
 	if classSegment == nil {
 		panic("classSegment of type PathSegment for GetAttributeAllRequest must not be nil")
 	}
@@ -70,7 +70,7 @@ func NewGetAttributeAllRequest(classSegment PathSegment, instanceSegment PathSeg
 		panic("instanceSegment of type PathSegment for GetAttributeAllRequest must not be nil")
 	}
 	_result := &_GetAttributeAllRequest{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 		ClassSegment:       classSegment,
 		InstanceSegment:    instanceSegment,
 	}
diff --git a/plc4go/protocols/eip/readwrite/model/GetAttributeAllResponse.go b/plc4go/protocols/eip/readwrite/model/GetAttributeAllResponse.go
index d3d3b63f42e..afce4408bad 100644
--- a/plc4go/protocols/eip/readwrite/model/GetAttributeAllResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/GetAttributeAllResponse.go
@@ -67,9 +67,9 @@ var _ GetAttributeAllResponse = (*_GetAttributeAllResponse)(nil)
 var _ CipServiceRequirements = (*_GetAttributeAllResponse)(nil)
 
 // NewGetAttributeAllResponse factory function for _GetAttributeAllResponse
-func NewGetAttributeAllResponse(status uint8, extStatus uint8, attributes CIPAttributes, serviceLen uint16) *_GetAttributeAllResponse {
+func NewGetAttributeAllResponse(status uint8, extStatus uint8, attributes CIPAttributes) *_GetAttributeAllResponse {
 	_result := &_GetAttributeAllResponse{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 		Status:             status,
 		ExtStatus:          extStatus,
 		Attributes:         attributes,
diff --git a/plc4go/protocols/eip/readwrite/model/GetAttributeListRequest.go b/plc4go/protocols/eip/readwrite/model/GetAttributeListRequest.go
index 5f5a00f27bf..c97e66ae952 100644
--- a/plc4go/protocols/eip/readwrite/model/GetAttributeListRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/GetAttributeListRequest.go
@@ -54,9 +54,9 @@ var _ GetAttributeListRequest = (*_GetAttributeListRequest)(nil)
 var _ CipServiceRequirements = (*_GetAttributeListRequest)(nil)
 
 // NewGetAttributeListRequest factory function for _GetAttributeListRequest
-func NewGetAttributeListRequest(serviceLen uint16) *_GetAttributeListRequest {
+func NewGetAttributeListRequest() *_GetAttributeListRequest {
 	_result := &_GetAttributeListRequest{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 	}
 	_result.CipServiceContract.(*_CipService)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/eip/readwrite/model/GetAttributeListResponse.go b/plc4go/protocols/eip/readwrite/model/GetAttributeListResponse.go
index 0a8c4d835d2..475ff7f2d61 100644
--- a/plc4go/protocols/eip/readwrite/model/GetAttributeListResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/GetAttributeListResponse.go
@@ -54,9 +54,9 @@ var _ GetAttributeListResponse = (*_GetAttributeListResponse)(nil)
 var _ CipServiceRequirements = (*_GetAttributeListResponse)(nil)
 
 // NewGetAttributeListResponse factory function for _GetAttributeListResponse
-func NewGetAttributeListResponse(serviceLen uint16) *_GetAttributeListResponse {
+func NewGetAttributeListResponse() *_GetAttributeListResponse {
 	_result := &_GetAttributeListResponse{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 	}
 	_result.CipServiceContract.(*_CipService)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/eip/readwrite/model/GetAttributeSingleRequest.go b/plc4go/protocols/eip/readwrite/model/GetAttributeSingleRequest.go
index a280d8229e6..d292a42c6fd 100644
--- a/plc4go/protocols/eip/readwrite/model/GetAttributeSingleRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/GetAttributeSingleRequest.go
@@ -54,9 +54,9 @@ var _ GetAttributeSingleRequest = (*_GetAttributeSingleRequest)(nil)
 var _ CipServiceRequirements = (*_GetAttributeSingleRequest)(nil)
 
 // NewGetAttributeSingleRequest factory function for _GetAttributeSingleRequest
-func NewGetAttributeSingleRequest(serviceLen uint16) *_GetAttributeSingleRequest {
+func NewGetAttributeSingleRequest() *_GetAttributeSingleRequest {
 	_result := &_GetAttributeSingleRequest{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 	}
 	_result.CipServiceContract.(*_CipService)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/eip/readwrite/model/GetAttributeSingleResponse.go b/plc4go/protocols/eip/readwrite/model/GetAttributeSingleResponse.go
index 18078849ab6..24990bef3d2 100644
--- a/plc4go/protocols/eip/readwrite/model/GetAttributeSingleResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/GetAttributeSingleResponse.go
@@ -54,9 +54,9 @@ var _ GetAttributeSingleResponse = (*_GetAttributeSingleResponse)(nil)
 var _ CipServiceRequirements = (*_GetAttributeSingleResponse)(nil)
 
 // NewGetAttributeSingleResponse factory function for _GetAttributeSingleResponse
-func NewGetAttributeSingleResponse(serviceLen uint16) *_GetAttributeSingleResponse {
+func NewGetAttributeSingleResponse() *_GetAttributeSingleResponse {
 	_result := &_GetAttributeSingleResponse{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 	}
 	_result.CipServiceContract.(*_CipService)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/eip/readwrite/model/InstanceSegment.go b/plc4go/protocols/eip/readwrite/model/InstanceSegment.go
index 3d2e3568958..c9a64680732 100644
--- a/plc4go/protocols/eip/readwrite/model/InstanceSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/InstanceSegment.go
@@ -240,7 +240,7 @@ func InstanceSegmentParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func InstanceSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (InstanceSegment, error) {
-	v, err := (&_InstanceSegment{}).parse(ctx, readBuffer)
+	v, err := (new(_InstanceSegment)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/eip/readwrite/model/LogicalSegmentType.go b/plc4go/protocols/eip/readwrite/model/LogicalSegmentType.go
index 778377b6429..03050c541d4 100644
--- a/plc4go/protocols/eip/readwrite/model/LogicalSegmentType.go
+++ b/plc4go/protocols/eip/readwrite/model/LogicalSegmentType.go
@@ -265,7 +265,7 @@ func LogicalSegmentTypeParseWithBufferProducer[T LogicalSegmentType]() func(ctx
 }
 
 func LogicalSegmentTypeParseWithBuffer[T LogicalSegmentType](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_LogicalSegmentType{}).parse(ctx, readBuffer)
+	v, err := (new(_LogicalSegmentType)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/eip/readwrite/model/MultipleServiceRequest.go b/plc4go/protocols/eip/readwrite/model/MultipleServiceRequest.go
index 4c0b387b5e5..ee507dda86b 100644
--- a/plc4go/protocols/eip/readwrite/model/MultipleServiceRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/MultipleServiceRequest.go
@@ -63,12 +63,12 @@ var _ MultipleServiceRequest = (*_MultipleServiceRequest)(nil)
 var _ CipServiceRequirements = (*_MultipleServiceRequest)(nil)
 
 // NewMultipleServiceRequest factory function for _MultipleServiceRequest
-func NewMultipleServiceRequest(data Services, serviceLen uint16) *_MultipleServiceRequest {
+func NewMultipleServiceRequest(data Services) *_MultipleServiceRequest {
 	if data == nil {
 		panic("data of type Services for MultipleServiceRequest must not be nil")
 	}
 	_result := &_MultipleServiceRequest{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 		Data:               data,
 	}
 	_result.CipServiceContract.(*_CipService)._SubType = _result
diff --git a/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go b/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go
index 294e747d146..48999ab54cf 100644
--- a/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go
@@ -73,9 +73,9 @@ var _ MultipleServiceResponse = (*_MultipleServiceResponse)(nil)
 var _ CipServiceRequirements = (*_MultipleServiceResponse)(nil)
 
 // NewMultipleServiceResponse factory function for _MultipleServiceResponse
-func NewMultipleServiceResponse(status uint8, extStatus uint8, serviceNb uint16, offsets []uint16, servicesData []byte, serviceLen uint16) *_MultipleServiceResponse {
+func NewMultipleServiceResponse(status uint8, extStatus uint8, serviceNb uint16, offsets []uint16, servicesData []byte) *_MultipleServiceResponse {
 	_result := &_MultipleServiceResponse{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 		Status:             status,
 		ExtStatus:          extStatus,
 		ServiceNb:          serviceNb,
diff --git a/plc4go/protocols/eip/readwrite/model/NetworkConnectionParameters.go b/plc4go/protocols/eip/readwrite/model/NetworkConnectionParameters.go
index d4efc78bf14..b190a4f8248 100644
--- a/plc4go/protocols/eip/readwrite/model/NetworkConnectionParameters.go
+++ b/plc4go/protocols/eip/readwrite/model/NetworkConnectionParameters.go
@@ -270,7 +270,7 @@ func NetworkConnectionParametersParseWithBufferProducer() func(ctx context.Conte
 }
 
 func NetworkConnectionParametersParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (NetworkConnectionParameters, error) {
-	v, err := (&_NetworkConnectionParameters{}).parse(ctx, readBuffer)
+	v, err := (new(_NetworkConnectionParameters)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/eip/readwrite/model/PathSegment.go b/plc4go/protocols/eip/readwrite/model/PathSegment.go
index 1908b3b152d..80d6785c962 100644
--- a/plc4go/protocols/eip/readwrite/model/PathSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/PathSegment.go
@@ -265,7 +265,7 @@ func PathSegmentParseWithBufferProducer[T PathSegment]() func(ctx context.Contex
 }
 
 func PathSegmentParseWithBuffer[T PathSegment](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_PathSegment{}).parse(ctx, readBuffer)
+	v, err := (new(_PathSegment)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/eip/readwrite/model/PortSegmentType.go b/plc4go/protocols/eip/readwrite/model/PortSegmentType.go
index c282563f5fa..709cae254ea 100644
--- a/plc4go/protocols/eip/readwrite/model/PortSegmentType.go
+++ b/plc4go/protocols/eip/readwrite/model/PortSegmentType.go
@@ -253,7 +253,7 @@ func PortSegmentTypeParseWithBufferProducer[T PortSegmentType]() func(ctx contex
 }
 
 func PortSegmentTypeParseWithBuffer[T PortSegmentType](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_PortSegmentType{}).parse(ctx, readBuffer)
+	v, err := (new(_PortSegmentType)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/eip/readwrite/model/Services.go b/plc4go/protocols/eip/readwrite/model/Services.go
index ffb41bef5fd..218a7291a7a 100644
--- a/plc4go/protocols/eip/readwrite/model/Services.go
+++ b/plc4go/protocols/eip/readwrite/model/Services.go
@@ -54,16 +54,13 @@ type Services interface {
 type _Services struct {
 	Offsets  []uint16
 	Services []CipService
-
-	// Arguments.
-	ServicesLen uint16
 }
 
 var _ Services = (*_Services)(nil)
 
 // NewServices factory function for _Services
-func NewServices(offsets []uint16, services []CipService, servicesLen uint16) *_Services {
-	return &_Services{Offsets: offsets, Services: services, ServicesLen: servicesLen}
+func NewServices(offsets []uint16, services []CipService) *_Services {
+	return &_Services{Offsets: offsets, Services: services}
 }
 
 ///////////////////////////////////////////////////////////
@@ -80,8 +77,6 @@ type ServicesBuilder interface {
 	WithOffsets(...uint16) ServicesBuilder
 	// WithServices adds Services (property field)
 	WithServices(...CipService) ServicesBuilder
-	// WithArgServicesLen sets a parser argument
-	WithArgServicesLen(uint16) ServicesBuilder
 	// Build builds the Services or returns an error if something is wrong
 	Build() (Services, error)
 	// MustBuild does the same as Build but panics on error
@@ -115,11 +110,6 @@ func (b *_ServicesBuilder) WithServices(services ...CipService) ServicesBuilder
 	return b
 }
 
-func (b *_ServicesBuilder) WithArgServicesLen(servicesLen uint16) ServicesBuilder {
-	b.ServicesLen = servicesLen
-	return b
-}
-
 func (b *_ServicesBuilder) Build() (Services, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -226,7 +216,7 @@ func ServicesParseWithBufferProducer(servicesLen uint16) func(ctx context.Contex
 }
 
 func ServicesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, servicesLen uint16) (Services, error) {
-	v, err := (&_Services{ServicesLen: servicesLen}).parse(ctx, readBuffer, servicesLen)
+	v, err := (new(_Services)).parse(ctx, readBuffer, servicesLen)
 	if err != nil {
 		return nil, err
 	}
@@ -302,16 +292,6 @@ func (m *_Services) SerializeWithWriteBuffer(ctx context.Context, writeBuffer ut
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_Services) GetServicesLen() uint16 {
-	return m.ServicesLen
-}
-
-//
-////
-
 func (m *_Services) IsServices() {}
 
 func (m *_Services) DeepCopy() any {
@@ -325,7 +305,6 @@ func (m *_Services) deepCopy() *_Services {
 	_ServicesCopy := &_Services{
 		utils.DeepCopySlice[uint16, uint16](m.Offsets),
 		utils.DeepCopySlice[CipService, CipService](m.Services),
-		m.ServicesLen,
 	}
 	return _ServicesCopy
 }
diff --git a/plc4go/protocols/eip/readwrite/model/SetAttributeAllRequest.go b/plc4go/protocols/eip/readwrite/model/SetAttributeAllRequest.go
index faa579edf81..403b8492137 100644
--- a/plc4go/protocols/eip/readwrite/model/SetAttributeAllRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/SetAttributeAllRequest.go
@@ -54,9 +54,9 @@ var _ SetAttributeAllRequest = (*_SetAttributeAllRequest)(nil)
 var _ CipServiceRequirements = (*_SetAttributeAllRequest)(nil)
 
 // NewSetAttributeAllRequest factory function for _SetAttributeAllRequest
-func NewSetAttributeAllRequest(serviceLen uint16) *_SetAttributeAllRequest {
+func NewSetAttributeAllRequest() *_SetAttributeAllRequest {
 	_result := &_SetAttributeAllRequest{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 	}
 	_result.CipServiceContract.(*_CipService)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/eip/readwrite/model/SetAttributeAllResponse.go b/plc4go/protocols/eip/readwrite/model/SetAttributeAllResponse.go
index f09fe89ac51..5d05177db26 100644
--- a/plc4go/protocols/eip/readwrite/model/SetAttributeAllResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/SetAttributeAllResponse.go
@@ -54,9 +54,9 @@ var _ SetAttributeAllResponse = (*_SetAttributeAllResponse)(nil)
 var _ CipServiceRequirements = (*_SetAttributeAllResponse)(nil)
 
 // NewSetAttributeAllResponse factory function for _SetAttributeAllResponse
-func NewSetAttributeAllResponse(serviceLen uint16) *_SetAttributeAllResponse {
+func NewSetAttributeAllResponse() *_SetAttributeAllResponse {
 	_result := &_SetAttributeAllResponse{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 	}
 	_result.CipServiceContract.(*_CipService)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/eip/readwrite/model/SetAttributeListRequest.go b/plc4go/protocols/eip/readwrite/model/SetAttributeListRequest.go
index 426a2631fe6..c15607c3062 100644
--- a/plc4go/protocols/eip/readwrite/model/SetAttributeListRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/SetAttributeListRequest.go
@@ -54,9 +54,9 @@ var _ SetAttributeListRequest = (*_SetAttributeListRequest)(nil)
 var _ CipServiceRequirements = (*_SetAttributeListRequest)(nil)
 
 // NewSetAttributeListRequest factory function for _SetAttributeListRequest
-func NewSetAttributeListRequest(serviceLen uint16) *_SetAttributeListRequest {
+func NewSetAttributeListRequest() *_SetAttributeListRequest {
 	_result := &_SetAttributeListRequest{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 	}
 	_result.CipServiceContract.(*_CipService)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/eip/readwrite/model/SetAttributeListResponse.go b/plc4go/protocols/eip/readwrite/model/SetAttributeListResponse.go
index 00f63db790f..07c4c185a23 100644
--- a/plc4go/protocols/eip/readwrite/model/SetAttributeListResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/SetAttributeListResponse.go
@@ -54,9 +54,9 @@ var _ SetAttributeListResponse = (*_SetAttributeListResponse)(nil)
 var _ CipServiceRequirements = (*_SetAttributeListResponse)(nil)
 
 // NewSetAttributeListResponse factory function for _SetAttributeListResponse
-func NewSetAttributeListResponse(serviceLen uint16) *_SetAttributeListResponse {
+func NewSetAttributeListResponse() *_SetAttributeListResponse {
 	_result := &_SetAttributeListResponse{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 	}
 	_result.CipServiceContract.(*_CipService)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/eip/readwrite/model/SetAttributeSingleRequest.go b/plc4go/protocols/eip/readwrite/model/SetAttributeSingleRequest.go
index b68485563ed..8c5be049b5a 100644
--- a/plc4go/protocols/eip/readwrite/model/SetAttributeSingleRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/SetAttributeSingleRequest.go
@@ -54,9 +54,9 @@ var _ SetAttributeSingleRequest = (*_SetAttributeSingleRequest)(nil)
 var _ CipServiceRequirements = (*_SetAttributeSingleRequest)(nil)
 
 // NewSetAttributeSingleRequest factory function for _SetAttributeSingleRequest
-func NewSetAttributeSingleRequest(serviceLen uint16) *_SetAttributeSingleRequest {
+func NewSetAttributeSingleRequest() *_SetAttributeSingleRequest {
 	_result := &_SetAttributeSingleRequest{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 	}
 	_result.CipServiceContract.(*_CipService)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/eip/readwrite/model/SetAttributeSingleResponse.go b/plc4go/protocols/eip/readwrite/model/SetAttributeSingleResponse.go
index 360b536b100..a9528e05627 100644
--- a/plc4go/protocols/eip/readwrite/model/SetAttributeSingleResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/SetAttributeSingleResponse.go
@@ -54,9 +54,9 @@ var _ SetAttributeSingleResponse = (*_SetAttributeSingleResponse)(nil)
 var _ CipServiceRequirements = (*_SetAttributeSingleResponse)(nil)
 
 // NewSetAttributeSingleResponse factory function for _SetAttributeSingleResponse
-func NewSetAttributeSingleResponse(serviceLen uint16) *_SetAttributeSingleResponse {
+func NewSetAttributeSingleResponse() *_SetAttributeSingleResponse {
 	_result := &_SetAttributeSingleResponse{
-		CipServiceContract: NewCipService(serviceLen),
+		CipServiceContract: NewCipService(),
 	}
 	_result.CipServiceContract.(*_CipService)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/eip/readwrite/model/TransportType.go b/plc4go/protocols/eip/readwrite/model/TransportType.go
index cd59db29515..b8d1531149f 100644
--- a/plc4go/protocols/eip/readwrite/model/TransportType.go
+++ b/plc4go/protocols/eip/readwrite/model/TransportType.go
@@ -223,7 +223,7 @@ func TransportTypeParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func TransportTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (TransportType, error) {
-	v, err := (&_TransportType{}).parse(ctx, readBuffer)
+	v, err := (new(_TransportType)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/eip/readwrite/model/TypeId.go b/plc4go/protocols/eip/readwrite/model/TypeId.go
index 813484fe56d..097e50b463d 100644
--- a/plc4go/protocols/eip/readwrite/model/TypeId.go
+++ b/plc4go/protocols/eip/readwrite/model/TypeId.go
@@ -289,7 +289,7 @@ func TypeIdParseWithBufferProducer[T TypeId]() func(ctx context.Context, readBuf
 }
 
 func TypeIdParseWithBuffer[T TypeId](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_TypeId{}).parse(ctx, readBuffer)
+	v, err := (new(_TypeId)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataCommand.go b/plc4go/protocols/firmata/readwrite/model/FirmataCommand.go
index 5bf6a68e714..f25cea6c99d 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataCommand.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataCommand.go
@@ -50,8 +50,6 @@ type FirmataCommand interface {
 
 // FirmataCommandContract provides a set of functions which can be overwritten by a sub struct
 type FirmataCommandContract interface {
-	// GetResponse() returns a parser argument
-	GetResponse() bool
 	// IsFirmataCommand is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsFirmataCommand()
 	// CreateBuilder creates a FirmataCommandBuilder
@@ -72,16 +70,13 @@ type _FirmataCommand struct {
 		FirmataCommandContract
 		FirmataCommandRequirements
 	}
-
-	// Arguments.
-	Response bool
 }
 
 var _ FirmataCommandContract = (*_FirmataCommand)(nil)
 
 // NewFirmataCommand factory function for _FirmataCommand
-func NewFirmataCommand(response bool) *_FirmataCommand {
-	return &_FirmataCommand{Response: response}
+func NewFirmataCommand() *_FirmataCommand {
+	return &_FirmataCommand{}
 }
 
 ///////////////////////////////////////////////////////////
@@ -94,8 +89,6 @@ type FirmataCommandBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
 	WithMandatoryFields() FirmataCommandBuilder
-	// WithArgResponse sets a parser argument
-	WithArgResponse(bool) FirmataCommandBuilder
 	// AsFirmataCommandSysex converts this build to a subType of FirmataCommand. It is always possible to return to current builder using Done()
 	AsFirmataCommandSysex() FirmataCommandSysexBuilder
 	// AsFirmataCommandSetPinMode converts this build to a subType of FirmataCommand. It is always possible to return to current builder using Done()
@@ -141,11 +134,6 @@ func (b *_FirmataCommandBuilder) WithMandatoryFields() FirmataCommandBuilder {
 	return b
 }
 
-func (b *_FirmataCommandBuilder) WithArgResponse(response bool) FirmataCommandBuilder {
-	b.Response = response
-	return b
-}
-
 func (b *_FirmataCommandBuilder) PartialBuild() (FirmataCommandContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -301,7 +289,7 @@ func FirmataCommandParseWithBufferProducer[T FirmataCommand](response bool) func
 }
 
 func FirmataCommandParseWithBuffer[T FirmataCommand](ctx context.Context, readBuffer utils.ReadBuffer, response bool) (T, error) {
-	v, err := (&_FirmataCommand{Response: response}).parse(ctx, readBuffer, response)
+	v, err := (new(_FirmataCommand)).parse(ctx, readBuffer, response)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -389,16 +377,6 @@ func (pm *_FirmataCommand) serializeParent(ctx context.Context, writeBuffer util
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_FirmataCommand) GetResponse() bool {
-	return m.Response
-}
-
-//
-////
-
 func (m *_FirmataCommand) IsFirmataCommand() {}
 
 func (m *_FirmataCommand) DeepCopy() any {
@@ -411,7 +389,6 @@ func (m *_FirmataCommand) deepCopy() *_FirmataCommand {
 	}
 	_FirmataCommandCopy := &_FirmataCommand{
 		nil, // will be set by child
-		m.Response,
 	}
 	return _FirmataCommandCopy
 }
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataCommandProtocolVersion.go b/plc4go/protocols/firmata/readwrite/model/FirmataCommandProtocolVersion.go
index f1f23ea6059..67315cfc36e 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataCommandProtocolVersion.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataCommandProtocolVersion.go
@@ -62,9 +62,9 @@ var _ FirmataCommandProtocolVersion = (*_FirmataCommandProtocolVersion)(nil)
 var _ FirmataCommandRequirements = (*_FirmataCommandProtocolVersion)(nil)
 
 // NewFirmataCommandProtocolVersion factory function for _FirmataCommandProtocolVersion
-func NewFirmataCommandProtocolVersion(majorVersion uint8, minorVersion uint8, response bool) *_FirmataCommandProtocolVersion {
+func NewFirmataCommandProtocolVersion(majorVersion uint8, minorVersion uint8) *_FirmataCommandProtocolVersion {
 	_result := &_FirmataCommandProtocolVersion{
-		FirmataCommandContract: NewFirmataCommand(response),
+		FirmataCommandContract: NewFirmataCommand(),
 		MajorVersion:           majorVersion,
 		MinorVersion:           minorVersion,
 	}
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go
index a100d07ab14..baf01c11c5d 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go
@@ -64,9 +64,9 @@ var _ FirmataCommandSetDigitalPinValue = (*_FirmataCommandSetDigitalPinValue)(ni
 var _ FirmataCommandRequirements = (*_FirmataCommandSetDigitalPinValue)(nil)
 
 // NewFirmataCommandSetDigitalPinValue factory function for _FirmataCommandSetDigitalPinValue
-func NewFirmataCommandSetDigitalPinValue(pin uint8, on bool, response bool) *_FirmataCommandSetDigitalPinValue {
+func NewFirmataCommandSetDigitalPinValue(pin uint8, on bool) *_FirmataCommandSetDigitalPinValue {
 	_result := &_FirmataCommandSetDigitalPinValue{
-		FirmataCommandContract: NewFirmataCommand(response),
+		FirmataCommandContract: NewFirmataCommand(),
 		Pin:                    pin,
 		On:                     on,
 	}
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetPinMode.go b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetPinMode.go
index 88f620cebe5..b7496e8507f 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetPinMode.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetPinMode.go
@@ -62,9 +62,9 @@ var _ FirmataCommandSetPinMode = (*_FirmataCommandSetPinMode)(nil)
 var _ FirmataCommandRequirements = (*_FirmataCommandSetPinMode)(nil)
 
 // NewFirmataCommandSetPinMode factory function for _FirmataCommandSetPinMode
-func NewFirmataCommandSetPinMode(pin uint8, mode PinMode, response bool) *_FirmataCommandSetPinMode {
+func NewFirmataCommandSetPinMode(pin uint8, mode PinMode) *_FirmataCommandSetPinMode {
 	_result := &_FirmataCommandSetPinMode{
-		FirmataCommandContract: NewFirmataCommand(response),
+		FirmataCommandContract: NewFirmataCommand(),
 		Pin:                    pin,
 		Mode:                   mode,
 	}
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSysex.go b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSysex.go
index 08916aed798..af89ef27770 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSysex.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSysex.go
@@ -61,12 +61,12 @@ var _ FirmataCommandSysex = (*_FirmataCommandSysex)(nil)
 var _ FirmataCommandRequirements = (*_FirmataCommandSysex)(nil)
 
 // NewFirmataCommandSysex factory function for _FirmataCommandSysex
-func NewFirmataCommandSysex(command SysexCommand, response bool) *_FirmataCommandSysex {
+func NewFirmataCommandSysex(command SysexCommand) *_FirmataCommandSysex {
 	if command == nil {
 		panic("command of type SysexCommand for FirmataCommandSysex must not be nil")
 	}
 	_result := &_FirmataCommandSysex{
-		FirmataCommandContract: NewFirmataCommand(response),
+		FirmataCommandContract: NewFirmataCommand(),
 		Command:                command,
 	}
 	_result.FirmataCommandContract.(*_FirmataCommand)._SubType = _result
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSystemReset.go b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSystemReset.go
index dc4b7dfcb6c..3e13104a4b5 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSystemReset.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSystemReset.go
@@ -54,9 +54,9 @@ var _ FirmataCommandSystemReset = (*_FirmataCommandSystemReset)(nil)
 var _ FirmataCommandRequirements = (*_FirmataCommandSystemReset)(nil)
 
 // NewFirmataCommandSystemReset factory function for _FirmataCommandSystemReset
-func NewFirmataCommandSystemReset(response bool) *_FirmataCommandSystemReset {
+func NewFirmataCommandSystemReset() *_FirmataCommandSystemReset {
 	_result := &_FirmataCommandSystemReset{
-		FirmataCommandContract: NewFirmataCommand(response),
+		FirmataCommandContract: NewFirmataCommand(),
 	}
 	_result.FirmataCommandContract.(*_FirmataCommand)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataMessage.go b/plc4go/protocols/firmata/readwrite/model/FirmataMessage.go
index 78513a4010b..b2a851c8997 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataMessage.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataMessage.go
@@ -52,8 +52,6 @@ type FirmataMessage interface {
 
 // FirmataMessageContract provides a set of functions which can be overwritten by a sub struct
 type FirmataMessageContract interface {
-	// GetResponse() returns a parser argument
-	GetResponse() bool
 	// IsFirmataMessage is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsFirmataMessage()
 	// CreateBuilder creates a FirmataMessageBuilder
@@ -74,16 +72,13 @@ type _FirmataMessage struct {
 		FirmataMessageContract
 		FirmataMessageRequirements
 	}
-
-	// Arguments.
-	Response bool
 }
 
 var _ FirmataMessageContract = (*_FirmataMessage)(nil)
 
 // NewFirmataMessage factory function for _FirmataMessage
-func NewFirmataMessage(response bool) *_FirmataMessage {
-	return &_FirmataMessage{Response: response}
+func NewFirmataMessage() *_FirmataMessage {
+	return &_FirmataMessage{}
 }
 
 ///////////////////////////////////////////////////////////
@@ -96,8 +91,6 @@ type FirmataMessageBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
 	WithMandatoryFields() FirmataMessageBuilder
-	// WithArgResponse sets a parser argument
-	WithArgResponse(bool) FirmataMessageBuilder
 	// AsFirmataMessageAnalogIO converts this build to a subType of FirmataMessage. It is always possible to return to current builder using Done()
 	AsFirmataMessageAnalogIO() FirmataMessageAnalogIOBuilder
 	// AsFirmataMessageDigitalIO converts this build to a subType of FirmataMessage. It is always possible to return to current builder using Done()
@@ -143,11 +136,6 @@ func (b *_FirmataMessageBuilder) WithMandatoryFields() FirmataMessageBuilder {
 	return b
 }
 
-func (b *_FirmataMessageBuilder) WithArgResponse(response bool) FirmataMessageBuilder {
-	b.Response = response
-	return b
-}
-
 func (b *_FirmataMessageBuilder) PartialBuild() (FirmataMessageContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -303,7 +291,7 @@ func FirmataMessageParseWithBufferProducer[T FirmataMessage](response bool) func
 }
 
 func FirmataMessageParseWithBuffer[T FirmataMessage](ctx context.Context, readBuffer utils.ReadBuffer, response bool) (T, error) {
-	v, err := (&_FirmataMessage{Response: response}).parse(ctx, readBuffer, response)
+	v, err := (new(_FirmataMessage)).parse(ctx, readBuffer, response)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -391,16 +379,6 @@ func (pm *_FirmataMessage) serializeParent(ctx context.Context, writeBuffer util
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_FirmataMessage) GetResponse() bool {
-	return m.Response
-}
-
-//
-////
-
 func (m *_FirmataMessage) IsFirmataMessage() {}
 
 func (m *_FirmataMessage) DeepCopy() any {
@@ -413,7 +391,6 @@ func (m *_FirmataMessage) deepCopy() *_FirmataMessage {
 	}
 	_FirmataMessageCopy := &_FirmataMessage{
 		nil, // will be set by child
-		m.Response,
 	}
 	return _FirmataMessageCopy
 }
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataMessageAnalogIO.go b/plc4go/protocols/firmata/readwrite/model/FirmataMessageAnalogIO.go
index 99763e00150..27fa3c43f27 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataMessageAnalogIO.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataMessageAnalogIO.go
@@ -64,9 +64,9 @@ var _ FirmataMessageAnalogIO = (*_FirmataMessageAnalogIO)(nil)
 var _ FirmataMessageRequirements = (*_FirmataMessageAnalogIO)(nil)
 
 // NewFirmataMessageAnalogIO factory function for _FirmataMessageAnalogIO
-func NewFirmataMessageAnalogIO(pin uint8, data []int8, response bool) *_FirmataMessageAnalogIO {
+func NewFirmataMessageAnalogIO(pin uint8, data []int8) *_FirmataMessageAnalogIO {
 	_result := &_FirmataMessageAnalogIO{
-		FirmataMessageContract: NewFirmataMessage(response),
+		FirmataMessageContract: NewFirmataMessage(),
 		Pin:                    pin,
 		Data:                   data,
 	}
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataMessageCommand.go b/plc4go/protocols/firmata/readwrite/model/FirmataMessageCommand.go
index fd134e6bf94..cea37681ffb 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataMessageCommand.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataMessageCommand.go
@@ -61,12 +61,12 @@ var _ FirmataMessageCommand = (*_FirmataMessageCommand)(nil)
 var _ FirmataMessageRequirements = (*_FirmataMessageCommand)(nil)
 
 // NewFirmataMessageCommand factory function for _FirmataMessageCommand
-func NewFirmataMessageCommand(command FirmataCommand, response bool) *_FirmataMessageCommand {
+func NewFirmataMessageCommand(command FirmataCommand) *_FirmataMessageCommand {
 	if command == nil {
 		panic("command of type FirmataCommand for FirmataMessageCommand must not be nil")
 	}
 	_result := &_FirmataMessageCommand{
-		FirmataMessageContract: NewFirmataMessage(response),
+		FirmataMessageContract: NewFirmataMessage(),
 		Command:                command,
 	}
 	_result.FirmataMessageContract.(*_FirmataMessage)._SubType = _result
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataMessageDigitalIO.go b/plc4go/protocols/firmata/readwrite/model/FirmataMessageDigitalIO.go
index c55dc0255f4..84eeb6b694f 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataMessageDigitalIO.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataMessageDigitalIO.go
@@ -64,9 +64,9 @@ var _ FirmataMessageDigitalIO = (*_FirmataMessageDigitalIO)(nil)
 var _ FirmataMessageRequirements = (*_FirmataMessageDigitalIO)(nil)
 
 // NewFirmataMessageDigitalIO factory function for _FirmataMessageDigitalIO
-func NewFirmataMessageDigitalIO(pinBlock uint8, data []int8, response bool) *_FirmataMessageDigitalIO {
+func NewFirmataMessageDigitalIO(pinBlock uint8, data []int8) *_FirmataMessageDigitalIO {
 	_result := &_FirmataMessageDigitalIO{
-		FirmataMessageContract: NewFirmataMessage(response),
+		FirmataMessageContract: NewFirmataMessage(),
 		PinBlock:               pinBlock,
 		Data:                   data,
 	}
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go b/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go
index e7dc94e070e..0e6de885fb7 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go
@@ -66,9 +66,9 @@ var _ FirmataMessageSubscribeAnalogPinValue = (*_FirmataMessageSubscribeAnalogPi
 var _ FirmataMessageRequirements = (*_FirmataMessageSubscribeAnalogPinValue)(nil)
 
 // NewFirmataMessageSubscribeAnalogPinValue factory function for _FirmataMessageSubscribeAnalogPinValue
-func NewFirmataMessageSubscribeAnalogPinValue(pin uint8, enable bool, response bool) *_FirmataMessageSubscribeAnalogPinValue {
+func NewFirmataMessageSubscribeAnalogPinValue(pin uint8, enable bool) *_FirmataMessageSubscribeAnalogPinValue {
 	_result := &_FirmataMessageSubscribeAnalogPinValue{
-		FirmataMessageContract: NewFirmataMessage(response),
+		FirmataMessageContract: NewFirmataMessage(),
 		Pin:                    pin,
 		Enable:                 enable,
 	}
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go b/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go
index 8568c23e3dd..747924f4361 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go
@@ -66,9 +66,9 @@ var _ FirmataMessageSubscribeDigitalPinValue = (*_FirmataMessageSubscribeDigital
 var _ FirmataMessageRequirements = (*_FirmataMessageSubscribeDigitalPinValue)(nil)
 
 // NewFirmataMessageSubscribeDigitalPinValue factory function for _FirmataMessageSubscribeDigitalPinValue
-func NewFirmataMessageSubscribeDigitalPinValue(pin uint8, enable bool, response bool) *_FirmataMessageSubscribeDigitalPinValue {
+func NewFirmataMessageSubscribeDigitalPinValue(pin uint8, enable bool) *_FirmataMessageSubscribeDigitalPinValue {
 	_result := &_FirmataMessageSubscribeDigitalPinValue{
-		FirmataMessageContract: NewFirmataMessage(response),
+		FirmataMessageContract: NewFirmataMessage(),
 		Pin:                    pin,
 		Enable:                 enable,
 	}
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommand.go b/plc4go/protocols/firmata/readwrite/model/SysexCommand.go
index 7948bdaa6aa..6cd191086cd 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommand.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommand.go
@@ -411,7 +411,7 @@ func SysexCommandParseWithBufferProducer[T SysexCommand](response bool) func(ctx
 }
 
 func SysexCommandParseWithBuffer[T SysexCommand](ctx context.Context, readBuffer utils.ReadBuffer, response bool) (T, error) {
-	v, err := (&_SysexCommand{}).parse(ctx, readBuffer, response)
+	v, err := (new(_SysexCommand)).parse(ctx, readBuffer, response)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/knxnetip/readwrite/model/Apdu.go b/plc4go/protocols/knxnetip/readwrite/model/Apdu.go
index 338da6688bf..02af4081128 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/Apdu.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/Apdu.go
@@ -54,8 +54,6 @@ type ApduContract interface {
 	GetNumbered() bool
 	// GetCounter returns Counter (property field)
 	GetCounter() uint8
-	// GetDataLength() returns a parser argument
-	GetDataLength() uint8
 	// IsApdu is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsApdu()
 	// CreateBuilder creates a ApduBuilder
@@ -78,16 +76,13 @@ type _Apdu struct {
 	}
 	Numbered bool
 	Counter  uint8
-
-	// Arguments.
-	DataLength uint8
 }
 
 var _ ApduContract = (*_Apdu)(nil)
 
 // NewApdu factory function for _Apdu
-func NewApdu(numbered bool, counter uint8, dataLength uint8) *_Apdu {
-	return &_Apdu{Numbered: numbered, Counter: counter, DataLength: dataLength}
+func NewApdu(numbered bool, counter uint8) *_Apdu {
+	return &_Apdu{Numbered: numbered, Counter: counter}
 }
 
 ///////////////////////////////////////////////////////////
@@ -104,8 +99,6 @@ type ApduBuilder interface {
 	WithNumbered(bool) ApduBuilder
 	// WithCounter adds Counter (property field)
 	WithCounter(uint8) ApduBuilder
-	// WithArgDataLength sets a parser argument
-	WithArgDataLength(uint8) ApduBuilder
 	// AsApduControlContainer converts this build to a subType of Apdu. It is always possible to return to current builder using Done()
 	AsApduControlContainer() ApduControlContainerBuilder
 	// AsApduDataContainer converts this build to a subType of Apdu. It is always possible to return to current builder using Done()
@@ -155,11 +148,6 @@ func (b *_ApduBuilder) WithCounter(counter uint8) ApduBuilder {
 	return b
 }
 
-func (b *_ApduBuilder) WithArgDataLength(dataLength uint8) ApduBuilder {
-	b.DataLength = dataLength
-	return b
-}
-
 func (b *_ApduBuilder) PartialBuild() (ApduContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -309,7 +297,7 @@ func ApduParseWithBufferProducer[T Apdu](dataLength uint8) func(ctx context.Cont
 }
 
 func ApduParseWithBuffer[T Apdu](ctx context.Context, readBuffer utils.ReadBuffer, dataLength uint8) (T, error) {
-	v, err := (&_Apdu{DataLength: dataLength}).parse(ctx, readBuffer, dataLength)
+	v, err := (new(_Apdu)).parse(ctx, readBuffer, dataLength)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -405,16 +393,6 @@ func (pm *_Apdu) serializeParent(ctx context.Context, writeBuffer utils.WriteBuf
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_Apdu) GetDataLength() uint8 {
-	return m.DataLength
-}
-
-//
-////
-
 func (m *_Apdu) IsApdu() {}
 
 func (m *_Apdu) DeepCopy() any {
@@ -429,7 +407,6 @@ func (m *_Apdu) deepCopy() *_Apdu {
 		nil, // will be set by child
 		m.Numbered,
 		m.Counter,
-		m.DataLength,
 	}
 	return _ApduCopy
 }
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduControl.go b/plc4go/protocols/knxnetip/readwrite/model/ApduControl.go
index 74b7d3765b2..da2ee7879a0 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduControl.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduControl.go
@@ -277,7 +277,7 @@ func ApduControlParseWithBufferProducer[T ApduControl]() func(ctx context.Contex
 }
 
 func ApduControlParseWithBuffer[T ApduControl](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_ApduControl{}).parse(ctx, readBuffer)
+	v, err := (new(_ApduControl)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduControlContainer.go b/plc4go/protocols/knxnetip/readwrite/model/ApduControlContainer.go
index 2bb5154ab23..aaf023892c5 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduControlContainer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduControlContainer.go
@@ -59,12 +59,12 @@ var _ ApduControlContainer = (*_ApduControlContainer)(nil)
 var _ ApduRequirements = (*_ApduControlContainer)(nil)
 
 // NewApduControlContainer factory function for _ApduControlContainer
-func NewApduControlContainer(numbered bool, counter uint8, controlApdu ApduControl, dataLength uint8) *_ApduControlContainer {
+func NewApduControlContainer(numbered bool, counter uint8, controlApdu ApduControl) *_ApduControlContainer {
 	if controlApdu == nil {
 		panic("controlApdu of type ApduControl for ApduControlContainer must not be nil")
 	}
 	_result := &_ApduControlContainer{
-		ApduContract: NewApdu(numbered, counter, dataLength),
+		ApduContract: NewApdu(numbered, counter),
 		ControlApdu:  controlApdu,
 	}
 	_result.ApduContract.(*_Apdu)._SubType = _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduData.go b/plc4go/protocols/knxnetip/readwrite/model/ApduData.go
index 4370f3939fa..332e79002a7 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduData.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduData.go
@@ -50,8 +50,6 @@ type ApduData interface {
 
 // ApduDataContract provides a set of functions which can be overwritten by a sub struct
 type ApduDataContract interface {
-	// GetDataLength() returns a parser argument
-	GetDataLength() uint8
 	// IsApduData is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsApduData()
 	// CreateBuilder creates a ApduDataBuilder
@@ -72,16 +70,13 @@ type _ApduData struct {
 		ApduDataContract
 		ApduDataRequirements
 	}
-
-	// Arguments.
-	DataLength uint8
 }
 
 var _ ApduDataContract = (*_ApduData)(nil)
 
 // NewApduData factory function for _ApduData
-func NewApduData(dataLength uint8) *_ApduData {
-	return &_ApduData{DataLength: dataLength}
+func NewApduData() *_ApduData {
+	return &_ApduData{}
 }
 
 ///////////////////////////////////////////////////////////
@@ -94,8 +89,6 @@ type ApduDataBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
 	WithMandatoryFields() ApduDataBuilder
-	// WithArgDataLength sets a parser argument
-	WithArgDataLength(uint8) ApduDataBuilder
 	// AsApduDataGroupValueRead converts this build to a subType of ApduData. It is always possible to return to current builder using Done()
 	AsApduDataGroupValueRead() ApduDataGroupValueReadBuilder
 	// AsApduDataGroupValueResponse converts this build to a subType of ApduData. It is always possible to return to current builder using Done()
@@ -163,11 +156,6 @@ func (b *_ApduDataBuilder) WithMandatoryFields() ApduDataBuilder {
 	return b
 }
 
-func (b *_ApduDataBuilder) WithArgDataLength(dataLength uint8) ApduDataBuilder {
-	b.DataLength = dataLength
-	return b
-}
-
 func (b *_ApduDataBuilder) PartialBuild() (ApduDataContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -433,7 +421,7 @@ func ApduDataParseWithBufferProducer[T ApduData](dataLength uint8) func(ctx cont
 }
 
 func ApduDataParseWithBuffer[T ApduData](ctx context.Context, readBuffer utils.ReadBuffer, dataLength uint8) (T, error) {
-	v, err := (&_ApduData{DataLength: dataLength}).parse(ctx, readBuffer, dataLength)
+	v, err := (new(_ApduData)).parse(ctx, readBuffer, dataLength)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -565,16 +553,6 @@ func (pm *_ApduData) serializeParent(ctx context.Context, writeBuffer utils.Writ
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_ApduData) GetDataLength() uint8 {
-	return m.DataLength
-}
-
-//
-////
-
 func (m *_ApduData) IsApduData() {}
 
 func (m *_ApduData) DeepCopy() any {
@@ -587,7 +565,6 @@ func (m *_ApduData) deepCopy() *_ApduData {
 	}
 	_ApduDataCopy := &_ApduData{
 		nil, // will be set by child
-		m.DataLength,
 	}
 	return _ApduDataCopy
 }
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcRead.go
index dd682de74d7..00519f150fc 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcRead.go
@@ -54,9 +54,9 @@ var _ ApduDataAdcRead = (*_ApduDataAdcRead)(nil)
 var _ ApduDataRequirements = (*_ApduDataAdcRead)(nil)
 
 // NewApduDataAdcRead factory function for _ApduDataAdcRead
-func NewApduDataAdcRead(dataLength uint8) *_ApduDataAdcRead {
+func NewApduDataAdcRead() *_ApduDataAdcRead {
 	_result := &_ApduDataAdcRead{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 	}
 	_result.ApduDataContract.(*_ApduData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcResponse.go
index d7dcdda54b0..704cc81b8c0 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcResponse.go
@@ -54,9 +54,9 @@ var _ ApduDataAdcResponse = (*_ApduDataAdcResponse)(nil)
 var _ ApduDataRequirements = (*_ApduDataAdcResponse)(nil)
 
 // NewApduDataAdcResponse factory function for _ApduDataAdcResponse
-func NewApduDataAdcResponse(dataLength uint8) *_ApduDataAdcResponse {
+func NewApduDataAdcResponse() *_ApduDataAdcResponse {
 	_result := &_ApduDataAdcResponse{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 	}
 	_result.ApduDataContract.(*_ApduData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataContainer.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataContainer.go
index 634339d2e3e..5e6e0c1b120 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataContainer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataContainer.go
@@ -59,12 +59,12 @@ var _ ApduDataContainer = (*_ApduDataContainer)(nil)
 var _ ApduRequirements = (*_ApduDataContainer)(nil)
 
 // NewApduDataContainer factory function for _ApduDataContainer
-func NewApduDataContainer(numbered bool, counter uint8, dataApdu ApduData, dataLength uint8) *_ApduDataContainer {
+func NewApduDataContainer(numbered bool, counter uint8, dataApdu ApduData) *_ApduDataContainer {
 	if dataApdu == nil {
 		panic("dataApdu of type ApduData for ApduDataContainer must not be nil")
 	}
 	_result := &_ApduDataContainer{
-		ApduContract: NewApdu(numbered, counter, dataLength),
+		ApduContract: NewApdu(numbered, counter),
 		DataApdu:     dataApdu,
 	}
 	_result.ApduContract.(*_Apdu)._SubType = _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go
index 208a7f83f82..66e82c2e63a 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go
@@ -59,9 +59,9 @@ var _ ApduDataDeviceDescriptorRead = (*_ApduDataDeviceDescriptorRead)(nil)
 var _ ApduDataRequirements = (*_ApduDataDeviceDescriptorRead)(nil)
 
 // NewApduDataDeviceDescriptorRead factory function for _ApduDataDeviceDescriptorRead
-func NewApduDataDeviceDescriptorRead(descriptorType uint8, dataLength uint8) *_ApduDataDeviceDescriptorRead {
+func NewApduDataDeviceDescriptorRead(descriptorType uint8) *_ApduDataDeviceDescriptorRead {
 	_result := &_ApduDataDeviceDescriptorRead{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 		DescriptorType:   descriptorType,
 	}
 	_result.ApduDataContract.(*_ApduData)._SubType = _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
index 4aad994b49d..4240caba9e1 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
@@ -62,9 +62,9 @@ var _ ApduDataDeviceDescriptorResponse = (*_ApduDataDeviceDescriptorResponse)(ni
 var _ ApduDataRequirements = (*_ApduDataDeviceDescriptorResponse)(nil)
 
 // NewApduDataDeviceDescriptorResponse factory function for _ApduDataDeviceDescriptorResponse
-func NewApduDataDeviceDescriptorResponse(descriptorType uint8, data []byte, dataLength uint8) *_ApduDataDeviceDescriptorResponse {
+func NewApduDataDeviceDescriptorResponse(descriptorType uint8, data []byte) *_ApduDataDeviceDescriptorResponse {
 	_result := &_ApduDataDeviceDescriptorResponse{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 		DescriptorType:   descriptorType,
 		Data:             data,
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExt.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExt.go
index 8716955a5f9..e2fa6bf98f8 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExt.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExt.go
@@ -50,8 +50,6 @@ type ApduDataExt interface {
 
 // ApduDataExtContract provides a set of functions which can be overwritten by a sub struct
 type ApduDataExtContract interface {
-	// GetLength() returns a parser argument
-	GetLength() uint8
 	// IsApduDataExt is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsApduDataExt()
 	// CreateBuilder creates a ApduDataExtBuilder
@@ -72,16 +70,13 @@ type _ApduDataExt struct {
 		ApduDataExtContract
 		ApduDataExtRequirements
 	}
-
-	// Arguments.
-	Length uint8
 }
 
 var _ ApduDataExtContract = (*_ApduDataExt)(nil)
 
 // NewApduDataExt factory function for _ApduDataExt
-func NewApduDataExt(length uint8) *_ApduDataExt {
-	return &_ApduDataExt{Length: length}
+func NewApduDataExt() *_ApduDataExt {
+	return &_ApduDataExt{}
 }
 
 ///////////////////////////////////////////////////////////
@@ -94,8 +89,6 @@ type ApduDataExtBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
 	WithMandatoryFields() ApduDataExtBuilder
-	// WithArgLength sets a parser argument
-	WithArgLength(uint8) ApduDataExtBuilder
 	// AsApduDataExtOpenRoutingTableRequest converts this build to a subType of ApduDataExt. It is always possible to return to current builder using Done()
 	AsApduDataExtOpenRoutingTableRequest() ApduDataExtOpenRoutingTableRequestBuilder
 	// AsApduDataExtReadRoutingTableRequest converts this build to a subType of ApduDataExt. It is always possible to return to current builder using Done()
@@ -213,11 +206,6 @@ func (b *_ApduDataExtBuilder) WithMandatoryFields() ApduDataExtBuilder {
 	return b
 }
 
-func (b *_ApduDataExtBuilder) WithArgLength(length uint8) ApduDataExtBuilder {
-	b.Length = length
-	return b
-}
-
 func (b *_ApduDataExtBuilder) PartialBuild() (ApduDataExtContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -733,7 +721,7 @@ func ApduDataExtParseWithBufferProducer[T ApduDataExt](length uint8) func(ctx co
 }
 
 func ApduDataExtParseWithBuffer[T ApduDataExt](ctx context.Context, readBuffer utils.ReadBuffer, length uint8) (T, error) {
-	v, err := (&_ApduDataExt{Length: length}).parse(ctx, readBuffer, length)
+	v, err := (new(_ApduDataExt)).parse(ctx, readBuffer, length)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -965,16 +953,6 @@ func (pm *_ApduDataExt) serializeParent(ctx context.Context, writeBuffer utils.W
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_ApduDataExt) GetLength() uint8 {
-	return m.Length
-}
-
-//
-////
-
 func (m *_ApduDataExt) IsApduDataExt() {}
 
 func (m *_ApduDataExt) DeepCopy() any {
@@ -987,7 +965,6 @@ func (m *_ApduDataExt) deepCopy() *_ApduDataExt {
 	}
 	_ApduDataExtCopy := &_ApduDataExt{
 		nil, // will be set by child
-		m.Length,
 	}
 	return _ApduDataExtCopy
 }
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go
index 52c135c9885..70d178e2454 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go
@@ -62,9 +62,9 @@ var _ ApduDataExtAuthorizeRequest = (*_ApduDataExtAuthorizeRequest)(nil)
 var _ ApduDataExtRequirements = (*_ApduDataExtAuthorizeRequest)(nil)
 
 // NewApduDataExtAuthorizeRequest factory function for _ApduDataExtAuthorizeRequest
-func NewApduDataExtAuthorizeRequest(level uint8, data []byte, length uint8) *_ApduDataExtAuthorizeRequest {
+func NewApduDataExtAuthorizeRequest(level uint8, data []byte) *_ApduDataExtAuthorizeRequest {
 	_result := &_ApduDataExtAuthorizeRequest{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 		Level:               level,
 		Data:                data,
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go
index b31c5b43596..e411d0cf500 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go
@@ -59,9 +59,9 @@ var _ ApduDataExtAuthorizeResponse = (*_ApduDataExtAuthorizeResponse)(nil)
 var _ ApduDataExtRequirements = (*_ApduDataExtAuthorizeResponse)(nil)
 
 // NewApduDataExtAuthorizeResponse factory function for _ApduDataExtAuthorizeResponse
-func NewApduDataExtAuthorizeResponse(level uint8, length uint8) *_ApduDataExtAuthorizeResponse {
+func NewApduDataExtAuthorizeResponse(level uint8) *_ApduDataExtAuthorizeResponse {
 	_result := &_ApduDataExtAuthorizeResponse{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 		Level:               level,
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go
index 2ace77a26fb..5d2f04d952b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go
@@ -54,9 +54,9 @@ var _ ApduDataExtDomainAddressRead = (*_ApduDataExtDomainAddressRead)(nil)
 var _ ApduDataExtRequirements = (*_ApduDataExtDomainAddressRead)(nil)
 
 // NewApduDataExtDomainAddressRead factory function for _ApduDataExtDomainAddressRead
-func NewApduDataExtDomainAddressRead(length uint8) *_ApduDataExtDomainAddressRead {
+func NewApduDataExtDomainAddressRead() *_ApduDataExtDomainAddressRead {
 	_result := &_ApduDataExtDomainAddressRead{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go
index 518520fbb68..90430f94d91 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go
@@ -54,9 +54,9 @@ var _ ApduDataExtDomainAddressResponse = (*_ApduDataExtDomainAddressResponse)(ni
 var _ ApduDataExtRequirements = (*_ApduDataExtDomainAddressResponse)(nil)
 
 // NewApduDataExtDomainAddressResponse factory function for _ApduDataExtDomainAddressResponse
-func NewApduDataExtDomainAddressResponse(length uint8) *_ApduDataExtDomainAddressResponse {
+func NewApduDataExtDomainAddressResponse() *_ApduDataExtDomainAddressResponse {
 	_result := &_ApduDataExtDomainAddressResponse{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go
index af2342203c6..df733fd0555 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go
@@ -54,9 +54,9 @@ var _ ApduDataExtDomainAddressSelectiveRead = (*_ApduDataExtDomainAddressSelecti
 var _ ApduDataExtRequirements = (*_ApduDataExtDomainAddressSelectiveRead)(nil)
 
 // NewApduDataExtDomainAddressSelectiveRead factory function for _ApduDataExtDomainAddressSelectiveRead
-func NewApduDataExtDomainAddressSelectiveRead(length uint8) *_ApduDataExtDomainAddressSelectiveRead {
+func NewApduDataExtDomainAddressSelectiveRead() *_ApduDataExtDomainAddressSelectiveRead {
 	_result := &_ApduDataExtDomainAddressSelectiveRead{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go
index d34ebb7bd52..a6683ea6ed7 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go
@@ -54,9 +54,9 @@ var _ ApduDataExtDomainAddressSerialNumberRead = (*_ApduDataExtDomainAddressSeri
 var _ ApduDataExtRequirements = (*_ApduDataExtDomainAddressSerialNumberRead)(nil)
 
 // NewApduDataExtDomainAddressSerialNumberRead factory function for _ApduDataExtDomainAddressSerialNumberRead
-func NewApduDataExtDomainAddressSerialNumberRead(length uint8) *_ApduDataExtDomainAddressSerialNumberRead {
+func NewApduDataExtDomainAddressSerialNumberRead() *_ApduDataExtDomainAddressSerialNumberRead {
 	_result := &_ApduDataExtDomainAddressSerialNumberRead{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go
index 3695cdebcd2..95e7031e86a 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go
@@ -54,9 +54,9 @@ var _ ApduDataExtDomainAddressSerialNumberResponse = (*_ApduDataExtDomainAddress
 var _ ApduDataExtRequirements = (*_ApduDataExtDomainAddressSerialNumberResponse)(nil)
 
 // NewApduDataExtDomainAddressSerialNumberResponse factory function for _ApduDataExtDomainAddressSerialNumberResponse
-func NewApduDataExtDomainAddressSerialNumberResponse(length uint8) *_ApduDataExtDomainAddressSerialNumberResponse {
+func NewApduDataExtDomainAddressSerialNumberResponse() *_ApduDataExtDomainAddressSerialNumberResponse {
 	_result := &_ApduDataExtDomainAddressSerialNumberResponse{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go
index c04f600d7dc..7976d3ce015 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go
@@ -54,9 +54,9 @@ var _ ApduDataExtDomainAddressSerialNumberWrite = (*_ApduDataExtDomainAddressSer
 var _ ApduDataExtRequirements = (*_ApduDataExtDomainAddressSerialNumberWrite)(nil)
 
 // NewApduDataExtDomainAddressSerialNumberWrite factory function for _ApduDataExtDomainAddressSerialNumberWrite
-func NewApduDataExtDomainAddressSerialNumberWrite(length uint8) *_ApduDataExtDomainAddressSerialNumberWrite {
+func NewApduDataExtDomainAddressSerialNumberWrite() *_ApduDataExtDomainAddressSerialNumberWrite {
 	_result := &_ApduDataExtDomainAddressSerialNumberWrite{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go
index 4bc87102234..2518a205b3a 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go
@@ -54,9 +54,9 @@ var _ ApduDataExtDomainAddressWrite = (*_ApduDataExtDomainAddressWrite)(nil)
 var _ ApduDataExtRequirements = (*_ApduDataExtDomainAddressWrite)(nil)
 
 // NewApduDataExtDomainAddressWrite factory function for _ApduDataExtDomainAddressWrite
-func NewApduDataExtDomainAddressWrite(length uint8) *_ApduDataExtDomainAddressWrite {
+func NewApduDataExtDomainAddressWrite() *_ApduDataExtDomainAddressWrite {
 	_result := &_ApduDataExtDomainAddressWrite{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go
index 134a2665f7f..9edeff0efa3 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go
@@ -54,9 +54,9 @@ var _ ApduDataExtFileStreamInfoReport = (*_ApduDataExtFileStreamInfoReport)(nil)
 var _ ApduDataExtRequirements = (*_ApduDataExtFileStreamInfoReport)(nil)
 
 // NewApduDataExtFileStreamInfoReport factory function for _ApduDataExtFileStreamInfoReport
-func NewApduDataExtFileStreamInfoReport(length uint8) *_ApduDataExtFileStreamInfoReport {
+func NewApduDataExtFileStreamInfoReport() *_ApduDataExtFileStreamInfoReport {
 	_result := &_ApduDataExtFileStreamInfoReport{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go
index 019b1e709ff..d96dbd4a9a0 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go
@@ -54,9 +54,9 @@ var _ ApduDataExtGroupPropertyValueInfoReport = (*_ApduDataExtGroupPropertyValue
 var _ ApduDataExtRequirements = (*_ApduDataExtGroupPropertyValueInfoReport)(nil)
 
 // NewApduDataExtGroupPropertyValueInfoReport factory function for _ApduDataExtGroupPropertyValueInfoReport
-func NewApduDataExtGroupPropertyValueInfoReport(length uint8) *_ApduDataExtGroupPropertyValueInfoReport {
+func NewApduDataExtGroupPropertyValueInfoReport() *_ApduDataExtGroupPropertyValueInfoReport {
 	_result := &_ApduDataExtGroupPropertyValueInfoReport{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go
index a56cba0bf50..13753849710 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go
@@ -54,9 +54,9 @@ var _ ApduDataExtGroupPropertyValueRead = (*_ApduDataExtGroupPropertyValueRead)(
 var _ ApduDataExtRequirements = (*_ApduDataExtGroupPropertyValueRead)(nil)
 
 // NewApduDataExtGroupPropertyValueRead factory function for _ApduDataExtGroupPropertyValueRead
-func NewApduDataExtGroupPropertyValueRead(length uint8) *_ApduDataExtGroupPropertyValueRead {
+func NewApduDataExtGroupPropertyValueRead() *_ApduDataExtGroupPropertyValueRead {
 	_result := &_ApduDataExtGroupPropertyValueRead{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go
index 48e56b1aa57..e525dae960b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go
@@ -54,9 +54,9 @@ var _ ApduDataExtGroupPropertyValueResponse = (*_ApduDataExtGroupPropertyValueRe
 var _ ApduDataExtRequirements = (*_ApduDataExtGroupPropertyValueResponse)(nil)
 
 // NewApduDataExtGroupPropertyValueResponse factory function for _ApduDataExtGroupPropertyValueResponse
-func NewApduDataExtGroupPropertyValueResponse(length uint8) *_ApduDataExtGroupPropertyValueResponse {
+func NewApduDataExtGroupPropertyValueResponse() *_ApduDataExtGroupPropertyValueResponse {
 	_result := &_ApduDataExtGroupPropertyValueResponse{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go
index 5482c030ccc..555457f5310 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go
@@ -54,9 +54,9 @@ var _ ApduDataExtGroupPropertyValueWrite = (*_ApduDataExtGroupPropertyValueWrite
 var _ ApduDataExtRequirements = (*_ApduDataExtGroupPropertyValueWrite)(nil)
 
 // NewApduDataExtGroupPropertyValueWrite factory function for _ApduDataExtGroupPropertyValueWrite
-func NewApduDataExtGroupPropertyValueWrite(length uint8) *_ApduDataExtGroupPropertyValueWrite {
+func NewApduDataExtGroupPropertyValueWrite() *_ApduDataExtGroupPropertyValueWrite {
 	_result := &_ApduDataExtGroupPropertyValueWrite{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go
index 724027efeed..03b3ea318dc 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go
@@ -54,9 +54,9 @@ var _ ApduDataExtIndividualAddressSerialNumberRead = (*_ApduDataExtIndividualAdd
 var _ ApduDataExtRequirements = (*_ApduDataExtIndividualAddressSerialNumberRead)(nil)
 
 // NewApduDataExtIndividualAddressSerialNumberRead factory function for _ApduDataExtIndividualAddressSerialNumberRead
-func NewApduDataExtIndividualAddressSerialNumberRead(length uint8) *_ApduDataExtIndividualAddressSerialNumberRead {
+func NewApduDataExtIndividualAddressSerialNumberRead() *_ApduDataExtIndividualAddressSerialNumberRead {
 	_result := &_ApduDataExtIndividualAddressSerialNumberRead{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go
index 6203e90783d..77cd4433b12 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go
@@ -54,9 +54,9 @@ var _ ApduDataExtIndividualAddressSerialNumberResponse = (*_ApduDataExtIndividua
 var _ ApduDataExtRequirements = (*_ApduDataExtIndividualAddressSerialNumberResponse)(nil)
 
 // NewApduDataExtIndividualAddressSerialNumberResponse factory function for _ApduDataExtIndividualAddressSerialNumberResponse
-func NewApduDataExtIndividualAddressSerialNumberResponse(length uint8) *_ApduDataExtIndividualAddressSerialNumberResponse {
+func NewApduDataExtIndividualAddressSerialNumberResponse() *_ApduDataExtIndividualAddressSerialNumberResponse {
 	_result := &_ApduDataExtIndividualAddressSerialNumberResponse{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go
index 2f05bb89180..7874ccfee8d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go
@@ -54,9 +54,9 @@ var _ ApduDataExtIndividualAddressSerialNumberWrite = (*_ApduDataExtIndividualAd
 var _ ApduDataExtRequirements = (*_ApduDataExtIndividualAddressSerialNumberWrite)(nil)
 
 // NewApduDataExtIndividualAddressSerialNumberWrite factory function for _ApduDataExtIndividualAddressSerialNumberWrite
-func NewApduDataExtIndividualAddressSerialNumberWrite(length uint8) *_ApduDataExtIndividualAddressSerialNumberWrite {
+func NewApduDataExtIndividualAddressSerialNumberWrite() *_ApduDataExtIndividualAddressSerialNumberWrite {
 	_result := &_ApduDataExtIndividualAddressSerialNumberWrite{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyResponse.go
index fd8baf41a6e..020f59f380d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyResponse.go
@@ -54,9 +54,9 @@ var _ ApduDataExtKeyResponse = (*_ApduDataExtKeyResponse)(nil)
 var _ ApduDataExtRequirements = (*_ApduDataExtKeyResponse)(nil)
 
 // NewApduDataExtKeyResponse factory function for _ApduDataExtKeyResponse
-func NewApduDataExtKeyResponse(length uint8) *_ApduDataExtKeyResponse {
+func NewApduDataExtKeyResponse() *_ApduDataExtKeyResponse {
 	_result := &_ApduDataExtKeyResponse{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyWrite.go
index 00ffc2c5908..c2d82201f59 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyWrite.go
@@ -54,9 +54,9 @@ var _ ApduDataExtKeyWrite = (*_ApduDataExtKeyWrite)(nil)
 var _ ApduDataExtRequirements = (*_ApduDataExtKeyWrite)(nil)
 
 // NewApduDataExtKeyWrite factory function for _ApduDataExtKeyWrite
-func NewApduDataExtKeyWrite(length uint8) *_ApduDataExtKeyWrite {
+func NewApduDataExtKeyWrite() *_ApduDataExtKeyWrite {
 	_result := &_ApduDataExtKeyWrite{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkRead.go
index 7ebc875d4c1..88e6e772f25 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkRead.go
@@ -54,9 +54,9 @@ var _ ApduDataExtLinkRead = (*_ApduDataExtLinkRead)(nil)
 var _ ApduDataExtRequirements = (*_ApduDataExtLinkRead)(nil)
 
 // NewApduDataExtLinkRead factory function for _ApduDataExtLinkRead
-func NewApduDataExtLinkRead(length uint8) *_ApduDataExtLinkRead {
+func NewApduDataExtLinkRead() *_ApduDataExtLinkRead {
 	_result := &_ApduDataExtLinkRead{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkResponse.go
index 1c418c0d780..4a6e1341031 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkResponse.go
@@ -54,9 +54,9 @@ var _ ApduDataExtLinkResponse = (*_ApduDataExtLinkResponse)(nil)
 var _ ApduDataExtRequirements = (*_ApduDataExtLinkResponse)(nil)
 
 // NewApduDataExtLinkResponse factory function for _ApduDataExtLinkResponse
-func NewApduDataExtLinkResponse(length uint8) *_ApduDataExtLinkResponse {
+func NewApduDataExtLinkResponse() *_ApduDataExtLinkResponse {
 	_result := &_ApduDataExtLinkResponse{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkWrite.go
index 8c1b23519c4..5b5690c6cf9 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkWrite.go
@@ -54,9 +54,9 @@ var _ ApduDataExtLinkWrite = (*_ApduDataExtLinkWrite)(nil)
 var _ ApduDataExtRequirements = (*_ApduDataExtLinkWrite)(nil)
 
 // NewApduDataExtLinkWrite factory function for _ApduDataExtLinkWrite
-func NewApduDataExtLinkWrite(length uint8) *_ApduDataExtLinkWrite {
+func NewApduDataExtLinkWrite() *_ApduDataExtLinkWrite {
 	_result := &_ApduDataExtLinkWrite{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go
index 382fdf41eae..04d4946016e 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go
@@ -54,9 +54,9 @@ var _ ApduDataExtMemoryBitWrite = (*_ApduDataExtMemoryBitWrite)(nil)
 var _ ApduDataExtRequirements = (*_ApduDataExtMemoryBitWrite)(nil)
 
 // NewApduDataExtMemoryBitWrite factory function for _ApduDataExtMemoryBitWrite
-func NewApduDataExtMemoryBitWrite(length uint8) *_ApduDataExtMemoryBitWrite {
+func NewApduDataExtMemoryBitWrite() *_ApduDataExtMemoryBitWrite {
 	_result := &_ApduDataExtMemoryBitWrite{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go
index e4ad9254e7d..9dac10803c0 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go
@@ -54,9 +54,9 @@ var _ ApduDataExtNetworkParameterRead = (*_ApduDataExtNetworkParameterRead)(nil)
 var _ ApduDataExtRequirements = (*_ApduDataExtNetworkParameterRead)(nil)
 
 // NewApduDataExtNetworkParameterRead factory function for _ApduDataExtNetworkParameterRead
-func NewApduDataExtNetworkParameterRead(length uint8) *_ApduDataExtNetworkParameterRead {
+func NewApduDataExtNetworkParameterRead() *_ApduDataExtNetworkParameterRead {
 	_result := &_ApduDataExtNetworkParameterRead{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go
index a9f682d5939..56e39c613f0 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go
@@ -54,9 +54,9 @@ var _ ApduDataExtNetworkParameterResponse = (*_ApduDataExtNetworkParameterRespon
 var _ ApduDataExtRequirements = (*_ApduDataExtNetworkParameterResponse)(nil)
 
 // NewApduDataExtNetworkParameterResponse factory function for _ApduDataExtNetworkParameterResponse
-func NewApduDataExtNetworkParameterResponse(length uint8) *_ApduDataExtNetworkParameterResponse {
+func NewApduDataExtNetworkParameterResponse() *_ApduDataExtNetworkParameterResponse {
 	_result := &_ApduDataExtNetworkParameterResponse{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go
index 900da21765c..3083a04affb 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go
@@ -54,9 +54,9 @@ var _ ApduDataExtNetworkParameterWrite = (*_ApduDataExtNetworkParameterWrite)(ni
 var _ ApduDataExtRequirements = (*_ApduDataExtNetworkParameterWrite)(nil)
 
 // NewApduDataExtNetworkParameterWrite factory function for _ApduDataExtNetworkParameterWrite
-func NewApduDataExtNetworkParameterWrite(length uint8) *_ApduDataExtNetworkParameterWrite {
+func NewApduDataExtNetworkParameterWrite() *_ApduDataExtNetworkParameterWrite {
 	_result := &_ApduDataExtNetworkParameterWrite{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go
index c1b8774aceb..d6e6d69485e 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go
@@ -54,9 +54,9 @@ var _ ApduDataExtOpenRoutingTableRequest = (*_ApduDataExtOpenRoutingTableRequest
 var _ ApduDataExtRequirements = (*_ApduDataExtOpenRoutingTableRequest)(nil)
 
 // NewApduDataExtOpenRoutingTableRequest factory function for _ApduDataExtOpenRoutingTableRequest
-func NewApduDataExtOpenRoutingTableRequest(length uint8) *_ApduDataExtOpenRoutingTableRequest {
+func NewApduDataExtOpenRoutingTableRequest() *_ApduDataExtOpenRoutingTableRequest {
 	_result := &_ApduDataExtOpenRoutingTableRequest{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go
index f0daf937b30..5429ea50781 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go
@@ -65,9 +65,9 @@ var _ ApduDataExtPropertyDescriptionRead = (*_ApduDataExtPropertyDescriptionRead
 var _ ApduDataExtRequirements = (*_ApduDataExtPropertyDescriptionRead)(nil)
 
 // NewApduDataExtPropertyDescriptionRead factory function for _ApduDataExtPropertyDescriptionRead
-func NewApduDataExtPropertyDescriptionRead(objectIndex uint8, propertyId uint8, index uint8, length uint8) *_ApduDataExtPropertyDescriptionRead {
+func NewApduDataExtPropertyDescriptionRead(objectIndex uint8, propertyId uint8, index uint8) *_ApduDataExtPropertyDescriptionRead {
 	_result := &_ApduDataExtPropertyDescriptionRead{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 		ObjectIndex:         objectIndex,
 		PropertyId:          propertyId,
 		Index:               index,
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go
index 32902097dfe..552319fd831 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go
@@ -83,9 +83,9 @@ var _ ApduDataExtPropertyDescriptionResponse = (*_ApduDataExtPropertyDescription
 var _ ApduDataExtRequirements = (*_ApduDataExtPropertyDescriptionResponse)(nil)
 
 // NewApduDataExtPropertyDescriptionResponse factory function for _ApduDataExtPropertyDescriptionResponse
-func NewApduDataExtPropertyDescriptionResponse(objectIndex uint8, propertyId uint8, index uint8, writeEnabled bool, propertyDataType KnxPropertyDataType, maxNrOfElements uint16, readLevel AccessLevel, writeLevel AccessLevel, length uint8) *_ApduDataExtPropertyDescriptionResponse {
+func NewApduDataExtPropertyDescriptionResponse(objectIndex uint8, propertyId uint8, index uint8, writeEnabled bool, propertyDataType KnxPropertyDataType, maxNrOfElements uint16, readLevel AccessLevel, writeLevel AccessLevel) *_ApduDataExtPropertyDescriptionResponse {
 	_result := &_ApduDataExtPropertyDescriptionResponse{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 		ObjectIndex:         objectIndex,
 		PropertyId:          propertyId,
 		Index:               index,
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go
index 6a240dff40f..d6550aa8c77 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go
@@ -68,9 +68,9 @@ var _ ApduDataExtPropertyValueRead = (*_ApduDataExtPropertyValueRead)(nil)
 var _ ApduDataExtRequirements = (*_ApduDataExtPropertyValueRead)(nil)
 
 // NewApduDataExtPropertyValueRead factory function for _ApduDataExtPropertyValueRead
-func NewApduDataExtPropertyValueRead(objectIndex uint8, propertyId uint8, count uint8, index uint16, length uint8) *_ApduDataExtPropertyValueRead {
+func NewApduDataExtPropertyValueRead(objectIndex uint8, propertyId uint8, count uint8, index uint16) *_ApduDataExtPropertyValueRead {
 	_result := &_ApduDataExtPropertyValueRead{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 		ObjectIndex:         objectIndex,
 		PropertyId:          propertyId,
 		Count:               count,
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
index f9cff7159c0..89bc4d84dec 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
@@ -71,9 +71,9 @@ var _ ApduDataExtPropertyValueResponse = (*_ApduDataExtPropertyValueResponse)(ni
 var _ ApduDataExtRequirements = (*_ApduDataExtPropertyValueResponse)(nil)
 
 // NewApduDataExtPropertyValueResponse factory function for _ApduDataExtPropertyValueResponse
-func NewApduDataExtPropertyValueResponse(objectIndex uint8, propertyId uint8, count uint8, index uint16, data []byte, length uint8) *_ApduDataExtPropertyValueResponse {
+func NewApduDataExtPropertyValueResponse(objectIndex uint8, propertyId uint8, count uint8, index uint16, data []byte) *_ApduDataExtPropertyValueResponse {
 	_result := &_ApduDataExtPropertyValueResponse{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 		ObjectIndex:         objectIndex,
 		PropertyId:          propertyId,
 		Count:               count,
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
index 44c581ce2ba..9b52803ac0b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
@@ -71,9 +71,9 @@ var _ ApduDataExtPropertyValueWrite = (*_ApduDataExtPropertyValueWrite)(nil)
 var _ ApduDataExtRequirements = (*_ApduDataExtPropertyValueWrite)(nil)
 
 // NewApduDataExtPropertyValueWrite factory function for _ApduDataExtPropertyValueWrite
-func NewApduDataExtPropertyValueWrite(objectIndex uint8, propertyId uint8, count uint8, index uint16, data []byte, length uint8) *_ApduDataExtPropertyValueWrite {
+func NewApduDataExtPropertyValueWrite(objectIndex uint8, propertyId uint8, count uint8, index uint16, data []byte) *_ApduDataExtPropertyValueWrite {
 	_result := &_ApduDataExtPropertyValueWrite{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 		ObjectIndex:         objectIndex,
 		PropertyId:          propertyId,
 		Count:               count,
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go
index ce1b441a478..418c098447c 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go
@@ -54,9 +54,9 @@ var _ ApduDataExtReadRouterMemoryRequest = (*_ApduDataExtReadRouterMemoryRequest
 var _ ApduDataExtRequirements = (*_ApduDataExtReadRouterMemoryRequest)(nil)
 
 // NewApduDataExtReadRouterMemoryRequest factory function for _ApduDataExtReadRouterMemoryRequest
-func NewApduDataExtReadRouterMemoryRequest(length uint8) *_ApduDataExtReadRouterMemoryRequest {
+func NewApduDataExtReadRouterMemoryRequest() *_ApduDataExtReadRouterMemoryRequest {
 	_result := &_ApduDataExtReadRouterMemoryRequest{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go
index 3e41c6b4a4f..7b3081a1f86 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go
@@ -54,9 +54,9 @@ var _ ApduDataExtReadRouterMemoryResponse = (*_ApduDataExtReadRouterMemoryRespon
 var _ ApduDataExtRequirements = (*_ApduDataExtReadRouterMemoryResponse)(nil)
 
 // NewApduDataExtReadRouterMemoryResponse factory function for _ApduDataExtReadRouterMemoryResponse
-func NewApduDataExtReadRouterMemoryResponse(length uint8) *_ApduDataExtReadRouterMemoryResponse {
+func NewApduDataExtReadRouterMemoryResponse() *_ApduDataExtReadRouterMemoryResponse {
 	_result := &_ApduDataExtReadRouterMemoryResponse{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go
index e3bc3234ad5..1a4080994b9 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go
@@ -54,9 +54,9 @@ var _ ApduDataExtReadRouterStatusRequest = (*_ApduDataExtReadRouterStatusRequest
 var _ ApduDataExtRequirements = (*_ApduDataExtReadRouterStatusRequest)(nil)
 
 // NewApduDataExtReadRouterStatusRequest factory function for _ApduDataExtReadRouterStatusRequest
-func NewApduDataExtReadRouterStatusRequest(length uint8) *_ApduDataExtReadRouterStatusRequest {
+func NewApduDataExtReadRouterStatusRequest() *_ApduDataExtReadRouterStatusRequest {
 	_result := &_ApduDataExtReadRouterStatusRequest{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go
index 5d12d022b06..ca365f1b043 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go
@@ -54,9 +54,9 @@ var _ ApduDataExtReadRouterStatusResponse = (*_ApduDataExtReadRouterStatusRespon
 var _ ApduDataExtRequirements = (*_ApduDataExtReadRouterStatusResponse)(nil)
 
 // NewApduDataExtReadRouterStatusResponse factory function for _ApduDataExtReadRouterStatusResponse
-func NewApduDataExtReadRouterStatusResponse(length uint8) *_ApduDataExtReadRouterStatusResponse {
+func NewApduDataExtReadRouterStatusResponse() *_ApduDataExtReadRouterStatusResponse {
 	_result := &_ApduDataExtReadRouterStatusResponse{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go
index f565053849b..eb904c76393 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go
@@ -54,9 +54,9 @@ var _ ApduDataExtReadRoutingTableRequest = (*_ApduDataExtReadRoutingTableRequest
 var _ ApduDataExtRequirements = (*_ApduDataExtReadRoutingTableRequest)(nil)
 
 // NewApduDataExtReadRoutingTableRequest factory function for _ApduDataExtReadRoutingTableRequest
-func NewApduDataExtReadRoutingTableRequest(length uint8) *_ApduDataExtReadRoutingTableRequest {
+func NewApduDataExtReadRoutingTableRequest() *_ApduDataExtReadRoutingTableRequest {
 	_result := &_ApduDataExtReadRoutingTableRequest{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go
index 3fef1ef46f7..bb5c2fc59c8 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go
@@ -54,9 +54,9 @@ var _ ApduDataExtReadRoutingTableResponse = (*_ApduDataExtReadRoutingTableRespon
 var _ ApduDataExtRequirements = (*_ApduDataExtReadRoutingTableResponse)(nil)
 
 // NewApduDataExtReadRoutingTableResponse factory function for _ApduDataExtReadRoutingTableResponse
-func NewApduDataExtReadRoutingTableResponse(length uint8) *_ApduDataExtReadRoutingTableResponse {
+func NewApduDataExtReadRoutingTableResponse() *_ApduDataExtReadRoutingTableResponse {
 	_result := &_ApduDataExtReadRoutingTableResponse{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go
index 79cce6f99ab..49f72986878 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go
@@ -54,9 +54,9 @@ var _ ApduDataExtWriteRouterMemoryRequest = (*_ApduDataExtWriteRouterMemoryReque
 var _ ApduDataExtRequirements = (*_ApduDataExtWriteRouterMemoryRequest)(nil)
 
 // NewApduDataExtWriteRouterMemoryRequest factory function for _ApduDataExtWriteRouterMemoryRequest
-func NewApduDataExtWriteRouterMemoryRequest(length uint8) *_ApduDataExtWriteRouterMemoryRequest {
+func NewApduDataExtWriteRouterMemoryRequest() *_ApduDataExtWriteRouterMemoryRequest {
 	_result := &_ApduDataExtWriteRouterMemoryRequest{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go
index 1c4f23ce79c..0888bbb9d9f 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go
@@ -54,9 +54,9 @@ var _ ApduDataExtWriteRouterStatusRequest = (*_ApduDataExtWriteRouterStatusReque
 var _ ApduDataExtRequirements = (*_ApduDataExtWriteRouterStatusRequest)(nil)
 
 // NewApduDataExtWriteRouterStatusRequest factory function for _ApduDataExtWriteRouterStatusRequest
-func NewApduDataExtWriteRouterStatusRequest(length uint8) *_ApduDataExtWriteRouterStatusRequest {
+func NewApduDataExtWriteRouterStatusRequest() *_ApduDataExtWriteRouterStatusRequest {
 	_result := &_ApduDataExtWriteRouterStatusRequest{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go
index edf40ef7282..42e5d71ba76 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go
@@ -54,9 +54,9 @@ var _ ApduDataExtWriteRoutingTableRequest = (*_ApduDataExtWriteRoutingTableReque
 var _ ApduDataExtRequirements = (*_ApduDataExtWriteRoutingTableRequest)(nil)
 
 // NewApduDataExtWriteRoutingTableRequest factory function for _ApduDataExtWriteRoutingTableRequest
-func NewApduDataExtWriteRoutingTableRequest(length uint8) *_ApduDataExtWriteRoutingTableRequest {
+func NewApduDataExtWriteRoutingTableRequest() *_ApduDataExtWriteRoutingTableRequest {
 	_result := &_ApduDataExtWriteRoutingTableRequest{
-		ApduDataExtContract: NewApduDataExt(length),
+		ApduDataExtContract: NewApduDataExt(),
 	}
 	_result.ApduDataExtContract.(*_ApduDataExt)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueRead.go
index fe0b28d59c3..4eb66ab0544 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueRead.go
@@ -58,9 +58,9 @@ var _ ApduDataGroupValueRead = (*_ApduDataGroupValueRead)(nil)
 var _ ApduDataRequirements = (*_ApduDataGroupValueRead)(nil)
 
 // NewApduDataGroupValueRead factory function for _ApduDataGroupValueRead
-func NewApduDataGroupValueRead(dataLength uint8) *_ApduDataGroupValueRead {
+func NewApduDataGroupValueRead() *_ApduDataGroupValueRead {
 	_result := &_ApduDataGroupValueRead{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 	}
 	_result.ApduDataContract.(*_ApduData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
index 0cf29577136..d8bd801d0ab 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
@@ -62,9 +62,9 @@ var _ ApduDataGroupValueResponse = (*_ApduDataGroupValueResponse)(nil)
 var _ ApduDataRequirements = (*_ApduDataGroupValueResponse)(nil)
 
 // NewApduDataGroupValueResponse factory function for _ApduDataGroupValueResponse
-func NewApduDataGroupValueResponse(dataFirstByte int8, data []byte, dataLength uint8) *_ApduDataGroupValueResponse {
+func NewApduDataGroupValueResponse(dataFirstByte int8, data []byte) *_ApduDataGroupValueResponse {
 	_result := &_ApduDataGroupValueResponse{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 		DataFirstByte:    dataFirstByte,
 		Data:             data,
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
index b557a28d13b..5467690fb73 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
@@ -62,9 +62,9 @@ var _ ApduDataGroupValueWrite = (*_ApduDataGroupValueWrite)(nil)
 var _ ApduDataRequirements = (*_ApduDataGroupValueWrite)(nil)
 
 // NewApduDataGroupValueWrite factory function for _ApduDataGroupValueWrite
-func NewApduDataGroupValueWrite(dataFirstByte int8, data []byte, dataLength uint8) *_ApduDataGroupValueWrite {
+func NewApduDataGroupValueWrite(dataFirstByte int8, data []byte) *_ApduDataGroupValueWrite {
 	_result := &_ApduDataGroupValueWrite{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 		DataFirstByte:    dataFirstByte,
 		Data:             data,
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go
index dc86fb8de55..985885a7301 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go
@@ -54,9 +54,9 @@ var _ ApduDataIndividualAddressRead = (*_ApduDataIndividualAddressRead)(nil)
 var _ ApduDataRequirements = (*_ApduDataIndividualAddressRead)(nil)
 
 // NewApduDataIndividualAddressRead factory function for _ApduDataIndividualAddressRead
-func NewApduDataIndividualAddressRead(dataLength uint8) *_ApduDataIndividualAddressRead {
+func NewApduDataIndividualAddressRead() *_ApduDataIndividualAddressRead {
 	_result := &_ApduDataIndividualAddressRead{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 	}
 	_result.ApduDataContract.(*_ApduData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go
index 8ef107859bf..c46aaf611c0 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go
@@ -54,9 +54,9 @@ var _ ApduDataIndividualAddressResponse = (*_ApduDataIndividualAddressResponse)(
 var _ ApduDataRequirements = (*_ApduDataIndividualAddressResponse)(nil)
 
 // NewApduDataIndividualAddressResponse factory function for _ApduDataIndividualAddressResponse
-func NewApduDataIndividualAddressResponse(dataLength uint8) *_ApduDataIndividualAddressResponse {
+func NewApduDataIndividualAddressResponse() *_ApduDataIndividualAddressResponse {
 	_result := &_ApduDataIndividualAddressResponse{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 	}
 	_result.ApduDataContract.(*_ApduData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go
index ce3a2982793..72c9ed9f681 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go
@@ -54,9 +54,9 @@ var _ ApduDataIndividualAddressWrite = (*_ApduDataIndividualAddressWrite)(nil)
 var _ ApduDataRequirements = (*_ApduDataIndividualAddressWrite)(nil)
 
 // NewApduDataIndividualAddressWrite factory function for _ApduDataIndividualAddressWrite
-func NewApduDataIndividualAddressWrite(dataLength uint8) *_ApduDataIndividualAddressWrite {
+func NewApduDataIndividualAddressWrite() *_ApduDataIndividualAddressWrite {
 	_result := &_ApduDataIndividualAddressWrite{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 	}
 	_result.ApduDataContract.(*_ApduData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryRead.go
index 17453e9d34c..ac94a020ecc 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryRead.go
@@ -62,9 +62,9 @@ var _ ApduDataMemoryRead = (*_ApduDataMemoryRead)(nil)
 var _ ApduDataRequirements = (*_ApduDataMemoryRead)(nil)
 
 // NewApduDataMemoryRead factory function for _ApduDataMemoryRead
-func NewApduDataMemoryRead(numBytes uint8, address uint16, dataLength uint8) *_ApduDataMemoryRead {
+func NewApduDataMemoryRead(numBytes uint8, address uint16) *_ApduDataMemoryRead {
 	_result := &_ApduDataMemoryRead{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 		NumBytes:         numBytes,
 		Address:          address,
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryResponse.go
index 8000dd6c665..71046dae944 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryResponse.go
@@ -62,9 +62,9 @@ var _ ApduDataMemoryResponse = (*_ApduDataMemoryResponse)(nil)
 var _ ApduDataRequirements = (*_ApduDataMemoryResponse)(nil)
 
 // NewApduDataMemoryResponse factory function for _ApduDataMemoryResponse
-func NewApduDataMemoryResponse(address uint16, data []byte, dataLength uint8) *_ApduDataMemoryResponse {
+func NewApduDataMemoryResponse(address uint16, data []byte) *_ApduDataMemoryResponse {
 	_result := &_ApduDataMemoryResponse{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 		Address:          address,
 		Data:             data,
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryWrite.go
index 572356bd78a..9abd8766eb0 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryWrite.go
@@ -54,9 +54,9 @@ var _ ApduDataMemoryWrite = (*_ApduDataMemoryWrite)(nil)
 var _ ApduDataRequirements = (*_ApduDataMemoryWrite)(nil)
 
 // NewApduDataMemoryWrite factory function for _ApduDataMemoryWrite
-func NewApduDataMemoryWrite(dataLength uint8) *_ApduDataMemoryWrite {
+func NewApduDataMemoryWrite() *_ApduDataMemoryWrite {
 	_result := &_ApduDataMemoryWrite{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 	}
 	_result.ApduDataContract.(*_ApduData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataOther.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataOther.go
index 6a1d4d9fb8c..eecc8b587cf 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataOther.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataOther.go
@@ -59,12 +59,12 @@ var _ ApduDataOther = (*_ApduDataOther)(nil)
 var _ ApduDataRequirements = (*_ApduDataOther)(nil)
 
 // NewApduDataOther factory function for _ApduDataOther
-func NewApduDataOther(extendedApdu ApduDataExt, dataLength uint8) *_ApduDataOther {
+func NewApduDataOther(extendedApdu ApduDataExt) *_ApduDataOther {
 	if extendedApdu == nil {
 		panic("extendedApdu of type ApduDataExt for ApduDataOther must not be nil")
 	}
 	_result := &_ApduDataOther{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 		ExtendedApdu:     extendedApdu,
 	}
 	_result.ApduDataContract.(*_ApduData)._SubType = _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataRestart.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataRestart.go
index 6e110722501..26bf3ab4c4f 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataRestart.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataRestart.go
@@ -54,9 +54,9 @@ var _ ApduDataRestart = (*_ApduDataRestart)(nil)
 var _ ApduDataRequirements = (*_ApduDataRestart)(nil)
 
 // NewApduDataRestart factory function for _ApduDataRestart
-func NewApduDataRestart(dataLength uint8) *_ApduDataRestart {
+func NewApduDataRestart() *_ApduDataRestart {
 	_result := &_ApduDataRestart{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 	}
 	_result.ApduDataContract.(*_ApduData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataUserMessage.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataUserMessage.go
index 524ce993a18..1388a4bcd3d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataUserMessage.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataUserMessage.go
@@ -54,9 +54,9 @@ var _ ApduDataUserMessage = (*_ApduDataUserMessage)(nil)
 var _ ApduDataRequirements = (*_ApduDataUserMessage)(nil)
 
 // NewApduDataUserMessage factory function for _ApduDataUserMessage
-func NewApduDataUserMessage(dataLength uint8) *_ApduDataUserMessage {
+func NewApduDataUserMessage() *_ApduDataUserMessage {
 	_result := &_ApduDataUserMessage{
-		ApduDataContract: NewApduData(dataLength),
+		ApduDataContract: NewApduData(),
 	}
 	_result.ApduDataContract.(*_ApduData)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/CEMI.go b/plc4go/protocols/knxnetip/readwrite/model/CEMI.go
index edee2b34a4f..c974e150ee9 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/CEMI.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/CEMI.go
@@ -50,8 +50,6 @@ type CEMI interface {
 
 // CEMIContract provides a set of functions which can be overwritten by a sub struct
 type CEMIContract interface {
-	// GetSize() returns a parser argument
-	GetSize() uint16
 	// IsCEMI is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsCEMI()
 	// CreateBuilder creates a CEMIBuilder
@@ -72,16 +70,13 @@ type _CEMI struct {
 		CEMIContract
 		CEMIRequirements
 	}
-
-	// Arguments.
-	Size uint16
 }
 
 var _ CEMIContract = (*_CEMI)(nil)
 
 // NewCEMI factory function for _CEMI
-func NewCEMI(size uint16) *_CEMI {
-	return &_CEMI{Size: size}
+func NewCEMI() *_CEMI {
+	return &_CEMI{}
 }
 
 ///////////////////////////////////////////////////////////
@@ -94,8 +89,6 @@ type CEMIBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
 	WithMandatoryFields() CEMIBuilder
-	// WithArgSize sets a parser argument
-	WithArgSize(uint16) CEMIBuilder
 	// AsLBusmonInd converts this build to a subType of CEMI. It is always possible to return to current builder using Done()
 	AsLBusmonInd() LBusmonIndBuilder
 	// AsLDataReq converts this build to a subType of CEMI. It is always possible to return to current builder using Done()
@@ -177,11 +170,6 @@ func (b *_CEMIBuilder) WithMandatoryFields() CEMIBuilder {
 	return b
 }
 
-func (b *_CEMIBuilder) WithArgSize(size uint16) CEMIBuilder {
-	b.Size = size
-	return b
-}
-
 func (b *_CEMIBuilder) PartialBuild() (CEMIContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -517,7 +505,7 @@ func CEMIParseWithBufferProducer[T CEMI](size uint16) func(ctx context.Context,
 }
 
 func CEMIParseWithBuffer[T CEMI](ctx context.Context, readBuffer utils.ReadBuffer, size uint16) (T, error) {
-	v, err := (&_CEMI{Size: size}).parse(ctx, readBuffer, size)
+	v, err := (new(_CEMI)).parse(ctx, readBuffer, size)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -677,16 +665,6 @@ func (pm *_CEMI) serializeParent(ctx context.Context, writeBuffer utils.WriteBuf
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_CEMI) GetSize() uint16 {
-	return m.Size
-}
-
-//
-////
-
 func (m *_CEMI) IsCEMI() {}
 
 func (m *_CEMI) DeepCopy() any {
@@ -699,7 +677,6 @@ func (m *_CEMI) deepCopy() *_CEMI {
 	}
 	_CEMICopy := &_CEMI{
 		nil, // will be set by child
-		m.Size,
 	}
 	return _CEMICopy
 }
diff --git a/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformation.go b/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformation.go
index fb8fe0c6503..e7df3717bff 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformation.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformation.go
@@ -253,7 +253,7 @@ func CEMIAdditionalInformationParseWithBufferProducer[T CEMIAdditionalInformatio
 }
 
 func CEMIAdditionalInformationParseWithBuffer[T CEMIAdditionalInformation](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_CEMIAdditionalInformation{}).parse(ctx, readBuffer)
+	v, err := (new(_CEMIAdditionalInformation)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ChannelInformation.go b/plc4go/protocols/knxnetip/readwrite/model/ChannelInformation.go
index 7d25f37b015..200034a029d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ChannelInformation.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ChannelInformation.go
@@ -206,7 +206,7 @@ func ChannelInformationParseWithBufferProducer() func(ctx context.Context, readB
 }
 
 func ChannelInformationParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ChannelInformation, error) {
-	v, err := (&_ChannelInformation{}).parse(ctx, readBuffer)
+	v, err := (new(_ChannelInformation)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ComObjectTable.go b/plc4go/protocols/knxnetip/readwrite/model/ComObjectTable.go
index 9ea47f1dab2..ae988f01baf 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ComObjectTable.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ComObjectTable.go
@@ -261,7 +261,7 @@ func ComObjectTableParseWithBufferProducer[T ComObjectTable](firmwareType Firmwa
 }
 
 func ComObjectTableParseWithBuffer[T ComObjectTable](ctx context.Context, readBuffer utils.ReadBuffer, firmwareType FirmwareType) (T, error) {
-	v, err := (&_ComObjectTable{}).parse(ctx, readBuffer, firmwareType)
+	v, err := (new(_ComObjectTable)).parse(ctx, readBuffer, firmwareType)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformation.go b/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformation.go
index d447cef057e..556d4488597 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformation.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformation.go
@@ -256,7 +256,7 @@ func ConnectionRequestInformationParseWithBufferProducer[T ConnectionRequestInfo
 }
 
 func ConnectionRequestInformationParseWithBuffer[T ConnectionRequestInformation](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_ConnectionRequestInformation{}).parse(ctx, readBuffer)
+	v, err := (new(_ConnectionRequestInformation)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlock.go b/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlock.go
index b3d8d118dd6..a3d04ed0f5b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlock.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlock.go
@@ -256,7 +256,7 @@ func ConnectionResponseDataBlockParseWithBufferProducer[T ConnectionResponseData
 }
 
 func ConnectionResponseDataBlockParseWithBuffer[T ConnectionResponseDataBlock](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_ConnectionResponseDataBlock{}).parse(ctx, readBuffer)
+	v, err := (new(_ConnectionResponseDataBlock)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DIBDeviceInfo.go b/plc4go/protocols/knxnetip/readwrite/model/DIBDeviceInfo.go
index 022559107be..7e46cdaca74 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DIBDeviceInfo.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DIBDeviceInfo.go
@@ -422,7 +422,7 @@ func DIBDeviceInfoParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func DIBDeviceInfoParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (DIBDeviceInfo, error) {
-	v, err := (&_DIBDeviceInfo{}).parse(ctx, readBuffer)
+	v, err := (new(_DIBDeviceInfo)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DIBSuppSvcFamilies.go b/plc4go/protocols/knxnetip/readwrite/model/DIBSuppSvcFamilies.go
index 0b42043493e..41ce6e2e9ad 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DIBSuppSvcFamilies.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DIBSuppSvcFamilies.go
@@ -213,7 +213,7 @@ func DIBSuppSvcFamiliesParseWithBufferProducer() func(ctx context.Context, readB
 }
 
 func DIBSuppSvcFamiliesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (DIBSuppSvcFamilies, error) {
-	v, err := (&_DIBSuppSvcFamilies{}).parse(ctx, readBuffer)
+	v, err := (new(_DIBSuppSvcFamilies)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go
index 4bfa41c9310..5cf168cfe0f 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go
@@ -226,7 +226,7 @@ func DeviceConfigurationAckDataBlockParseWithBufferProducer() func(ctx context.C
 }
 
 func DeviceConfigurationAckDataBlockParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (DeviceConfigurationAckDataBlock, error) {
-	v, err := (&_DeviceConfigurationAckDataBlock{}).parse(ctx, readBuffer)
+	v, err := (new(_DeviceConfigurationAckDataBlock)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequest.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequest.go
index cf7aae8a83c..6aed7f254e5 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequest.go
@@ -58,16 +58,13 @@ type _DeviceConfigurationRequest struct {
 	KnxNetIpMessageContract
 	DeviceConfigurationRequestDataBlock DeviceConfigurationRequestDataBlock
 	Cemi                                CEMI
-
-	// Arguments.
-	TotalLength uint16
 }
 
 var _ DeviceConfigurationRequest = (*_DeviceConfigurationRequest)(nil)
 var _ KnxNetIpMessageRequirements = (*_DeviceConfigurationRequest)(nil)
 
 // NewDeviceConfigurationRequest factory function for _DeviceConfigurationRequest
-func NewDeviceConfigurationRequest(deviceConfigurationRequestDataBlock DeviceConfigurationRequestDataBlock, cemi CEMI, totalLength uint16) *_DeviceConfigurationRequest {
+func NewDeviceConfigurationRequest(deviceConfigurationRequestDataBlock DeviceConfigurationRequestDataBlock, cemi CEMI) *_DeviceConfigurationRequest {
 	if deviceConfigurationRequestDataBlock == nil {
 		panic("deviceConfigurationRequestDataBlock of type DeviceConfigurationRequestDataBlock for DeviceConfigurationRequest must not be nil")
 	}
@@ -101,8 +98,6 @@ type DeviceConfigurationRequestBuilder interface {
 	WithCemi(CEMI) DeviceConfigurationRequestBuilder
 	// WithCemiBuilder adds Cemi (property field) which is build by the builder
 	WithCemiBuilder(func(CEMIBuilder) CEMIBuilder) DeviceConfigurationRequestBuilder
-	// WithArgTotalLength sets a parser argument
-	WithArgTotalLength(uint16) DeviceConfigurationRequestBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() KnxNetIpMessageBuilder
 	// Build builds the DeviceConfigurationRequest or returns an error if something is wrong
@@ -165,11 +160,6 @@ func (b *_DeviceConfigurationRequestBuilder) WithCemiBuilder(builderSupplier fun
 	return b
 }
 
-func (b *_DeviceConfigurationRequestBuilder) WithArgTotalLength(totalLength uint16) DeviceConfigurationRequestBuilder {
-	b.TotalLength = totalLength
-	return b
-}
-
 func (b *_DeviceConfigurationRequestBuilder) Build() (DeviceConfigurationRequest, error) {
 	if b.DeviceConfigurationRequestDataBlock == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'deviceConfigurationRequestDataBlock' not set"))
@@ -354,16 +344,6 @@ func (m *_DeviceConfigurationRequest) SerializeWithWriteBuffer(ctx context.Conte
 	return m.KnxNetIpMessageContract.(*_KnxNetIpMessage).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_DeviceConfigurationRequest) GetTotalLength() uint16 {
-	return m.TotalLength
-}
-
-//
-////
-
 func (m *_DeviceConfigurationRequest) IsDeviceConfigurationRequest() {}
 
 func (m *_DeviceConfigurationRequest) DeepCopy() any {
@@ -378,7 +358,6 @@ func (m *_DeviceConfigurationRequest) deepCopy() *_DeviceConfigurationRequest {
 		m.KnxNetIpMessageContract.(*_KnxNetIpMessage).deepCopy(),
 		utils.DeepCopy[DeviceConfigurationRequestDataBlock](m.DeviceConfigurationRequestDataBlock),
 		utils.DeepCopy[CEMI](m.Cemi),
-		m.TotalLength,
 	}
 	_DeviceConfigurationRequestCopy.KnxNetIpMessageContract.(*_KnxNetIpMessage)._SubType = m
 	return _DeviceConfigurationRequestCopy
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go
index 5519e9eeb43..9da3e2c16d7 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go
@@ -214,7 +214,7 @@ func DeviceConfigurationRequestDataBlockParseWithBufferProducer() func(ctx conte
 }
 
 func DeviceConfigurationRequestDataBlockParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (DeviceConfigurationRequestDataBlock, error) {
-	v, err := (&_DeviceConfigurationRequestDataBlock{}).parse(ctx, readBuffer)
+	v, err := (new(_DeviceConfigurationRequestDataBlock)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorType2.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorType2.go
index 8893b51f407..abb5c8157cb 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorType2.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorType2.go
@@ -414,7 +414,7 @@ func DeviceDescriptorType2ParseWithBufferProducer() func(ctx context.Context, re
 }
 
 func DeviceDescriptorType2ParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (DeviceDescriptorType2, error) {
-	v, err := (&_DeviceDescriptorType2{}).parse(ctx, readBuffer)
+	v, err := (new(_DeviceDescriptorType2)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceStatus.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceStatus.go
index 10438303343..d6a84cdfbcb 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceStatus.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceStatus.go
@@ -194,7 +194,7 @@ func DeviceStatusParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func DeviceStatusParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (DeviceStatus, error) {
-	v, err := (&_DeviceStatus{}).parse(ctx, readBuffer)
+	v, err := (new(_DeviceStatus)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go
index c3c18e5d9c6..738a21be3e0 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go
@@ -313,7 +313,7 @@ func GroupObjectDescriptorRealisationType1ParseWithBufferProducer() func(ctx con
 }
 
 func GroupObjectDescriptorRealisationType1ParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (GroupObjectDescriptorRealisationType1, error) {
-	v, err := (&_GroupObjectDescriptorRealisationType1{}).parse(ctx, readBuffer)
+	v, err := (new(_GroupObjectDescriptorRealisationType1)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go
index 7e57510f42b..18c2029b961 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go
@@ -325,7 +325,7 @@ func GroupObjectDescriptorRealisationType2ParseWithBufferProducer() func(ctx con
 }
 
 func GroupObjectDescriptorRealisationType2ParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (GroupObjectDescriptorRealisationType2, error) {
-	v, err := (&_GroupObjectDescriptorRealisationType2{}).parse(ctx, readBuffer)
+	v, err := (new(_GroupObjectDescriptorRealisationType2)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType6.go b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType6.go
index d845435c646..b6c5dadae74 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType6.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType6.go
@@ -160,7 +160,7 @@ func GroupObjectDescriptorRealisationType6ParseWithBufferProducer() func(ctx con
 }
 
 func GroupObjectDescriptorRealisationType6ParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (GroupObjectDescriptorRealisationType6, error) {
-	v, err := (&_GroupObjectDescriptorRealisationType6{}).parse(ctx, readBuffer)
+	v, err := (new(_GroupObjectDescriptorRealisationType6)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go
index f2a9a98830e..fe1f60bee93 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go
@@ -325,7 +325,7 @@ func GroupObjectDescriptorRealisationType7ParseWithBufferProducer() func(ctx con
 }
 
 func GroupObjectDescriptorRealisationType7ParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (GroupObjectDescriptorRealisationType7, error) {
-	v, err := (&_GroupObjectDescriptorRealisationType7{}).parse(ctx, readBuffer)
+	v, err := (new(_GroupObjectDescriptorRealisationType7)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go
index b9705feac8f..cba40643c9b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go
@@ -308,7 +308,7 @@ func GroupObjectDescriptorRealisationTypeBParseWithBufferProducer() func(ctx con
 }
 
 func GroupObjectDescriptorRealisationTypeBParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (GroupObjectDescriptorRealisationTypeB, error) {
-	v, err := (&_GroupObjectDescriptorRealisationTypeB{}).parse(ctx, readBuffer)
+	v, err := (new(_GroupObjectDescriptorRealisationTypeB)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/HPAIControlEndpoint.go b/plc4go/protocols/knxnetip/readwrite/model/HPAIControlEndpoint.go
index 0a1ead222f4..d854f267ab6 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/HPAIControlEndpoint.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/HPAIControlEndpoint.go
@@ -244,7 +244,7 @@ func HPAIControlEndpointParseWithBufferProducer() func(ctx context.Context, read
 }
 
 func HPAIControlEndpointParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (HPAIControlEndpoint, error) {
-	v, err := (&_HPAIControlEndpoint{}).parse(ctx, readBuffer)
+	v, err := (new(_HPAIControlEndpoint)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/HPAIDataEndpoint.go b/plc4go/protocols/knxnetip/readwrite/model/HPAIDataEndpoint.go
index 7dae3e8cdb2..e49aefa5c5e 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/HPAIDataEndpoint.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/HPAIDataEndpoint.go
@@ -244,7 +244,7 @@ func HPAIDataEndpointParseWithBufferProducer() func(ctx context.Context, readBuf
 }
 
 func HPAIDataEndpointParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (HPAIDataEndpoint, error) {
-	v, err := (&_HPAIDataEndpoint{}).parse(ctx, readBuffer)
+	v, err := (new(_HPAIDataEndpoint)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go b/plc4go/protocols/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go
index 4af7b36cc75..18f7203d036 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go
@@ -244,7 +244,7 @@ func HPAIDiscoveryEndpointParseWithBufferProducer() func(ctx context.Context, re
 }
 
 func HPAIDiscoveryEndpointParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (HPAIDiscoveryEndpoint, error) {
-	v, err := (&_HPAIDiscoveryEndpoint{}).parse(ctx, readBuffer)
+	v, err := (new(_HPAIDiscoveryEndpoint)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/IPAddress.go b/plc4go/protocols/knxnetip/readwrite/model/IPAddress.go
index 1b6bc3414a3..58c4b17ecbc 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/IPAddress.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/IPAddress.go
@@ -191,7 +191,7 @@ func IPAddressParseWithBufferProducer() func(ctx context.Context, readBuffer uti
 }
 
 func IPAddressParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (IPAddress, error) {
-	v, err := (&_IPAddress{}).parse(ctx, readBuffer)
+	v, err := (new(_IPAddress)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxAddress.go b/plc4go/protocols/knxnetip/readwrite/model/KnxAddress.go
index 25cecb7837f..d99c044649b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxAddress.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxAddress.go
@@ -223,7 +223,7 @@ func KnxAddressParseWithBufferProducer() func(ctx context.Context, readBuffer ut
 }
 
 func KnxAddressParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (KnxAddress, error) {
-	v, err := (&_KnxAddress{}).parse(ctx, readBuffer)
+	v, err := (new(_KnxAddress)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress.go b/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress.go
index f90a4a9ec7a..dec948cc938 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress.go
@@ -261,7 +261,7 @@ func KnxGroupAddressParseWithBufferProducer[T KnxGroupAddress](numLevels uint8)
 }
 
 func KnxGroupAddressParseWithBuffer[T KnxGroupAddress](ctx context.Context, readBuffer utils.ReadBuffer, numLevels uint8) (T, error) {
-	v, err := (&_KnxGroupAddress{}).parse(ctx, readBuffer, numLevels)
+	v, err := (new(_KnxGroupAddress)).parse(ctx, readBuffer, numLevels)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index 45d1b3a4a75..ae92a590c60 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -784,7 +784,7 @@ const (
 	KnxManufacturer_M_ZHONGSHAN_ILLUS_LIGHTING_CO__LTD                   KnxManufacturer = 738
 	KnxManufacturer_M_HANGZHOU_KONKE_INFORMATION_TECHNOLOGY_CO___LTD_    KnxManufacturer = 739
 	KnxManufacturer_M_SHANGHAI_FANTE_DIGITAL_TECHNOLOGY_CO___LTD         KnxManufacturer = 740
-	KnxManufacturer_M_CONFIO                                             KnxManufacturer = 741
+	KnxManufacturer_M_CONFIO_TECHNOLOGIES_PVT__LTD                       KnxManufacturer = 741
 	KnxManufacturer_M_SONIC_TECHNOLOGIES                                 KnxManufacturer = 742
 	KnxManufacturer_M_SHANGHAI_INNOVATECH_INFORMATION_TECHNOLOGY_CO___LT KnxManufacturer = 743
 	KnxManufacturer_M_ABI_SICHERHEITSSYSTEME_GMBH                        KnxManufacturer = 744
@@ -795,8 +795,12 @@ const (
 	KnxManufacturer_M_ROGERWELL_CONTROL_SYSTEM_LIMITED                   KnxManufacturer = 749
 	KnxManufacturer_M_SHANGHAI_YUKON_AUTOMATION_TECHNOLOGIES_CO___LTD_   KnxManufacturer = 750
 	KnxManufacturer_M_TECCO_PTY_LTD                                      KnxManufacturer = 751
-	KnxManufacturer_M_ABB___RESERVED                                     KnxManufacturer = 752
-	KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED                    KnxManufacturer = 753
+	KnxManufacturer_M_A_LAN_TECHNOLOGIE                                  KnxManufacturer = 752
+	KnxManufacturer_M_VOLTAN_TECHNOLOGY                                  KnxManufacturer = 753
+	KnxManufacturer_M_BAERWINKEL_AND_STRASSER_GMBH                       KnxManufacturer = 754
+	KnxManufacturer_M_CATERLUX                                           KnxManufacturer = 755
+	KnxManufacturer_M_ABB___RESERVED                                     KnxManufacturer = 756
+	KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED                    KnxManufacturer = 757
 )
 
 var KnxManufacturerValues []KnxManufacturer
@@ -1545,7 +1549,7 @@ func init() {
 		KnxManufacturer_M_ZHONGSHAN_ILLUS_LIGHTING_CO__LTD,
 		KnxManufacturer_M_HANGZHOU_KONKE_INFORMATION_TECHNOLOGY_CO___LTD_,
 		KnxManufacturer_M_SHANGHAI_FANTE_DIGITAL_TECHNOLOGY_CO___LTD,
-		KnxManufacturer_M_CONFIO,
+		KnxManufacturer_M_CONFIO_TECHNOLOGIES_PVT__LTD,
 		KnxManufacturer_M_SONIC_TECHNOLOGIES,
 		KnxManufacturer_M_SHANGHAI_INNOVATECH_INFORMATION_TECHNOLOGY_CO___LT,
 		KnxManufacturer_M_ABI_SICHERHEITSSYSTEME_GMBH,
@@ -1556,6 +1560,10 @@ func init() {
 		KnxManufacturer_M_ROGERWELL_CONTROL_SYSTEM_LIMITED,
 		KnxManufacturer_M_SHANGHAI_YUKON_AUTOMATION_TECHNOLOGIES_CO___LTD_,
 		KnxManufacturer_M_TECCO_PTY_LTD,
+		KnxManufacturer_M_A_LAN_TECHNOLOGIE,
+		KnxManufacturer_M_VOLTAN_TECHNOLOGY,
+		KnxManufacturer_M_BAERWINKEL_AND_STRASSER_GMBH,
+		KnxManufacturer_M_CATERLUX,
 		KnxManufacturer_M_ABB___RESERVED,
 		KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
 	}
@@ -4469,10 +4477,26 @@ func (e KnxManufacturer) Number() uint16 {
 		}
 	case 752:
 		{ /* '752' */
-			return 43954
+			return 813
 		}
 	case 753:
 		{ /* '753' */
+			return 814
+		}
+	case 754:
+		{ /* '754' */
+			return 815
+		}
+	case 755:
+		{ /* '755' */
+			return 816
+		}
+	case 756:
+		{ /* '756' */
+			return 43954
+		}
+	case 757:
+		{ /* '757' */
 			return 43959
 		}
 	case 76:
@@ -7455,7 +7479,7 @@ func (e KnxManufacturer) Name() string {
 		}
 	case 741:
 		{ /* '741' */
-			return "CONFIO"
+			return "Confio Technologies Pvt. Ltd"
 		}
 	case 742:
 		{ /* '742' */
@@ -7503,10 +7527,26 @@ func (e KnxManufacturer) Name() string {
 		}
 	case 752:
 		{ /* '752' */
-			return "ABB - reserved"
+			return "A-LAN Technologie"
 		}
 	case 753:
 		{ /* '753' */
+			return "Voltan Technology"
+		}
+	case 754:
+		{ /* '754' */
+			return "Baerwinkel & Strasser GmbH"
+		}
+	case 755:
+		{ /* '755' */
+			return "Caterlux"
+		}
+	case 756:
+		{ /* '756' */
+			return "ABB - reserved"
+		}
+	case 757:
+		{ /* '757' */
 			return "Busch-Jaeger Elektro - reserved"
 		}
 	case 76:
@@ -9059,7 +9099,7 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
 	case 740:
 		return KnxManufacturer_M_SHANGHAI_FANTE_DIGITAL_TECHNOLOGY_CO___LTD, true
 	case 741:
-		return KnxManufacturer_M_CONFIO, true
+		return KnxManufacturer_M_CONFIO_TECHNOLOGIES_PVT__LTD, true
 	case 742:
 		return KnxManufacturer_M_SONIC_TECHNOLOGIES, true
 	case 743:
@@ -9083,8 +9123,16 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
 	case 751:
 		return KnxManufacturer_M_TECCO_PTY_LTD, true
 	case 752:
-		return KnxManufacturer_M_ABB___RESERVED, true
+		return KnxManufacturer_M_A_LAN_TECHNOLOGIE, true
 	case 753:
+		return KnxManufacturer_M_VOLTAN_TECHNOLOGY, true
+	case 754:
+		return KnxManufacturer_M_BAERWINKEL_AND_STRASSER_GMBH, true
+	case 755:
+		return KnxManufacturer_M_CATERLUX, true
+	case 756:
+		return KnxManufacturer_M_ABB___RESERVED, true
+	case 757:
 		return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
 	case 76:
 		return KnxManufacturer_M_HDL, true
@@ -10572,8 +10620,8 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
 		return KnxManufacturer_M_ZENNIO, true
 	case "M_SHANGHAI_FANTE_DIGITAL_TECHNOLOGY_CO___LTD":
 		return KnxManufacturer_M_SHANGHAI_FANTE_DIGITAL_TECHNOLOGY_CO___LTD, true
-	case "M_CONFIO":
-		return KnxManufacturer_M_CONFIO, true
+	case "M_CONFIO_TECHNOLOGIES_PVT__LTD":
+		return KnxManufacturer_M_CONFIO_TECHNOLOGIES_PVT__LTD, true
 	case "M_SONIC_TECHNOLOGIES":
 		return KnxManufacturer_M_SONIC_TECHNOLOGIES, true
 	case "M_SHANGHAI_INNOVATECH_INFORMATION_TECHNOLOGY_CO___LT":
@@ -10596,6 +10644,14 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
 		return KnxManufacturer_M_SHANGHAI_YUKON_AUTOMATION_TECHNOLOGIES_CO___LTD_, true
 	case "M_TECCO_PTY_LTD":
 		return KnxManufacturer_M_TECCO_PTY_LTD, true
+	case "M_A_LAN_TECHNOLOGIE":
+		return KnxManufacturer_M_A_LAN_TECHNOLOGIE, true
+	case "M_VOLTAN_TECHNOLOGY":
+		return KnxManufacturer_M_VOLTAN_TECHNOLOGY, true
+	case "M_BAERWINKEL_AND_STRASSER_GMBH":
+		return KnxManufacturer_M_BAERWINKEL_AND_STRASSER_GMBH, true
+	case "M_CATERLUX":
+		return KnxManufacturer_M_CATERLUX, true
 	case "M_ABB___RESERVED":
 		return KnxManufacturer_M_ABB___RESERVED, true
 	case "M_BUSCH_JAEGER_ELEKTRO___RESERVED":
@@ -12158,8 +12214,8 @@ func (e KnxManufacturer) PLC4XEnumName() string {
 		return "M_ZENNIO"
 	case KnxManufacturer_M_SHANGHAI_FANTE_DIGITAL_TECHNOLOGY_CO___LTD:
 		return "M_SHANGHAI_FANTE_DIGITAL_TECHNOLOGY_CO___LTD"
-	case KnxManufacturer_M_CONFIO:
-		return "M_CONFIO"
+	case KnxManufacturer_M_CONFIO_TECHNOLOGIES_PVT__LTD:
+		return "M_CONFIO_TECHNOLOGIES_PVT__LTD"
 	case KnxManufacturer_M_SONIC_TECHNOLOGIES:
 		return "M_SONIC_TECHNOLOGIES"
 	case KnxManufacturer_M_SHANGHAI_INNOVATECH_INFORMATION_TECHNOLOGY_CO___LT:
@@ -12182,6 +12238,14 @@ func (e KnxManufacturer) PLC4XEnumName() string {
 		return "M_SHANGHAI_YUKON_AUTOMATION_TECHNOLOGIES_CO___LTD_"
 	case KnxManufacturer_M_TECCO_PTY_LTD:
 		return "M_TECCO_PTY_LTD"
+	case KnxManufacturer_M_A_LAN_TECHNOLOGIE:
+		return "M_A_LAN_TECHNOLOGIE"
+	case KnxManufacturer_M_VOLTAN_TECHNOLOGY:
+		return "M_VOLTAN_TECHNOLOGY"
+	case KnxManufacturer_M_BAERWINKEL_AND_STRASSER_GMBH:
+		return "M_BAERWINKEL_AND_STRASSER_GMBH"
+	case KnxManufacturer_M_CATERLUX:
+		return "M_CATERLUX"
 	case KnxManufacturer_M_ABB___RESERVED:
 		return "M_ABB___RESERVED"
 	case KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED:
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpMessage.go b/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpMessage.go
index 1182e695fc4..6907a08f0ee 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpMessage.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpMessage.go
@@ -449,7 +449,7 @@ func KnxNetIpMessageParseWithBufferProducer[T KnxNetIpMessage]() func(ctx contex
 }
 
 func KnxNetIpMessageParseWithBuffer[T KnxNetIpMessage](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_KnxNetIpMessage{}).parse(ctx, readBuffer)
+	v, err := (new(_KnxNetIpMessage)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LBusmonInd.go b/plc4go/protocols/knxnetip/readwrite/model/LBusmonInd.go
index cab6862ffe4..f7a1b3403ed 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LBusmonInd.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LBusmonInd.go
@@ -68,12 +68,12 @@ var _ LBusmonInd = (*_LBusmonInd)(nil)
 var _ CEMIRequirements = (*_LBusmonInd)(nil)
 
 // NewLBusmonInd factory function for _LBusmonInd
-func NewLBusmonInd(additionalInformationLength uint8, additionalInformation []CEMIAdditionalInformation, dataFrame LDataFrame, crc *uint8, size uint16) *_LBusmonInd {
+func NewLBusmonInd(additionalInformationLength uint8, additionalInformation []CEMIAdditionalInformation, dataFrame LDataFrame, crc *uint8) *_LBusmonInd {
 	if dataFrame == nil {
 		panic("dataFrame of type LDataFrame for LBusmonInd must not be nil")
 	}
 	_result := &_LBusmonInd{
-		CEMIContract:                NewCEMI(size),
+		CEMIContract:                NewCEMI(),
 		AdditionalInformationLength: additionalInformationLength,
 		AdditionalInformation:       additionalInformation,
 		DataFrame:                   dataFrame,
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LDataCon.go b/plc4go/protocols/knxnetip/readwrite/model/LDataCon.go
index 7abf8c9ca52..6f23c5f592f 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LDataCon.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LDataCon.go
@@ -65,12 +65,12 @@ var _ LDataCon = (*_LDataCon)(nil)
 var _ CEMIRequirements = (*_LDataCon)(nil)
 
 // NewLDataCon factory function for _LDataCon
-func NewLDataCon(additionalInformationLength uint8, additionalInformation []CEMIAdditionalInformation, dataFrame LDataFrame, size uint16) *_LDataCon {
+func NewLDataCon(additionalInformationLength uint8, additionalInformation []CEMIAdditionalInformation, dataFrame LDataFrame) *_LDataCon {
 	if dataFrame == nil {
 		panic("dataFrame of type LDataFrame for LDataCon must not be nil")
 	}
 	_result := &_LDataCon{
-		CEMIContract:                NewCEMI(size),
+		CEMIContract:                NewCEMI(),
 		AdditionalInformationLength: additionalInformationLength,
 		AdditionalInformation:       additionalInformation,
 		DataFrame:                   dataFrame,
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LDataFrame.go b/plc4go/protocols/knxnetip/readwrite/model/LDataFrame.go
index f0994409325..c860bb43bf4 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LDataFrame.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LDataFrame.go
@@ -364,7 +364,7 @@ func LDataFrameParseWithBufferProducer[T LDataFrame]() func(ctx context.Context,
 }
 
 func LDataFrameParseWithBuffer[T LDataFrame](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_LDataFrame{}).parse(ctx, readBuffer)
+	v, err := (new(_LDataFrame)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LDataInd.go b/plc4go/protocols/knxnetip/readwrite/model/LDataInd.go
index 789ebb01868..799f47a3dd3 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LDataInd.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LDataInd.go
@@ -65,12 +65,12 @@ var _ LDataInd = (*_LDataInd)(nil)
 var _ CEMIRequirements = (*_LDataInd)(nil)
 
 // NewLDataInd factory function for _LDataInd
-func NewLDataInd(additionalInformationLength uint8, additionalInformation []CEMIAdditionalInformation, dataFrame LDataFrame, size uint16) *_LDataInd {
+func NewLDataInd(additionalInformationLength uint8, additionalInformation []CEMIAdditionalInformation, dataFrame LDataFrame) *_LDataInd {
 	if dataFrame == nil {
 		panic("dataFrame of type LDataFrame for LDataInd must not be nil")
 	}
 	_result := &_LDataInd{
-		CEMIContract:                NewCEMI(size),
+		CEMIContract:                NewCEMI(),
 		AdditionalInformationLength: additionalInformationLength,
 		AdditionalInformation:       additionalInformation,
 		DataFrame:                   dataFrame,
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LDataReq.go b/plc4go/protocols/knxnetip/readwrite/model/LDataReq.go
index c6adb7ae84f..fb29b12c9d3 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LDataReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LDataReq.go
@@ -65,12 +65,12 @@ var _ LDataReq = (*_LDataReq)(nil)
 var _ CEMIRequirements = (*_LDataReq)(nil)
 
 // NewLDataReq factory function for _LDataReq
-func NewLDataReq(additionalInformationLength uint8, additionalInformation []CEMIAdditionalInformation, dataFrame LDataFrame, size uint16) *_LDataReq {
+func NewLDataReq(additionalInformationLength uint8, additionalInformation []CEMIAdditionalInformation, dataFrame LDataFrame) *_LDataReq {
 	if dataFrame == nil {
 		panic("dataFrame of type LDataFrame for LDataReq must not be nil")
 	}
 	_result := &_LDataReq{
-		CEMIContract:                NewCEMI(size),
+		CEMIContract:                NewCEMI(),
 		AdditionalInformationLength: additionalInformationLength,
 		AdditionalInformation:       additionalInformation,
 		DataFrame:                   dataFrame,
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LPollDataCon.go b/plc4go/protocols/knxnetip/readwrite/model/LPollDataCon.go
index 5040608aca9..622c868c39d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LPollDataCon.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LPollDataCon.go
@@ -54,9 +54,9 @@ var _ LPollDataCon = (*_LPollDataCon)(nil)
 var _ CEMIRequirements = (*_LPollDataCon)(nil)
 
 // NewLPollDataCon factory function for _LPollDataCon
-func NewLPollDataCon(size uint16) *_LPollDataCon {
+func NewLPollDataCon() *_LPollDataCon {
 	_result := &_LPollDataCon{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LPollDataReq.go b/plc4go/protocols/knxnetip/readwrite/model/LPollDataReq.go
index 5abc55d8df2..38dad036817 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LPollDataReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LPollDataReq.go
@@ -54,9 +54,9 @@ var _ LPollDataReq = (*_LPollDataReq)(nil)
 var _ CEMIRequirements = (*_LPollDataReq)(nil)
 
 // NewLPollDataReq factory function for _LPollDataReq
-func NewLPollDataReq(size uint16) *_LPollDataReq {
+func NewLPollDataReq() *_LPollDataReq {
 	_result := &_LPollDataReq{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LRawCon.go b/plc4go/protocols/knxnetip/readwrite/model/LRawCon.go
index 0f81039e176..cc7468b8b2c 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LRawCon.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LRawCon.go
@@ -54,9 +54,9 @@ var _ LRawCon = (*_LRawCon)(nil)
 var _ CEMIRequirements = (*_LRawCon)(nil)
 
 // NewLRawCon factory function for _LRawCon
-func NewLRawCon(size uint16) *_LRawCon {
+func NewLRawCon() *_LRawCon {
 	_result := &_LRawCon{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LRawInd.go b/plc4go/protocols/knxnetip/readwrite/model/LRawInd.go
index f07225d5002..3bdc49af961 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LRawInd.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LRawInd.go
@@ -54,9 +54,9 @@ var _ LRawInd = (*_LRawInd)(nil)
 var _ CEMIRequirements = (*_LRawInd)(nil)
 
 // NewLRawInd factory function for _LRawInd
-func NewLRawInd(size uint16) *_LRawInd {
+func NewLRawInd() *_LRawInd {
 	_result := &_LRawInd{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LRawReq.go b/plc4go/protocols/knxnetip/readwrite/model/LRawReq.go
index 007aabd4da8..c2d17907db0 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LRawReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LRawReq.go
@@ -54,9 +54,9 @@ var _ LRawReq = (*_LRawReq)(nil)
 var _ CEMIRequirements = (*_LRawReq)(nil)
 
 // NewLRawReq factory function for _LRawReq
-func NewLRawReq(size uint16) *_LRawReq {
+func NewLRawReq() *_LRawReq {
 	_result := &_LRawReq{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MACAddress.go b/plc4go/protocols/knxnetip/readwrite/model/MACAddress.go
index 7ef62e84e5a..f1689459375 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MACAddress.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MACAddress.go
@@ -191,7 +191,7 @@ func MACAddressParseWithBufferProducer() func(ctx context.Context, readBuffer ut
 }
 
 func MACAddressParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (MACAddress, error) {
-	v, err := (&_MACAddress{}).parse(ctx, readBuffer)
+	v, err := (new(_MACAddress)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCommandReq.go b/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCommandReq.go
index 9d4ec332e4e..0cd61f257e7 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCommandReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCommandReq.go
@@ -54,9 +54,9 @@ var _ MFuncPropCommandReq = (*_MFuncPropCommandReq)(nil)
 var _ CEMIRequirements = (*_MFuncPropCommandReq)(nil)
 
 // NewMFuncPropCommandReq factory function for _MFuncPropCommandReq
-func NewMFuncPropCommandReq(size uint16) *_MFuncPropCommandReq {
+func NewMFuncPropCommandReq() *_MFuncPropCommandReq {
 	_result := &_MFuncPropCommandReq{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCon.go b/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCon.go
index a759e1df38a..7eae8834324 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCon.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCon.go
@@ -54,9 +54,9 @@ var _ MFuncPropCon = (*_MFuncPropCon)(nil)
 var _ CEMIRequirements = (*_MFuncPropCon)(nil)
 
 // NewMFuncPropCon factory function for _MFuncPropCon
-func NewMFuncPropCon(size uint16) *_MFuncPropCon {
+func NewMFuncPropCon() *_MFuncPropCon {
 	_result := &_MFuncPropCon{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MFuncPropStateReadReq.go b/plc4go/protocols/knxnetip/readwrite/model/MFuncPropStateReadReq.go
index 6482a859db0..84092d08f1c 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MFuncPropStateReadReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MFuncPropStateReadReq.go
@@ -54,9 +54,9 @@ var _ MFuncPropStateReadReq = (*_MFuncPropStateReadReq)(nil)
 var _ CEMIRequirements = (*_MFuncPropStateReadReq)(nil)
 
 // NewMFuncPropStateReadReq factory function for _MFuncPropStateReadReq
-func NewMFuncPropStateReadReq(size uint16) *_MFuncPropStateReadReq {
+func NewMFuncPropStateReadReq() *_MFuncPropStateReadReq {
 	_result := &_MFuncPropStateReadReq{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MPropInfoInd.go b/plc4go/protocols/knxnetip/readwrite/model/MPropInfoInd.go
index ca607604bac..af6f19aed56 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MPropInfoInd.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MPropInfoInd.go
@@ -54,9 +54,9 @@ var _ MPropInfoInd = (*_MPropInfoInd)(nil)
 var _ CEMIRequirements = (*_MPropInfoInd)(nil)
 
 // NewMPropInfoInd factory function for _MPropInfoInd
-func NewMPropInfoInd(size uint16) *_MPropInfoInd {
+func NewMPropInfoInd() *_MPropInfoInd {
 	_result := &_MPropInfoInd{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MPropReadCon.go b/plc4go/protocols/knxnetip/readwrite/model/MPropReadCon.go
index 0379285e237..b648ca9c537 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MPropReadCon.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MPropReadCon.go
@@ -74,9 +74,9 @@ var _ MPropReadCon = (*_MPropReadCon)(nil)
 var _ CEMIRequirements = (*_MPropReadCon)(nil)
 
 // NewMPropReadCon factory function for _MPropReadCon
-func NewMPropReadCon(interfaceObjectType uint16, objectInstance uint8, propertyId uint8, numberOfElements uint8, startIndex uint16, data uint16, size uint16) *_MPropReadCon {
+func NewMPropReadCon(interfaceObjectType uint16, objectInstance uint8, propertyId uint8, numberOfElements uint8, startIndex uint16, data uint16) *_MPropReadCon {
 	_result := &_MPropReadCon{
-		CEMIContract:        NewCEMI(size),
+		CEMIContract:        NewCEMI(),
 		InterfaceObjectType: interfaceObjectType,
 		ObjectInstance:      objectInstance,
 		PropertyId:          propertyId,
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MPropReadReq.go b/plc4go/protocols/knxnetip/readwrite/model/MPropReadReq.go
index 44f2ef130b4..559eee1d18b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MPropReadReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MPropReadReq.go
@@ -71,9 +71,9 @@ var _ MPropReadReq = (*_MPropReadReq)(nil)
 var _ CEMIRequirements = (*_MPropReadReq)(nil)
 
 // NewMPropReadReq factory function for _MPropReadReq
-func NewMPropReadReq(interfaceObjectType uint16, objectInstance uint8, propertyId uint8, numberOfElements uint8, startIndex uint16, size uint16) *_MPropReadReq {
+func NewMPropReadReq(interfaceObjectType uint16, objectInstance uint8, propertyId uint8, numberOfElements uint8, startIndex uint16) *_MPropReadReq {
 	_result := &_MPropReadReq{
-		CEMIContract:        NewCEMI(size),
+		CEMIContract:        NewCEMI(),
 		InterfaceObjectType: interfaceObjectType,
 		ObjectInstance:      objectInstance,
 		PropertyId:          propertyId,
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MPropWriteCon.go b/plc4go/protocols/knxnetip/readwrite/model/MPropWriteCon.go
index 082f4efd2ff..50828b6717f 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MPropWriteCon.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MPropWriteCon.go
@@ -54,9 +54,9 @@ var _ MPropWriteCon = (*_MPropWriteCon)(nil)
 var _ CEMIRequirements = (*_MPropWriteCon)(nil)
 
 // NewMPropWriteCon factory function for _MPropWriteCon
-func NewMPropWriteCon(size uint16) *_MPropWriteCon {
+func NewMPropWriteCon() *_MPropWriteCon {
 	_result := &_MPropWriteCon{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MPropWriteReq.go b/plc4go/protocols/knxnetip/readwrite/model/MPropWriteReq.go
index bededf2e2c9..a6845574422 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MPropWriteReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MPropWriteReq.go
@@ -54,9 +54,9 @@ var _ MPropWriteReq = (*_MPropWriteReq)(nil)
 var _ CEMIRequirements = (*_MPropWriteReq)(nil)
 
 // NewMPropWriteReq factory function for _MPropWriteReq
-func NewMPropWriteReq(size uint16) *_MPropWriteReq {
+func NewMPropWriteReq() *_MPropWriteReq {
 	_result := &_MPropWriteReq{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MResetInd.go b/plc4go/protocols/knxnetip/readwrite/model/MResetInd.go
index 960022ecb7e..8089198ecd4 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MResetInd.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MResetInd.go
@@ -54,9 +54,9 @@ var _ MResetInd = (*_MResetInd)(nil)
 var _ CEMIRequirements = (*_MResetInd)(nil)
 
 // NewMResetInd factory function for _MResetInd
-func NewMResetInd(size uint16) *_MResetInd {
+func NewMResetInd() *_MResetInd {
 	_result := &_MResetInd{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MResetReq.go b/plc4go/protocols/knxnetip/readwrite/model/MResetReq.go
index 05741054c67..27acff7626b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MResetReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MResetReq.go
@@ -54,9 +54,9 @@ var _ MResetReq = (*_MResetReq)(nil)
 var _ CEMIRequirements = (*_MResetReq)(nil)
 
 // NewMResetReq factory function for _MResetReq
-func NewMResetReq(size uint16) *_MResetReq {
+func NewMResetReq() *_MResetReq {
 	_result := &_MResetReq{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ProjectInstallationIdentifier.go b/plc4go/protocols/knxnetip/readwrite/model/ProjectInstallationIdentifier.go
index b1b2a09e554..2bc45205484 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ProjectInstallationIdentifier.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ProjectInstallationIdentifier.go
@@ -206,7 +206,7 @@ func ProjectInstallationIdentifierParseWithBufferProducer() func(ctx context.Con
 }
 
 func ProjectInstallationIdentifierParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ProjectInstallationIdentifier, error) {
-	v, err := (&_ProjectInstallationIdentifier{}).parse(ctx, readBuffer)
+	v, err := (new(_ProjectInstallationIdentifier)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/RelativeTimestamp.go b/plc4go/protocols/knxnetip/readwrite/model/RelativeTimestamp.go
index 45c30428409..08187ec773b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/RelativeTimestamp.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/RelativeTimestamp.go
@@ -189,7 +189,7 @@ func RelativeTimestampParseWithBufferProducer() func(ctx context.Context, readBu
 }
 
 func RelativeTimestampParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (RelativeTimestamp, error) {
-	v, err := (&_RelativeTimestamp{}).parse(ctx, readBuffer)
+	v, err := (new(_RelativeTimestamp)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ServiceId.go b/plc4go/protocols/knxnetip/readwrite/model/ServiceId.go
index 03c15fb4b7e..bc0c4f8cc16 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ServiceId.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ServiceId.go
@@ -313,7 +313,7 @@ func ServiceIdParseWithBufferProducer[T ServiceId]() func(ctx context.Context, r
 }
 
 func ServiceIdParseWithBuffer[T ServiceId](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_ServiceId{}).parse(ctx, readBuffer)
+	v, err := (new(_ServiceId)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedInd.go b/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedInd.go
index 551ecb2b56a..6404de3cba2 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedInd.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedInd.go
@@ -54,9 +54,9 @@ var _ TDataConnectedInd = (*_TDataConnectedInd)(nil)
 var _ CEMIRequirements = (*_TDataConnectedInd)(nil)
 
 // NewTDataConnectedInd factory function for _TDataConnectedInd
-func NewTDataConnectedInd(size uint16) *_TDataConnectedInd {
+func NewTDataConnectedInd() *_TDataConnectedInd {
 	_result := &_TDataConnectedInd{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedReq.go b/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedReq.go
index d0dd3864d27..b57e0ccec82 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedReq.go
@@ -54,9 +54,9 @@ var _ TDataConnectedReq = (*_TDataConnectedReq)(nil)
 var _ CEMIRequirements = (*_TDataConnectedReq)(nil)
 
 // NewTDataConnectedReq factory function for _TDataConnectedReq
-func NewTDataConnectedReq(size uint16) *_TDataConnectedReq {
+func NewTDataConnectedReq() *_TDataConnectedReq {
 	_result := &_TDataConnectedReq{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualInd.go b/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualInd.go
index b0093d8d830..fd65cd3ac02 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualInd.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualInd.go
@@ -54,9 +54,9 @@ var _ TDataIndividualInd = (*_TDataIndividualInd)(nil)
 var _ CEMIRequirements = (*_TDataIndividualInd)(nil)
 
 // NewTDataIndividualInd factory function for _TDataIndividualInd
-func NewTDataIndividualInd(size uint16) *_TDataIndividualInd {
+func NewTDataIndividualInd() *_TDataIndividualInd {
 	_result := &_TDataIndividualInd{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualReq.go b/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualReq.go
index 724547df7e0..ee66b6e38af 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualReq.go
@@ -54,9 +54,9 @@ var _ TDataIndividualReq = (*_TDataIndividualReq)(nil)
 var _ CEMIRequirements = (*_TDataIndividualReq)(nil)
 
 // NewTDataIndividualReq factory function for _TDataIndividualReq
-func NewTDataIndividualReq(size uint16) *_TDataIndividualReq {
+func NewTDataIndividualReq() *_TDataIndividualReq {
 	_result := &_TDataIndividualReq{
-		CEMIContract: NewCEMI(size),
+		CEMIContract: NewCEMI(),
 	}
 	_result.CEMIContract.(*_CEMI)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequest.go b/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequest.go
index 80aa4d39e3d..5c49a977c50 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequest.go
@@ -58,16 +58,13 @@ type _TunnelingRequest struct {
 	KnxNetIpMessageContract
 	TunnelingRequestDataBlock TunnelingRequestDataBlock
 	Cemi                      CEMI
-
-	// Arguments.
-	TotalLength uint16
 }
 
 var _ TunnelingRequest = (*_TunnelingRequest)(nil)
 var _ KnxNetIpMessageRequirements = (*_TunnelingRequest)(nil)
 
 // NewTunnelingRequest factory function for _TunnelingRequest
-func NewTunnelingRequest(tunnelingRequestDataBlock TunnelingRequestDataBlock, cemi CEMI, totalLength uint16) *_TunnelingRequest {
+func NewTunnelingRequest(tunnelingRequestDataBlock TunnelingRequestDataBlock, cemi CEMI) *_TunnelingRequest {
 	if tunnelingRequestDataBlock == nil {
 		panic("tunnelingRequestDataBlock of type TunnelingRequestDataBlock for TunnelingRequest must not be nil")
 	}
@@ -101,8 +98,6 @@ type TunnelingRequestBuilder interface {
 	WithCemi(CEMI) TunnelingRequestBuilder
 	// WithCemiBuilder adds Cemi (property field) which is build by the builder
 	WithCemiBuilder(func(CEMIBuilder) CEMIBuilder) TunnelingRequestBuilder
-	// WithArgTotalLength sets a parser argument
-	WithArgTotalLength(uint16) TunnelingRequestBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() KnxNetIpMessageBuilder
 	// Build builds the TunnelingRequest or returns an error if something is wrong
@@ -165,11 +160,6 @@ func (b *_TunnelingRequestBuilder) WithCemiBuilder(builderSupplier func(CEMIBuil
 	return b
 }
 
-func (b *_TunnelingRequestBuilder) WithArgTotalLength(totalLength uint16) TunnelingRequestBuilder {
-	b.TotalLength = totalLength
-	return b
-}
-
 func (b *_TunnelingRequestBuilder) Build() (TunnelingRequest, error) {
 	if b.TunnelingRequestDataBlock == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'tunnelingRequestDataBlock' not set"))
@@ -354,16 +344,6 @@ func (m *_TunnelingRequest) SerializeWithWriteBuffer(ctx context.Context, writeB
 	return m.KnxNetIpMessageContract.(*_KnxNetIpMessage).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_TunnelingRequest) GetTotalLength() uint16 {
-	return m.TotalLength
-}
-
-//
-////
-
 func (m *_TunnelingRequest) IsTunnelingRequest() {}
 
 func (m *_TunnelingRequest) DeepCopy() any {
@@ -378,7 +358,6 @@ func (m *_TunnelingRequest) deepCopy() *_TunnelingRequest {
 		m.KnxNetIpMessageContract.(*_KnxNetIpMessage).deepCopy(),
 		utils.DeepCopy[TunnelingRequestDataBlock](m.TunnelingRequestDataBlock),
 		utils.DeepCopy[CEMI](m.Cemi),
-		m.TotalLength,
 	}
 	_TunnelingRequestCopy.KnxNetIpMessageContract.(*_KnxNetIpMessage)._SubType = m
 	return _TunnelingRequestCopy
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequestDataBlock.go b/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequestDataBlock.go
index 0feb7689138..e2fdb912468 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequestDataBlock.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequestDataBlock.go
@@ -214,7 +214,7 @@ func TunnelingRequestDataBlockParseWithBufferProducer() func(ctx context.Context
 }
 
 func TunnelingRequestDataBlockParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (TunnelingRequestDataBlock, error) {
-	v, err := (&_TunnelingRequestDataBlock{}).parse(ctx, readBuffer)
+	v, err := (new(_TunnelingRequestDataBlock)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TunnelingResponseDataBlock.go b/plc4go/protocols/knxnetip/readwrite/model/TunnelingResponseDataBlock.go
index 12d6f90efb2..e50fc1c0a00 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TunnelingResponseDataBlock.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TunnelingResponseDataBlock.go
@@ -226,7 +226,7 @@ func TunnelingResponseDataBlockParseWithBufferProducer() func(ctx context.Contex
 }
 
 func TunnelingResponseDataBlockParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (TunnelingResponseDataBlock, error) {
-	v, err := (&_TunnelingResponseDataBlock{}).parse(ctx, readBuffer)
+	v, err := (new(_TunnelingResponseDataBlock)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/UnknownMessage.go b/plc4go/protocols/knxnetip/readwrite/model/UnknownMessage.go
index fd94d74e27b..6d681607b45 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/UnknownMessage.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/UnknownMessage.go
@@ -55,16 +55,13 @@ type UnknownMessage interface {
 type _UnknownMessage struct {
 	KnxNetIpMessageContract
 	UnknownData []byte
-
-	// Arguments.
-	TotalLength uint16
 }
 
 var _ UnknownMessage = (*_UnknownMessage)(nil)
 var _ KnxNetIpMessageRequirements = (*_UnknownMessage)(nil)
 
 // NewUnknownMessage factory function for _UnknownMessage
-func NewUnknownMessage(unknownData []byte, totalLength uint16) *_UnknownMessage {
+func NewUnknownMessage(unknownData []byte) *_UnknownMessage {
 	_result := &_UnknownMessage{
 		KnxNetIpMessageContract: NewKnxNetIpMessage(),
 		UnknownData:             unknownData,
@@ -85,8 +82,6 @@ type UnknownMessageBuilder interface {
 	WithMandatoryFields(unknownData []byte) UnknownMessageBuilder
 	// WithUnknownData adds UnknownData (property field)
 	WithUnknownData(...byte) UnknownMessageBuilder
-	// WithArgTotalLength sets a parser argument
-	WithArgTotalLength(uint16) UnknownMessageBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() KnxNetIpMessageBuilder
 	// Build builds the UnknownMessage or returns an error if something is wrong
@@ -124,11 +119,6 @@ func (b *_UnknownMessageBuilder) WithUnknownData(unknownData ...byte) UnknownMes
 	return b
 }
 
-func (b *_UnknownMessageBuilder) WithArgTotalLength(totalLength uint16) UnknownMessageBuilder {
-	b.TotalLength = totalLength
-	return b
-}
-
 func (b *_UnknownMessageBuilder) Build() (UnknownMessage, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -292,16 +282,6 @@ func (m *_UnknownMessage) SerializeWithWriteBuffer(ctx context.Context, writeBuf
 	return m.KnxNetIpMessageContract.(*_KnxNetIpMessage).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_UnknownMessage) GetTotalLength() uint16 {
-	return m.TotalLength
-}
-
-//
-////
-
 func (m *_UnknownMessage) IsUnknownMessage() {}
 
 func (m *_UnknownMessage) DeepCopy() any {
@@ -315,7 +295,6 @@ func (m *_UnknownMessage) deepCopy() *_UnknownMessage {
 	_UnknownMessageCopy := &_UnknownMessage{
 		m.KnxNetIpMessageContract.(*_KnxNetIpMessage).deepCopy(),
 		utils.DeepCopySlice[byte, byte](m.UnknownData),
-		m.TotalLength,
 	}
 	_UnknownMessageCopy.KnxNetIpMessageContract.(*_KnxNetIpMessage)._SubType = m
 	return _UnknownMessageCopy
diff --git a/plc4go/protocols/modbus/readwrite/ParserHelper.go b/plc4go/protocols/modbus/readwrite/ParserHelper.go
index ca635441019..bbdb887ebe6 100644
--- a/plc4go/protocols/modbus/readwrite/ParserHelper.go
+++ b/plc4go/protocols/modbus/readwrite/ParserHelper.go
@@ -52,8 +52,6 @@ func (m ModbusParserHelper) Parse(typeName string, arguments []string, io utils.
 		return ModbusPDUReadFileRecordResponseItemParseWithBuffer(context.Background(), io)
 	case "ModbusDeviceInformationObject":
 		return ModbusDeviceInformationObjectParseWithBuffer(context.Background(), io)
-	case "ModbusConstants":
-		return ModbusConstantsParseWithBuffer(context.Background(), io)
 	case "ModbusPDUWriteFileRecordResponseItem":
 		return ModbusPDUWriteFileRecordResponseItemParseWithBuffer(context.Background(), io)
 	case "ModbusPDU":
diff --git a/plc4go/protocols/modbus/readwrite/XmlParserHelper.go b/plc4go/protocols/modbus/readwrite/XmlParserHelper.go
index a9a6bda66fe..a2a6630bc38 100644
--- a/plc4go/protocols/modbus/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/modbus/readwrite/XmlParserHelper.go
@@ -60,8 +60,6 @@ func (m ModbusXmlParserHelper) Parse(typeName string, xmlString string, parserAr
 		return ModbusPDUReadFileRecordResponseItemParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
 	case "ModbusDeviceInformationObject":
 		return ModbusDeviceInformationObjectParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
-	case "ModbusConstants":
-		return ModbusConstantsParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
 	case "ModbusPDUWriteFileRecordResponseItem":
 		return ModbusPDUWriteFileRecordResponseItemParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
 	case "ModbusPDU":
diff --git a/plc4go/protocols/modbus/readwrite/model/Constants.go b/plc4go/protocols/modbus/readwrite/model/Constants.go
new file mode 100644
index 00000000000..89164bf5758
--- /dev/null
+++ b/plc4go/protocols/modbus/readwrite/model/Constants.go
@@ -0,0 +1,24 @@
+/*
+ * 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 model
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Constant values.
+var Constant_MODBUSTCPDEFAULTPORT uint16 = uint16(502)
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusADU.go b/plc4go/protocols/modbus/readwrite/model/ModbusADU.go
index 24c90e7425a..4a19d538418 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusADU.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusADU.go
@@ -49,8 +49,6 @@ type ModbusADU interface {
 
 // ModbusADUContract provides a set of functions which can be overwritten by a sub struct
 type ModbusADUContract interface {
-	// GetResponse() returns a parser argument
-	GetResponse() bool
 	// IsModbusADU is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsModbusADU()
 	// CreateBuilder creates a ModbusADUBuilder
@@ -71,16 +69,13 @@ type _ModbusADU struct {
 		ModbusADUContract
 		ModbusADURequirements
 	}
-
-	// Arguments.
-	Response bool
 }
 
 var _ ModbusADUContract = (*_ModbusADU)(nil)
 
 // NewModbusADU factory function for _ModbusADU
-func NewModbusADU(response bool) *_ModbusADU {
-	return &_ModbusADU{Response: response}
+func NewModbusADU() *_ModbusADU {
+	return &_ModbusADU{}
 }
 
 ///////////////////////////////////////////////////////////
@@ -93,8 +88,6 @@ type ModbusADUBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
 	WithMandatoryFields() ModbusADUBuilder
-	// WithArgResponse sets a parser argument
-	WithArgResponse(bool) ModbusADUBuilder
 	// AsModbusTcpADU converts this build to a subType of ModbusADU. It is always possible to return to current builder using Done()
 	AsModbusTcpADU() ModbusTcpADUBuilder
 	// AsModbusRtuADU converts this build to a subType of ModbusADU. It is always possible to return to current builder using Done()
@@ -136,11 +129,6 @@ func (b *_ModbusADUBuilder) WithMandatoryFields() ModbusADUBuilder {
 	return b
 }
 
-func (b *_ModbusADUBuilder) WithArgResponse(response bool) ModbusADUBuilder {
-	b.Response = response
-	return b
-}
-
 func (b *_ModbusADUBuilder) PartialBuild() (ModbusADUContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -274,7 +262,7 @@ func ModbusADUParseWithBufferProducer[T ModbusADU](driverType DriverType, respon
 }
 
 func ModbusADUParseWithBuffer[T ModbusADU](ctx context.Context, readBuffer utils.ReadBuffer, driverType DriverType, response bool) (T, error) {
-	v, err := (&_ModbusADU{Response: response}).parse(ctx, readBuffer, driverType, response)
+	v, err := (new(_ModbusADU)).parse(ctx, readBuffer, driverType, response)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -345,16 +333,6 @@ func (pm *_ModbusADU) serializeParent(ctx context.Context, writeBuffer utils.Wri
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_ModbusADU) GetResponse() bool {
-	return m.Response
-}
-
-//
-////
-
 func (m *_ModbusADU) IsModbusADU() {}
 
 func (m *_ModbusADU) DeepCopy() any {
@@ -367,7 +345,6 @@ func (m *_ModbusADU) deepCopy() *_ModbusADU {
 	}
 	_ModbusADUCopy := &_ModbusADU{
 		nil, // will be set by child
-		m.Response,
 	}
 	return _ModbusADUCopy
 }
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusAsciiADU.go b/plc4go/protocols/modbus/readwrite/model/ModbusAsciiADU.go
index e3bf1f0e648..f1826693369 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusAsciiADU.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusAsciiADU.go
@@ -64,12 +64,12 @@ var _ ModbusAsciiADU = (*_ModbusAsciiADU)(nil)
 var _ ModbusADURequirements = (*_ModbusAsciiADU)(nil)
 
 // NewModbusAsciiADU factory function for _ModbusAsciiADU
-func NewModbusAsciiADU(address uint8, pdu ModbusPDU, response bool) *_ModbusAsciiADU {
+func NewModbusAsciiADU(address uint8, pdu ModbusPDU) *_ModbusAsciiADU {
 	if pdu == nil {
 		panic("pdu of type ModbusPDU for ModbusAsciiADU must not be nil")
 	}
 	_result := &_ModbusAsciiADU{
-		ModbusADUContract: NewModbusADU(response),
+		ModbusADUContract: NewModbusADU(),
 		Address:           address,
 		Pdu:               pdu,
 	}
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationObject.go b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationObject.go
index bd3fb548d8f..6323e051346 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationObject.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationObject.go
@@ -211,7 +211,7 @@ func ModbusDeviceInformationObjectParseWithBufferProducer() func(ctx context.Con
 }
 
 func ModbusDeviceInformationObjectParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ModbusDeviceInformationObject, error) {
-	v, err := (&_ModbusDeviceInformationObject{}).parse(ctx, readBuffer)
+	v, err := (new(_ModbusDeviceInformationObject)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDU.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDU.go
index 89f42abcb4b..7468bffd6fe 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDU.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDU.go
@@ -703,7 +703,7 @@ func ModbusPDUParseWithBufferProducer[T ModbusPDU](response bool) func(ctx conte
 }
 
 func ModbusPDUParseWithBuffer[T ModbusPDU](ctx context.Context, readBuffer utils.ReadBuffer, response bool) (T, error) {
-	v, err := (&_ModbusPDU{}).parse(ctx, readBuffer, response)
+	v, err := (new(_ModbusPDU)).parse(ctx, readBuffer, response)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go
index ee7349eeeaf..ca126dcd8a4 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go
@@ -240,7 +240,7 @@ func ModbusPDUReadFileRecordRequestItemParseWithBufferProducer() func(ctx contex
 }
 
 func ModbusPDUReadFileRecordRequestItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ModbusPDUReadFileRecordRequestItem, error) {
-	v, err := (&_ModbusPDUReadFileRecordRequestItem{}).parse(ctx, readBuffer)
+	v, err := (new(_ModbusPDUReadFileRecordRequestItem)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go
index 58c5cba0a44..d5e5586acc4 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go
@@ -211,7 +211,7 @@ func ModbusPDUReadFileRecordResponseItemParseWithBufferProducer() func(ctx conte
 }
 
 func ModbusPDUReadFileRecordResponseItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ModbusPDUReadFileRecordResponseItem, error) {
-	v, err := (&_ModbusPDUReadFileRecordResponseItem{}).parse(ctx, readBuffer)
+	v, err := (new(_ModbusPDUReadFileRecordResponseItem)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go
index 3c2e471be9d..d609fe140b8 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go
@@ -245,7 +245,7 @@ func ModbusPDUWriteFileRecordRequestItemParseWithBufferProducer() func(ctx conte
 }
 
 func ModbusPDUWriteFileRecordRequestItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ModbusPDUWriteFileRecordRequestItem, error) {
-	v, err := (&_ModbusPDUWriteFileRecordRequestItem{}).parse(ctx, readBuffer)
+	v, err := (new(_ModbusPDUWriteFileRecordRequestItem)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go
index 8b00d14d37c..6fc9a6c897b 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go
@@ -245,7 +245,7 @@ func ModbusPDUWriteFileRecordResponseItemParseWithBufferProducer() func(ctx cont
 }
 
 func ModbusPDUWriteFileRecordResponseItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ModbusPDUWriteFileRecordResponseItem, error) {
-	v, err := (&_ModbusPDUWriteFileRecordResponseItem{}).parse(ctx, readBuffer)
+	v, err := (new(_ModbusPDUWriteFileRecordResponseItem)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusRtuADU.go b/plc4go/protocols/modbus/readwrite/model/ModbusRtuADU.go
index 03b03eb9e30..1e2644eaf1f 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusRtuADU.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusRtuADU.go
@@ -64,12 +64,12 @@ var _ ModbusRtuADU = (*_ModbusRtuADU)(nil)
 var _ ModbusADURequirements = (*_ModbusRtuADU)(nil)
 
 // NewModbusRtuADU factory function for _ModbusRtuADU
-func NewModbusRtuADU(address uint8, pdu ModbusPDU, response bool) *_ModbusRtuADU {
+func NewModbusRtuADU(address uint8, pdu ModbusPDU) *_ModbusRtuADU {
 	if pdu == nil {
 		panic("pdu of type ModbusPDU for ModbusRtuADU must not be nil")
 	}
 	_result := &_ModbusRtuADU{
-		ModbusADUContract: NewModbusADU(response),
+		ModbusADUContract: NewModbusADU(),
 		Address:           address,
 		Pdu:               pdu,
 	}
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusTcpADU.go b/plc4go/protocols/modbus/readwrite/model/ModbusTcpADU.go
index 3a07d7bbd39..36d730e8db5 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusTcpADU.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusTcpADU.go
@@ -70,12 +70,12 @@ var _ ModbusTcpADU = (*_ModbusTcpADU)(nil)
 var _ ModbusADURequirements = (*_ModbusTcpADU)(nil)
 
 // NewModbusTcpADU factory function for _ModbusTcpADU
-func NewModbusTcpADU(transactionIdentifier uint16, unitIdentifier uint8, pdu ModbusPDU, response bool) *_ModbusTcpADU {
+func NewModbusTcpADU(transactionIdentifier uint16, unitIdentifier uint8, pdu ModbusPDU) *_ModbusTcpADU {
 	if pdu == nil {
 		panic("pdu of type ModbusPDU for ModbusTcpADU must not be nil")
 	}
 	_result := &_ModbusTcpADU{
-		ModbusADUContract:     NewModbusADU(response),
+		ModbusADUContract:     NewModbusADU(),
 		TransactionIdentifier: transactionIdentifier,
 		UnitIdentifier:        unitIdentifier,
 		Pdu:                   pdu,
diff --git a/plc4go/protocols/opcua/readwrite/model/ApplicationInstanceCertificate.go b/plc4go/protocols/opcua/readwrite/model/ApplicationInstanceCertificate.go
index f7f366cf6e6..463fe4e5d70 100644
--- a/plc4go/protocols/opcua/readwrite/model/ApplicationInstanceCertificate.go
+++ b/plc4go/protocols/opcua/readwrite/model/ApplicationInstanceCertificate.go
@@ -160,7 +160,7 @@ func ApplicationInstanceCertificateParseWithBufferProducer() func(ctx context.Co
 }
 
 func ApplicationInstanceCertificateParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ApplicationInstanceCertificate, error) {
-	v, err := (&_ApplicationInstanceCertificate{}).parse(ctx, readBuffer)
+	v, err := (new(_ApplicationInstanceCertificate)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/AudioDataType.go b/plc4go/protocols/opcua/readwrite/model/AudioDataType.go
index 8bced63bf02..8a1a6171197 100644
--- a/plc4go/protocols/opcua/readwrite/model/AudioDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/AudioDataType.go
@@ -160,7 +160,7 @@ func AudioDataTypeParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func AudioDataTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AudioDataType, error) {
-	v, err := (&_AudioDataType{}).parse(ctx, readBuffer)
+	v, err := (new(_AudioDataType)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/BinaryExtensionObjectWithMask.go b/plc4go/protocols/opcua/readwrite/model/BinaryExtensionObjectWithMask.go
index b2448763096..1711719a89a 100644
--- a/plc4go/protocols/opcua/readwrite/model/BinaryExtensionObjectWithMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/BinaryExtensionObjectWithMask.go
@@ -59,12 +59,12 @@ var _ BinaryExtensionObjectWithMask = (*_BinaryExtensionObjectWithMask)(nil)
 var _ ExtensionObjectWithMaskRequirements = (*_BinaryExtensionObjectWithMask)(nil)
 
 // NewBinaryExtensionObjectWithMask factory function for _BinaryExtensionObjectWithMask
-func NewBinaryExtensionObjectWithMask(typeId ExpandedNodeId, encodingMask ExtensionObjectEncodingMask, body ExtensionObjectDefinition, extensionId int32, includeEncodingMask bool) *_BinaryExtensionObjectWithMask {
+func NewBinaryExtensionObjectWithMask(typeId ExpandedNodeId, encodingMask ExtensionObjectEncodingMask, body ExtensionObjectDefinition) *_BinaryExtensionObjectWithMask {
 	if body == nil {
 		panic("body of type ExtensionObjectDefinition for BinaryExtensionObjectWithMask must not be nil")
 	}
 	_result := &_BinaryExtensionObjectWithMask{
-		ExtensionObjectWithMaskContract: NewExtensionObjectWithMask(typeId, encodingMask, extensionId),
+		ExtensionObjectWithMaskContract: NewExtensionObjectWithMask(typeId, encodingMask),
 		Body:                            body,
 	}
 	_result.ExtensionObjectWithMaskContract.(*_ExtensionObjectWithMask)._SubType = _result
diff --git a/plc4go/protocols/opcua/readwrite/model/BinaryPayload.go b/plc4go/protocols/opcua/readwrite/model/BinaryPayload.go
index 0fa1996cc67..306b4484e94 100644
--- a/plc4go/protocols/opcua/readwrite/model/BinaryPayload.go
+++ b/plc4go/protocols/opcua/readwrite/model/BinaryPayload.go
@@ -59,9 +59,9 @@ var _ BinaryPayload = (*_BinaryPayload)(nil)
 var _ PayloadRequirements = (*_BinaryPayload)(nil)
 
 // NewBinaryPayload factory function for _BinaryPayload
-func NewBinaryPayload(sequenceHeader SequenceHeader, payload []byte, byteCount uint32) *_BinaryPayload {
+func NewBinaryPayload(sequenceHeader SequenceHeader, payload []byte) *_BinaryPayload {
 	_result := &_BinaryPayload{
-		PayloadContract: NewPayload(sequenceHeader, byteCount),
+		PayloadContract: NewPayload(sequenceHeader),
 		Payload:         payload,
 	}
 	_result.PayloadContract.(*_Payload)._SubType = _result
diff --git a/plc4go/protocols/opcua/readwrite/model/BitFieldMaskDataType.go b/plc4go/protocols/opcua/readwrite/model/BitFieldMaskDataType.go
index d40d51017bd..1d8f8f6b4b2 100644
--- a/plc4go/protocols/opcua/readwrite/model/BitFieldMaskDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/BitFieldMaskDataType.go
@@ -160,7 +160,7 @@ func BitFieldMaskDataTypeParseWithBufferProducer() func(ctx context.Context, rea
 }
 
 func BitFieldMaskDataTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (BitFieldMaskDataType, error) {
-	v, err := (&_BitFieldMaskDataType{}).parse(ctx, readBuffer)
+	v, err := (new(_BitFieldMaskDataType)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/ByteStringArray.go b/plc4go/protocols/opcua/readwrite/model/ByteStringArray.go
index 2dd31a5e01b..03877bf206d 100644
--- a/plc4go/protocols/opcua/readwrite/model/ByteStringArray.go
+++ b/plc4go/protocols/opcua/readwrite/model/ByteStringArray.go
@@ -208,7 +208,7 @@ func ByteStringArrayParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func ByteStringArrayParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ByteStringArray, error) {
-	v, err := (&_ByteStringArray{}).parse(ctx, readBuffer)
+	v, err := (new(_ByteStringArray)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/ByteStringNodeId.go b/plc4go/protocols/opcua/readwrite/model/ByteStringNodeId.go
index d23b122cfca..f65cb67ca12 100644
--- a/plc4go/protocols/opcua/readwrite/model/ByteStringNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/ByteStringNodeId.go
@@ -224,7 +224,7 @@ func ByteStringNodeIdParseWithBufferProducer() func(ctx context.Context, readBuf
 }
 
 func ByteStringNodeIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ByteStringNodeId, error) {
-	v, err := (&_ByteStringNodeId{}).parse(ctx, readBuffer)
+	v, err := (new(_ByteStringNodeId)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/ContinuationPoint.go b/plc4go/protocols/opcua/readwrite/model/ContinuationPoint.go
index efae570d30f..62750ad5b58 100644
--- a/plc4go/protocols/opcua/readwrite/model/ContinuationPoint.go
+++ b/plc4go/protocols/opcua/readwrite/model/ContinuationPoint.go
@@ -160,7 +160,7 @@ func ContinuationPointParseWithBufferProducer() func(ctx context.Context, readBu
 }
 
 func ContinuationPointParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ContinuationPoint, error) {
-	v, err := (&_ContinuationPoint{}).parse(ctx, readBuffer)
+	v, err := (new(_ContinuationPoint)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/Counter.go b/plc4go/protocols/opcua/readwrite/model/Counter.go
index d7060047c6f..fda040d7750 100644
--- a/plc4go/protocols/opcua/readwrite/model/Counter.go
+++ b/plc4go/protocols/opcua/readwrite/model/Counter.go
@@ -160,7 +160,7 @@ func CounterParseWithBufferProducer() func(ctx context.Context, readBuffer utils
 }
 
 func CounterParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (Counter, error) {
-	v, err := (&_Counter{}).parse(ctx, readBuffer)
+	v, err := (new(_Counter)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/DataValue.go b/plc4go/protocols/opcua/readwrite/model/DataValue.go
index 7c6342cf666..c9fb784f9ae 100644
--- a/plc4go/protocols/opcua/readwrite/model/DataValue.go
+++ b/plc4go/protocols/opcua/readwrite/model/DataValue.go
@@ -417,7 +417,7 @@ func DataValueParseWithBufferProducer() func(ctx context.Context, readBuffer uti
 }
 
 func DataValueParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (DataValue, error) {
-	v, err := (&_DataValue{}).parse(ctx, readBuffer)
+	v, err := (new(_DataValue)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/DateString.go b/plc4go/protocols/opcua/readwrite/model/DateString.go
index 650ca27d389..e425969e5e4 100644
--- a/plc4go/protocols/opcua/readwrite/model/DateString.go
+++ b/plc4go/protocols/opcua/readwrite/model/DateString.go
@@ -160,7 +160,7 @@ func DateStringParseWithBufferProducer() func(ctx context.Context, readBuffer ut
 }
 
 func DateStringParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (DateString, error) {
-	v, err := (&_DateString{}).parse(ctx, readBuffer)
+	v, err := (new(_DateString)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/DecimalString.go b/plc4go/protocols/opcua/readwrite/model/DecimalString.go
index 899dcbd7bda..2946f6c21dd 100644
--- a/plc4go/protocols/opcua/readwrite/model/DecimalString.go
+++ b/plc4go/protocols/opcua/readwrite/model/DecimalString.go
@@ -160,7 +160,7 @@ func DecimalStringParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func DecimalStringParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (DecimalString, error) {
-	v, err := (&_DecimalString{}).parse(ctx, readBuffer)
+	v, err := (new(_DecimalString)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/DiagnosticInfo.go b/plc4go/protocols/opcua/readwrite/model/DiagnosticInfo.go
index 16be3644c0c..cd95ec363b8 100644
--- a/plc4go/protocols/opcua/readwrite/model/DiagnosticInfo.go
+++ b/plc4go/protocols/opcua/readwrite/model/DiagnosticInfo.go
@@ -465,7 +465,7 @@ func DiagnosticInfoParseWithBufferProducer() func(ctx context.Context, readBuffe
 }
 
 func DiagnosticInfoParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (DiagnosticInfo, error) {
-	v, err := (&_DiagnosticInfo{}).parse(ctx, readBuffer)
+	v, err := (new(_DiagnosticInfo)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/DurationString.go b/plc4go/protocols/opcua/readwrite/model/DurationString.go
index 01ef99d17a7..4e58f3a3f6b 100644
--- a/plc4go/protocols/opcua/readwrite/model/DurationString.go
+++ b/plc4go/protocols/opcua/readwrite/model/DurationString.go
@@ -160,7 +160,7 @@ func DurationStringParseWithBufferProducer() func(ctx context.Context, readBuffe
 }
 
 func DurationStringParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (DurationString, error) {
-	v, err := (&_DurationString{}).parse(ctx, readBuffer)
+	v, err := (new(_DurationString)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/EccEncryptedSecret.go b/plc4go/protocols/opcua/readwrite/model/EccEncryptedSecret.go
index 47da7d6040f..9e3ae07f326 100644
--- a/plc4go/protocols/opcua/readwrite/model/EccEncryptedSecret.go
+++ b/plc4go/protocols/opcua/readwrite/model/EccEncryptedSecret.go
@@ -160,7 +160,7 @@ func EccEncryptedSecretParseWithBufferProducer() func(ctx context.Context, readB
 }
 
 func EccEncryptedSecretParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (EccEncryptedSecret, error) {
-	v, err := (&_EccEncryptedSecret{}).parse(ctx, readBuffer)
+	v, err := (new(_EccEncryptedSecret)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/EncodedTicket.go b/plc4go/protocols/opcua/readwrite/model/EncodedTicket.go
index 5bc594ef684..bc68476b2db 100644
--- a/plc4go/protocols/opcua/readwrite/model/EncodedTicket.go
+++ b/plc4go/protocols/opcua/readwrite/model/EncodedTicket.go
@@ -160,7 +160,7 @@ func EncodedTicketParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func EncodedTicketParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (EncodedTicket, error) {
-	v, err := (&_EncodedTicket{}).parse(ctx, readBuffer)
+	v, err := (new(_EncodedTicket)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/ExpandedNodeId.go b/plc4go/protocols/opcua/readwrite/model/ExpandedNodeId.go
index 56a21136839..c083ed70bc0 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExpandedNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExpandedNodeId.go
@@ -291,7 +291,7 @@ func ExpandedNodeIdParseWithBufferProducer() func(ctx context.Context, readBuffe
 }
 
 func ExpandedNodeIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ExpandedNodeId, error) {
-	v, err := (&_ExpandedNodeId{}).parse(ctx, readBuffer)
+	v, err := (new(_ExpandedNodeId)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/ExtensiblePayload.go b/plc4go/protocols/opcua/readwrite/model/ExtensiblePayload.go
index 0d63dc72e37..6c820f0907c 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExtensiblePayload.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExtensiblePayload.go
@@ -59,12 +59,12 @@ var _ ExtensiblePayload = (*_ExtensiblePayload)(nil)
 var _ PayloadRequirements = (*_ExtensiblePayload)(nil)
 
 // NewExtensiblePayload factory function for _ExtensiblePayload
-func NewExtensiblePayload(sequenceHeader SequenceHeader, payload RootExtensionObject, byteCount uint32) *_ExtensiblePayload {
+func NewExtensiblePayload(sequenceHeader SequenceHeader, payload RootExtensionObject) *_ExtensiblePayload {
 	if payload == nil {
 		panic("payload of type RootExtensionObject for ExtensiblePayload must not be nil")
 	}
 	_result := &_ExtensiblePayload{
-		PayloadContract: NewPayload(sequenceHeader, byteCount),
+		PayloadContract: NewPayload(sequenceHeader),
 		Payload:         payload,
 	}
 	_result.PayloadContract.(*_Payload)._SubType = _result
diff --git a/plc4go/protocols/opcua/readwrite/model/ExtensionObject.go b/plc4go/protocols/opcua/readwrite/model/ExtensionObject.go
index a204e945cdd..815ec2a3a5f 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExtensionObject.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExtensionObject.go
@@ -333,7 +333,7 @@ func ExtensionObjectParseWithBufferProducer[T ExtensionObject](includeEncodingMa
 }
 
 func ExtensionObjectParseWithBuffer[T ExtensionObject](ctx context.Context, readBuffer utils.ReadBuffer, includeEncodingMask bool) (T, error) {
-	v, err := (&_ExtensionObject{}).parse(ctx, readBuffer, includeEncodingMask)
+	v, err := (new(_ExtensionObject)).parse(ctx, readBuffer, includeEncodingMask)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/opcua/readwrite/model/ExtensionObjectDefinition.go b/plc4go/protocols/opcua/readwrite/model/ExtensionObjectDefinition.go
index c2d203594d6..824837a1e5f 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExtensionObjectDefinition.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExtensionObjectDefinition.go
@@ -4413,7 +4413,7 @@ func ExtensionObjectDefinitionParseWithBufferProducer[T ExtensionObjectDefinitio
 }
 
 func ExtensionObjectDefinitionParseWithBuffer[T ExtensionObjectDefinition](ctx context.Context, readBuffer utils.ReadBuffer, extensionId int32) (T, error) {
-	v, err := (&_ExtensionObjectDefinition{}).parse(ctx, readBuffer, extensionId)
+	v, err := (new(_ExtensionObjectDefinition)).parse(ctx, readBuffer, extensionId)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/opcua/readwrite/model/ExtensionObjectEncodingMask.go b/plc4go/protocols/opcua/readwrite/model/ExtensionObjectEncodingMask.go
index dfd732782e9..9b7b8a5b77b 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExtensionObjectEncodingMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExtensionObjectEncodingMask.go
@@ -228,7 +228,7 @@ func ExtensionObjectEncodingMaskParseWithBufferProducer() func(ctx context.Conte
 }
 
 func ExtensionObjectEncodingMaskParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ExtensionObjectEncodingMask, error) {
-	v, err := (&_ExtensionObjectEncodingMask{}).parse(ctx, readBuffer)
+	v, err := (new(_ExtensionObjectEncodingMask)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/ExtensionObjectWithMask.go b/plc4go/protocols/opcua/readwrite/model/ExtensionObjectWithMask.go
index cf5f646275b..705ce79cffc 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExtensionObjectWithMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExtensionObjectWithMask.go
@@ -53,8 +53,6 @@ type ExtensionObjectWithMaskContract interface {
 	ExtensionObjectContract
 	// GetEncodingMask returns EncodingMask (property field)
 	GetEncodingMask() ExtensionObjectEncodingMask
-	// GetExtensionId() returns a parser argument
-	GetExtensionId() int32
 	// GetIncludeEncodingMask returns IncludeEncodingMask (discriminator field)
 	GetIncludeEncodingMask() bool
 	// IsExtensionObjectWithMask is a marker method to prevent unintentional type checks (interfaces of same signature)
@@ -78,15 +76,12 @@ type _ExtensionObjectWithMask struct {
 		ExtensionObjectWithMaskRequirements
 	}
 	EncodingMask ExtensionObjectEncodingMask
-
-	// Arguments.
-	ExtensionId int32
 }
 
 var _ ExtensionObjectWithMaskContract = (*_ExtensionObjectWithMask)(nil)
 
 // NewExtensionObjectWithMask factory function for _ExtensionObjectWithMask
-func NewExtensionObjectWithMask(typeId ExpandedNodeId, encodingMask ExtensionObjectEncodingMask, extensionId int32) *_ExtensionObjectWithMask {
+func NewExtensionObjectWithMask(typeId ExpandedNodeId, encodingMask ExtensionObjectEncodingMask) *_ExtensionObjectWithMask {
 	if encodingMask == nil {
 		panic("encodingMask of type ExtensionObjectEncodingMask for ExtensionObjectWithMask must not be nil")
 	}
@@ -112,8 +107,6 @@ type ExtensionObjectWithMaskBuilder interface {
 	WithEncodingMask(ExtensionObjectEncodingMask) ExtensionObjectWithMaskBuilder
 	// WithEncodingMaskBuilder adds EncodingMask (property field) which is build by the builder
 	WithEncodingMaskBuilder(func(ExtensionObjectEncodingMaskBuilder) ExtensionObjectEncodingMaskBuilder) ExtensionObjectWithMaskBuilder
-	// WithArgExtensionId sets a parser argument
-	WithArgExtensionId(int32) ExtensionObjectWithMaskBuilder
 	// AsBinaryExtensionObjectWithMask converts this build to a subType of ExtensionObjectWithMask. It is always possible to return to current builder using Done()
 	AsBinaryExtensionObjectWithMask() BinaryExtensionObjectWithMaskBuilder
 	// AsNullExtensionObjectWithMask converts this build to a subType of ExtensionObjectWithMask. It is always possible to return to current builder using Done()
@@ -177,11 +170,6 @@ func (b *_ExtensionObjectWithMaskBuilder) WithEncodingMaskBuilder(builderSupplie
 	return b
 }
 
-func (b *_ExtensionObjectWithMaskBuilder) WithArgExtensionId(extensionId int32) ExtensionObjectWithMaskBuilder {
-	b.ExtensionId = extensionId
-	return b
-}
-
 func (b *_ExtensionObjectWithMaskBuilder) PartialBuild() (ExtensionObjectWithMaskContract, error) {
 	if b.EncodingMask == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'encodingMask' not set"))
@@ -402,16 +390,6 @@ func (pm *_ExtensionObjectWithMask) serializeParent(ctx context.Context, writeBu
 	return pm.ExtensionObjectContract.(*_ExtensionObject).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_ExtensionObjectWithMask) GetExtensionId() int32 {
-	return m.ExtensionId
-}
-
-//
-////
-
 func (m *_ExtensionObjectWithMask) IsExtensionObjectWithMask() {}
 
 func (m *_ExtensionObjectWithMask) DeepCopy() any {
@@ -426,7 +404,6 @@ func (m *_ExtensionObjectWithMask) deepCopy() *_ExtensionObjectWithMask {
 		m.ExtensionObjectContract.(*_ExtensionObject).deepCopy(),
 		nil, // will be set by child
 		utils.DeepCopy[ExtensionObjectEncodingMask](m.EncodingMask),
-		m.ExtensionId,
 	}
 	_ExtensionObjectWithMaskCopy.ExtensionObjectContract.(*_ExtensionObject)._SubType = m
 	return _ExtensionObjectWithMaskCopy
diff --git a/plc4go/protocols/opcua/readwrite/model/FourByteNodeId.go b/plc4go/protocols/opcua/readwrite/model/FourByteNodeId.go
index a07fb6ae040..b35e5b88f12 100644
--- a/plc4go/protocols/opcua/readwrite/model/FourByteNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/FourByteNodeId.go
@@ -206,7 +206,7 @@ func FourByteNodeIdParseWithBufferProducer() func(ctx context.Context, readBuffe
 }
 
 func FourByteNodeIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (FourByteNodeId, error) {
-	v, err := (&_FourByteNodeId{}).parse(ctx, readBuffer)
+	v, err := (new(_FourByteNodeId)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/GuidNodeId.go b/plc4go/protocols/opcua/readwrite/model/GuidNodeId.go
index 53428552aca..9ea410234d1 100644
--- a/plc4go/protocols/opcua/readwrite/model/GuidNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/GuidNodeId.go
@@ -224,7 +224,7 @@ func GuidNodeIdParseWithBufferProducer() func(ctx context.Context, readBuffer ut
 }
 
 func GuidNodeIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (GuidNodeId, error) {
-	v, err := (&_GuidNodeId{}).parse(ctx, readBuffer)
+	v, err := (new(_GuidNodeId)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/GuidValue.go b/plc4go/protocols/opcua/readwrite/model/GuidValue.go
index 4b1f5e9868f..19684ab3b63 100644
--- a/plc4go/protocols/opcua/readwrite/model/GuidValue.go
+++ b/plc4go/protocols/opcua/readwrite/model/GuidValue.go
@@ -261,7 +261,7 @@ func GuidValueParseWithBufferProducer() func(ctx context.Context, readBuffer uti
 }
 
 func GuidValueParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (GuidValue, error) {
-	v, err := (&_GuidValue{}).parse(ctx, readBuffer)
+	v, err := (new(_GuidValue)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/Handle.go b/plc4go/protocols/opcua/readwrite/model/Handle.go
index b42d9760485..07210721285 100644
--- a/plc4go/protocols/opcua/readwrite/model/Handle.go
+++ b/plc4go/protocols/opcua/readwrite/model/Handle.go
@@ -160,7 +160,7 @@ func HandleParseWithBufferProducer() func(ctx context.Context, readBuffer utils.
 }
 
 func HandleParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (Handle, error) {
-	v, err := (&_Handle{}).parse(ctx, readBuffer)
+	v, err := (new(_Handle)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/ImageBMP.go b/plc4go/protocols/opcua/readwrite/model/ImageBMP.go
index 15698ff6956..c5a95f078be 100644
--- a/plc4go/protocols/opcua/readwrite/model/ImageBMP.go
+++ b/plc4go/protocols/opcua/readwrite/model/ImageBMP.go
@@ -160,7 +160,7 @@ func ImageBMPParseWithBufferProducer() func(ctx context.Context, readBuffer util
 }
 
 func ImageBMPParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ImageBMP, error) {
-	v, err := (&_ImageBMP{}).parse(ctx, readBuffer)
+	v, err := (new(_ImageBMP)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/ImageGIF.go b/plc4go/protocols/opcua/readwrite/model/ImageGIF.go
index e7d2a2abaa2..e2481553a29 100644
--- a/plc4go/protocols/opcua/readwrite/model/ImageGIF.go
+++ b/plc4go/protocols/opcua/readwrite/model/ImageGIF.go
@@ -160,7 +160,7 @@ func ImageGIFParseWithBufferProducer() func(ctx context.Context, readBuffer util
 }
 
 func ImageGIFParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ImageGIF, error) {
-	v, err := (&_ImageGIF{}).parse(ctx, readBuffer)
+	v, err := (new(_ImageGIF)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/ImageJPG.go b/plc4go/protocols/opcua/readwrite/model/ImageJPG.go
index 97558dc6dfd..746e688a1b5 100644
--- a/plc4go/protocols/opcua/readwrite/model/ImageJPG.go
+++ b/plc4go/protocols/opcua/readwrite/model/ImageJPG.go
@@ -160,7 +160,7 @@ func ImageJPGParseWithBufferProducer() func(ctx context.Context, readBuffer util
 }
 
 func ImageJPGParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ImageJPG, error) {
-	v, err := (&_ImageJPG{}).parse(ctx, readBuffer)
+	v, err := (new(_ImageJPG)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/ImagePNG.go b/plc4go/protocols/opcua/readwrite/model/ImagePNG.go
index 1663986062d..24c6a452441 100644
--- a/plc4go/protocols/opcua/readwrite/model/ImagePNG.go
+++ b/plc4go/protocols/opcua/readwrite/model/ImagePNG.go
@@ -160,7 +160,7 @@ func ImagePNGParseWithBufferProducer() func(ctx context.Context, readBuffer util
 }
 
 func ImagePNGParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ImagePNG, error) {
-	v, err := (&_ImagePNG{}).parse(ctx, readBuffer)
+	v, err := (new(_ImagePNG)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/Index.go b/plc4go/protocols/opcua/readwrite/model/Index.go
index 2d85e82225e..6fb1f018b34 100644
--- a/plc4go/protocols/opcua/readwrite/model/Index.go
+++ b/plc4go/protocols/opcua/readwrite/model/Index.go
@@ -160,7 +160,7 @@ func IndexParseWithBufferProducer() func(ctx context.Context, readBuffer utils.R
 }
 
 func IndexParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (Index, error) {
-	v, err := (&_Index{}).parse(ctx, readBuffer)
+	v, err := (new(_Index)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/IntegerId.go b/plc4go/protocols/opcua/readwrite/model/IntegerId.go
index 6a2f135a67e..90720eeb032 100644
--- a/plc4go/protocols/opcua/readwrite/model/IntegerId.go
+++ b/plc4go/protocols/opcua/readwrite/model/IntegerId.go
@@ -160,7 +160,7 @@ func IntegerIdParseWithBufferProducer() func(ctx context.Context, readBuffer uti
 }
 
 func IntegerIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (IntegerId, error) {
-	v, err := (&_IntegerId{}).parse(ctx, readBuffer)
+	v, err := (new(_IntegerId)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/LocaleId.go b/plc4go/protocols/opcua/readwrite/model/LocaleId.go
index 0311f491fa0..b13b470f6b1 100644
--- a/plc4go/protocols/opcua/readwrite/model/LocaleId.go
+++ b/plc4go/protocols/opcua/readwrite/model/LocaleId.go
@@ -160,7 +160,7 @@ func LocaleIdParseWithBufferProducer() func(ctx context.Context, readBuffer util
 }
 
 func LocaleIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (LocaleId, error) {
-	v, err := (&_LocaleId{}).parse(ctx, readBuffer)
+	v, err := (new(_LocaleId)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/LocalizedText.go b/plc4go/protocols/opcua/readwrite/model/LocalizedText.go
index 5ea04532d2d..4443fd727b9 100644
--- a/plc4go/protocols/opcua/readwrite/model/LocalizedText.go
+++ b/plc4go/protocols/opcua/readwrite/model/LocalizedText.go
@@ -273,7 +273,7 @@ func LocalizedTextParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func LocalizedTextParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (LocalizedText, error) {
-	v, err := (&_LocalizedText{}).parse(ctx, readBuffer)
+	v, err := (new(_LocalizedText)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/MessagePDU.go b/plc4go/protocols/opcua/readwrite/model/MessagePDU.go
index fb72b0db169..f4eb7dba3ed 100644
--- a/plc4go/protocols/opcua/readwrite/model/MessagePDU.go
+++ b/plc4go/protocols/opcua/readwrite/model/MessagePDU.go
@@ -52,8 +52,6 @@ type MessagePDU interface {
 type MessagePDUContract interface {
 	// GetChunk returns Chunk (property field)
 	GetChunk() ChunkType
-	// GetBinary() returns a parser argument
-	GetBinary() bool
 	// IsMessagePDU is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsMessagePDU()
 	// CreateBuilder creates a MessagePDUBuilder
@@ -77,16 +75,13 @@ type _MessagePDU struct {
 		MessagePDURequirements
 	}
 	Chunk ChunkType
-
-	// Arguments.
-	Binary bool
 }
 
 var _ MessagePDUContract = (*_MessagePDU)(nil)
 
 // NewMessagePDU factory function for _MessagePDU
-func NewMessagePDU(chunk ChunkType, binary bool) *_MessagePDU {
-	return &_MessagePDU{Chunk: chunk, Binary: binary}
+func NewMessagePDU(chunk ChunkType) *_MessagePDU {
+	return &_MessagePDU{Chunk: chunk}
 }
 
 ///////////////////////////////////////////////////////////
@@ -101,8 +96,6 @@ type MessagePDUBuilder interface {
 	WithMandatoryFields(chunk ChunkType) MessagePDUBuilder
 	// WithChunk adds Chunk (property field)
 	WithChunk(ChunkType) MessagePDUBuilder
-	// WithArgBinary sets a parser argument
-	WithArgBinary(bool) MessagePDUBuilder
 	// AsOpcuaHelloRequest converts this build to a subType of MessagePDU. It is always possible to return to current builder using Done()
 	AsOpcuaHelloRequest() OpcuaHelloRequestBuilder
 	// AsOpcuaAcknowledgeResponse converts this build to a subType of MessagePDU. It is always possible to return to current builder using Done()
@@ -159,11 +152,6 @@ func (b *_MessagePDUBuilder) WithChunk(chunk ChunkType) MessagePDUBuilder {
 	return b
 }
 
-func (b *_MessagePDUBuilder) WithArgBinary(binary bool) MessagePDUBuilder {
-	b.Binary = binary
-	return b
-}
-
 func (b *_MessagePDUBuilder) PartialBuild() (MessagePDUContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -369,7 +357,7 @@ func MessagePDUParseWithBufferProducer[T MessagePDU](response bool, binary bool)
 }
 
 func MessagePDUParseWithBuffer[T MessagePDU](ctx context.Context, readBuffer utils.ReadBuffer, response bool, binary bool) (T, error) {
-	v, err := (&_MessagePDU{Binary: binary}).parse(ctx, readBuffer, response, binary)
+	v, err := (new(_MessagePDU)).parse(ctx, readBuffer, response, binary)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -489,16 +477,6 @@ func (pm *_MessagePDU) serializeParent(ctx context.Context, writeBuffer utils.Wr
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_MessagePDU) GetBinary() bool {
-	return m.Binary
-}
-
-//
-////
-
 func (m *_MessagePDU) IsMessagePDU() {}
 
 func (m *_MessagePDU) DeepCopy() any {
@@ -512,7 +490,6 @@ func (m *_MessagePDU) deepCopy() *_MessagePDU {
 	_MessagePDUCopy := &_MessagePDU{
 		nil, // will be set by child
 		m.Chunk,
-		m.Binary,
 	}
 	return _MessagePDUCopy
 }
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeId.go b/plc4go/protocols/opcua/readwrite/model/NodeId.go
index 36f0baf74d3..cf06cbc8fa1 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeId.go
@@ -212,7 +212,7 @@ func NodeIdParseWithBufferProducer() func(ctx context.Context, readBuffer utils.
 }
 
 func NodeIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (NodeId, error) {
-	v, err := (&_NodeId{}).parse(ctx, readBuffer)
+	v, err := (new(_NodeId)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeIdTypeDefinition.go b/plc4go/protocols/opcua/readwrite/model/NodeIdTypeDefinition.go
index ecad4d20120..6aefb50495e 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeIdTypeDefinition.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeIdTypeDefinition.go
@@ -327,7 +327,7 @@ func NodeIdTypeDefinitionParseWithBufferProducer[T NodeIdTypeDefinition]() func(
 }
 
 func NodeIdTypeDefinitionParseWithBuffer[T NodeIdTypeDefinition](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_NodeIdTypeDefinition{}).parse(ctx, readBuffer)
+	v, err := (new(_NodeIdTypeDefinition)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/opcua/readwrite/model/NormalizedString.go b/plc4go/protocols/opcua/readwrite/model/NormalizedString.go
index 509440e13a3..6e20649ee71 100644
--- a/plc4go/protocols/opcua/readwrite/model/NormalizedString.go
+++ b/plc4go/protocols/opcua/readwrite/model/NormalizedString.go
@@ -160,7 +160,7 @@ func NormalizedStringParseWithBufferProducer() func(ctx context.Context, readBuf
 }
 
 func NormalizedStringParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (NormalizedString, error) {
-	v, err := (&_NormalizedString{}).parse(ctx, readBuffer)
+	v, err := (new(_NormalizedString)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/NullExtensionObjectWithMask.go b/plc4go/protocols/opcua/readwrite/model/NullExtensionObjectWithMask.go
index f64f33fa487..41664f7bf79 100644
--- a/plc4go/protocols/opcua/readwrite/model/NullExtensionObjectWithMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/NullExtensionObjectWithMask.go
@@ -57,9 +57,9 @@ var _ NullExtensionObjectWithMask = (*_NullExtensionObjectWithMask)(nil)
 var _ ExtensionObjectWithMaskRequirements = (*_NullExtensionObjectWithMask)(nil)
 
 // NewNullExtensionObjectWithMask factory function for _NullExtensionObjectWithMask
-func NewNullExtensionObjectWithMask(typeId ExpandedNodeId, encodingMask ExtensionObjectEncodingMask, extensionId int32, includeEncodingMask bool) *_NullExtensionObjectWithMask {
+func NewNullExtensionObjectWithMask(typeId ExpandedNodeId, encodingMask ExtensionObjectEncodingMask) *_NullExtensionObjectWithMask {
 	_result := &_NullExtensionObjectWithMask{
-		ExtensionObjectWithMaskContract: NewExtensionObjectWithMask(typeId, encodingMask, extensionId),
+		ExtensionObjectWithMaskContract: NewExtensionObjectWithMask(typeId, encodingMask),
 	}
 	_result.ExtensionObjectWithMaskContract.(*_ExtensionObjectWithMask)._SubType = _result
 	return _result
diff --git a/plc4go/protocols/opcua/readwrite/model/NumericNodeId.go b/plc4go/protocols/opcua/readwrite/model/NumericNodeId.go
index 31bd25309bb..fdc156b92c7 100644
--- a/plc4go/protocols/opcua/readwrite/model/NumericNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/NumericNodeId.go
@@ -206,7 +206,7 @@ func NumericNodeIdParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func NumericNodeIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (NumericNodeId, error) {
-	v, err := (&_NumericNodeId{}).parse(ctx, readBuffer)
+	v, err := (new(_NumericNodeId)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/NumericRange.go b/plc4go/protocols/opcua/readwrite/model/NumericRange.go
index 823a4172b4d..4b6859d33d3 100644
--- a/plc4go/protocols/opcua/readwrite/model/NumericRange.go
+++ b/plc4go/protocols/opcua/readwrite/model/NumericRange.go
@@ -160,7 +160,7 @@ func NumericRangeParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func NumericRangeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (NumericRange, error) {
-	v, err := (&_NumericRange{}).parse(ctx, readBuffer)
+	v, err := (new(_NumericRange)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaAPU.go b/plc4go/protocols/opcua/readwrite/model/OpcuaAPU.go
index 5f6477ab738..2d0dfe307b6 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaAPU.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaAPU.go
@@ -53,20 +53,16 @@ type OpcuaAPU interface {
 // _OpcuaAPU is the data-structure of this message
 type _OpcuaAPU struct {
 	Message MessagePDU
-
-	// Arguments.
-	Response       bool
-	BinaryEncoding bool
 }
 
 var _ OpcuaAPU = (*_OpcuaAPU)(nil)
 
 // NewOpcuaAPU factory function for _OpcuaAPU
-func NewOpcuaAPU(message MessagePDU, response bool, binaryEncoding bool) *_OpcuaAPU {
+func NewOpcuaAPU(message MessagePDU) *_OpcuaAPU {
 	if message == nil {
 		panic("message of type MessagePDU for OpcuaAPU must not be nil")
 	}
-	return &_OpcuaAPU{Message: message, Response: response, BinaryEncoding: binaryEncoding}
+	return &_OpcuaAPU{Message: message}
 }
 
 ///////////////////////////////////////////////////////////
@@ -83,10 +79,6 @@ type OpcuaAPUBuilder interface {
 	WithMessage(MessagePDU) OpcuaAPUBuilder
 	// WithMessageBuilder adds Message (property field) which is build by the builder
 	WithMessageBuilder(func(MessagePDUBuilder) MessagePDUBuilder) OpcuaAPUBuilder
-	// WithArgResponse sets a parser argument
-	WithArgResponse(bool) OpcuaAPUBuilder
-	// WithArgBinaryEncoding sets a parser argument
-	WithArgBinaryEncoding(bool) OpcuaAPUBuilder
 	// Build builds the OpcuaAPU or returns an error if something is wrong
 	Build() (OpcuaAPU, error)
 	// MustBuild does the same as Build but panics on error
@@ -125,15 +117,6 @@ func (b *_OpcuaAPUBuilder) WithMessageBuilder(builderSupplier func(MessagePDUBui
 	return b
 }
 
-func (b *_OpcuaAPUBuilder) WithArgResponse(response bool) OpcuaAPUBuilder {
-	b.Response = response
-	return b
-}
-func (b *_OpcuaAPUBuilder) WithArgBinaryEncoding(binaryEncoding bool) OpcuaAPUBuilder {
-	b.BinaryEncoding = binaryEncoding
-	return b
-}
-
 func (b *_OpcuaAPUBuilder) Build() (OpcuaAPU, error) {
 	if b.Message == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'message' not set"))
@@ -226,7 +209,7 @@ func OpcuaAPUParseWithBufferProducer(response bool, binaryEncoding bool) func(ct
 }
 
 func OpcuaAPUParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, response bool, binaryEncoding bool) (OpcuaAPU, error) {
-	v, err := (&_OpcuaAPU{Response: response, BinaryEncoding: binaryEncoding}).parse(ctx, readBuffer, response, binaryEncoding)
+	v, err := (new(_OpcuaAPU)).parse(ctx, readBuffer, response, binaryEncoding)
 	if err != nil {
 		return nil, err
 	}
@@ -282,19 +265,6 @@ func (m *_OpcuaAPU) SerializeWithWriteBuffer(ctx context.Context, writeBuffer ut
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_OpcuaAPU) GetResponse() bool {
-	return m.Response
-}
-func (m *_OpcuaAPU) GetBinaryEncoding() bool {
-	return m.BinaryEncoding
-}
-
-//
-////
-
 func (m *_OpcuaAPU) IsOpcuaAPU() {}
 
 func (m *_OpcuaAPU) DeepCopy() any {
@@ -307,8 +277,6 @@ func (m *_OpcuaAPU) deepCopy() *_OpcuaAPU {
 	}
 	_OpcuaAPUCopy := &_OpcuaAPU{
 		utils.DeepCopy[MessagePDU](m.Message),
-		m.Response,
-		m.BinaryEncoding,
 	}
 	return _OpcuaAPUCopy
 }
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaAcknowledgeResponse.go b/plc4go/protocols/opcua/readwrite/model/OpcuaAcknowledgeResponse.go
index be302b7001b..f5999bca083 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaAcknowledgeResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaAcknowledgeResponse.go
@@ -62,12 +62,12 @@ var _ OpcuaAcknowledgeResponse = (*_OpcuaAcknowledgeResponse)(nil)
 var _ MessagePDURequirements = (*_OpcuaAcknowledgeResponse)(nil)
 
 // NewOpcuaAcknowledgeResponse factory function for _OpcuaAcknowledgeResponse
-func NewOpcuaAcknowledgeResponse(chunk ChunkType, version uint32, limits OpcuaProtocolLimits, binary bool) *_OpcuaAcknowledgeResponse {
+func NewOpcuaAcknowledgeResponse(chunk ChunkType, version uint32, limits OpcuaProtocolLimits) *_OpcuaAcknowledgeResponse {
 	if limits == nil {
 		panic("limits of type OpcuaProtocolLimits for OpcuaAcknowledgeResponse must not be nil")
 	}
 	_result := &_OpcuaAcknowledgeResponse{
-		MessagePDUContract: NewMessagePDU(chunk, binary),
+		MessagePDUContract: NewMessagePDU(chunk),
 		Version:            version,
 		Limits:             limits,
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaCloseRequest.go b/plc4go/protocols/opcua/readwrite/model/OpcuaCloseRequest.go
index 833aa65a724..cfc3d96f0e2 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaCloseRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaCloseRequest.go
@@ -62,7 +62,7 @@ var _ OpcuaCloseRequest = (*_OpcuaCloseRequest)(nil)
 var _ MessagePDURequirements = (*_OpcuaCloseRequest)(nil)
 
 // NewOpcuaCloseRequest factory function for _OpcuaCloseRequest
-func NewOpcuaCloseRequest(chunk ChunkType, securityHeader SecurityHeader, message Payload, binary bool) *_OpcuaCloseRequest {
+func NewOpcuaCloseRequest(chunk ChunkType, securityHeader SecurityHeader, message Payload) *_OpcuaCloseRequest {
 	if securityHeader == nil {
 		panic("securityHeader of type SecurityHeader for OpcuaCloseRequest must not be nil")
 	}
@@ -70,7 +70,7 @@ func NewOpcuaCloseRequest(chunk ChunkType, securityHeader SecurityHeader, messag
 		panic("message of type Payload for OpcuaCloseRequest must not be nil")
 	}
 	_result := &_OpcuaCloseRequest{
-		MessagePDUContract: NewMessagePDU(chunk, binary),
+		MessagePDUContract: NewMessagePDU(chunk),
 		SecurityHeader:     securityHeader,
 		Message:            message,
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaConstants.go b/plc4go/protocols/opcua/readwrite/model/OpcuaConstants.go
index 6d4133f8f5d..4afdbfeeebc 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaConstants.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaConstants.go
@@ -182,7 +182,7 @@ func OpcuaConstantsParseWithBufferProducer() func(ctx context.Context, readBuffe
 }
 
 func OpcuaConstantsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (OpcuaConstants, error) {
-	v, err := (&_OpcuaConstants{}).parse(ctx, readBuffer)
+	v, err := (new(_OpcuaConstants)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaHelloRequest.go b/plc4go/protocols/opcua/readwrite/model/OpcuaHelloRequest.go
index ae03f322145..1de590cd678 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaHelloRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaHelloRequest.go
@@ -65,7 +65,7 @@ var _ OpcuaHelloRequest = (*_OpcuaHelloRequest)(nil)
 var _ MessagePDURequirements = (*_OpcuaHelloRequest)(nil)
 
 // NewOpcuaHelloRequest factory function for _OpcuaHelloRequest
-func NewOpcuaHelloRequest(chunk ChunkType, version uint32, limits OpcuaProtocolLimits, endpoint PascalString, binary bool) *_OpcuaHelloRequest {
+func NewOpcuaHelloRequest(chunk ChunkType, version uint32, limits OpcuaProtocolLimits, endpoint PascalString) *_OpcuaHelloRequest {
 	if limits == nil {
 		panic("limits of type OpcuaProtocolLimits for OpcuaHelloRequest must not be nil")
 	}
@@ -73,7 +73,7 @@ func NewOpcuaHelloRequest(chunk ChunkType, version uint32, limits OpcuaProtocolL
 		panic("endpoint of type PascalString for OpcuaHelloRequest must not be nil")
 	}
 	_result := &_OpcuaHelloRequest{
-		MessagePDUContract: NewMessagePDU(chunk, binary),
+		MessagePDUContract: NewMessagePDU(chunk),
 		Version:            version,
 		Limits:             limits,
 		Endpoint:           endpoint,
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaMessageError.go b/plc4go/protocols/opcua/readwrite/model/OpcuaMessageError.go
index 0d7a97833dc..d94b0c29e22 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaMessageError.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaMessageError.go
@@ -62,12 +62,12 @@ var _ OpcuaMessageError = (*_OpcuaMessageError)(nil)
 var _ MessagePDURequirements = (*_OpcuaMessageError)(nil)
 
 // NewOpcuaMessageError factory function for _OpcuaMessageError
-func NewOpcuaMessageError(chunk ChunkType, error OpcuaStatusCode, reason PascalString, binary bool) *_OpcuaMessageError {
+func NewOpcuaMessageError(chunk ChunkType, error OpcuaStatusCode, reason PascalString) *_OpcuaMessageError {
 	if reason == nil {
 		panic("reason of type PascalString for OpcuaMessageError must not be nil")
 	}
 	_result := &_OpcuaMessageError{
-		MessagePDUContract: NewMessagePDU(chunk, binary),
+		MessagePDUContract: NewMessagePDU(chunk),
 		Error:              error,
 		Reason:             reason,
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaMessageRequest.go b/plc4go/protocols/opcua/readwrite/model/OpcuaMessageRequest.go
index 0c9960576a4..0a1e47b51cb 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaMessageRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaMessageRequest.go
@@ -56,16 +56,13 @@ type _OpcuaMessageRequest struct {
 	MessagePDUContract
 	SecurityHeader SecurityHeader
 	Message        Payload
-
-	// Arguments.
-	TotalLength uint32
 }
 
 var _ OpcuaMessageRequest = (*_OpcuaMessageRequest)(nil)
 var _ MessagePDURequirements = (*_OpcuaMessageRequest)(nil)
 
 // NewOpcuaMessageRequest factory function for _OpcuaMessageRequest
-func NewOpcuaMessageRequest(chunk ChunkType, securityHeader SecurityHeader, message Payload, totalLength uint32, binary bool) *_OpcuaMessageRequest {
+func NewOpcuaMessageRequest(chunk ChunkType, securityHeader SecurityHeader, message Payload) *_OpcuaMessageRequest {
 	if securityHeader == nil {
 		panic("securityHeader of type SecurityHeader for OpcuaMessageRequest must not be nil")
 	}
@@ -73,7 +70,7 @@ func NewOpcuaMessageRequest(chunk ChunkType, securityHeader SecurityHeader, mess
 		panic("message of type Payload for OpcuaMessageRequest must not be nil")
 	}
 	_result := &_OpcuaMessageRequest{
-		MessagePDUContract: NewMessagePDU(chunk, binary),
+		MessagePDUContract: NewMessagePDU(chunk),
 		SecurityHeader:     securityHeader,
 		Message:            message,
 	}
@@ -99,8 +96,6 @@ type OpcuaMessageRequestBuilder interface {
 	WithMessage(Payload) OpcuaMessageRequestBuilder
 	// WithMessageBuilder adds Message (property field) which is build by the builder
 	WithMessageBuilder(func(PayloadBuilder) PayloadBuilder) OpcuaMessageRequestBuilder
-	// WithArgTotalLength sets a parser argument
-	WithArgTotalLength(uint32) OpcuaMessageRequestBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() MessagePDUBuilder
 	// Build builds the OpcuaMessageRequest or returns an error if something is wrong
@@ -163,11 +158,6 @@ func (b *_OpcuaMessageRequestBuilder) WithMessageBuilder(builderSupplier func(Pa
 	return b
 }
 
-func (b *_OpcuaMessageRequestBuilder) WithArgTotalLength(totalLength uint32) OpcuaMessageRequestBuilder {
-	b.TotalLength = totalLength
-	return b
-}
-
 func (b *_OpcuaMessageRequestBuilder) Build() (OpcuaMessageRequest, error) {
 	if b.SecurityHeader == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'securityHeader' not set"))
@@ -356,16 +346,6 @@ func (m *_OpcuaMessageRequest) SerializeWithWriteBuffer(ctx context.Context, wri
 	return m.MessagePDUContract.(*_MessagePDU).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_OpcuaMessageRequest) GetTotalLength() uint32 {
-	return m.TotalLength
-}
-
-//
-////
-
 func (m *_OpcuaMessageRequest) IsOpcuaMessageRequest() {}
 
 func (m *_OpcuaMessageRequest) DeepCopy() any {
@@ -380,7 +360,6 @@ func (m *_OpcuaMessageRequest) deepCopy() *_OpcuaMessageRequest {
 		m.MessagePDUContract.(*_MessagePDU).deepCopy(),
 		utils.DeepCopy[SecurityHeader](m.SecurityHeader),
 		utils.DeepCopy[Payload](m.Message),
-		m.TotalLength,
 	}
 	_OpcuaMessageRequestCopy.MessagePDUContract.(*_MessagePDU)._SubType = m
 	return _OpcuaMessageRequestCopy
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaMessageResponse.go b/plc4go/protocols/opcua/readwrite/model/OpcuaMessageResponse.go
index bbb7874fca5..25b832809fa 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaMessageResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaMessageResponse.go
@@ -56,16 +56,13 @@ type _OpcuaMessageResponse struct {
 	MessagePDUContract
 	SecurityHeader SecurityHeader
 	Message        Payload
-
-	// Arguments.
-	TotalLength uint32
 }
 
 var _ OpcuaMessageResponse = (*_OpcuaMessageResponse)(nil)
 var _ MessagePDURequirements = (*_OpcuaMessageResponse)(nil)
 
 // NewOpcuaMessageResponse factory function for _OpcuaMessageResponse
-func NewOpcuaMessageResponse(chunk ChunkType, securityHeader SecurityHeader, message Payload, totalLength uint32, binary bool) *_OpcuaMessageResponse {
+func NewOpcuaMessageResponse(chunk ChunkType, securityHeader SecurityHeader, message Payload) *_OpcuaMessageResponse {
 	if securityHeader == nil {
 		panic("securityHeader of type SecurityHeader for OpcuaMessageResponse must not be nil")
 	}
@@ -73,7 +70,7 @@ func NewOpcuaMessageResponse(chunk ChunkType, securityHeader SecurityHeader, mes
 		panic("message of type Payload for OpcuaMessageResponse must not be nil")
 	}
 	_result := &_OpcuaMessageResponse{
-		MessagePDUContract: NewMessagePDU(chunk, binary),
+		MessagePDUContract: NewMessagePDU(chunk),
 		SecurityHeader:     securityHeader,
 		Message:            message,
 	}
@@ -99,8 +96,6 @@ type OpcuaMessageResponseBuilder interface {
 	WithMessage(Payload) OpcuaMessageResponseBuilder
 	// WithMessageBuilder adds Message (property field) which is build by the builder
 	WithMessageBuilder(func(PayloadBuilder) PayloadBuilder) OpcuaMessageResponseBuilder
-	// WithArgTotalLength sets a parser argument
-	WithArgTotalLength(uint32) OpcuaMessageResponseBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() MessagePDUBuilder
 	// Build builds the OpcuaMessageResponse or returns an error if something is wrong
@@ -163,11 +158,6 @@ func (b *_OpcuaMessageResponseBuilder) WithMessageBuilder(builderSupplier func(P
 	return b
 }
 
-func (b *_OpcuaMessageResponseBuilder) WithArgTotalLength(totalLength uint32) OpcuaMessageResponseBuilder {
-	b.TotalLength = totalLength
-	return b
-}
-
 func (b *_OpcuaMessageResponseBuilder) Build() (OpcuaMessageResponse, error) {
 	if b.SecurityHeader == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'securityHeader' not set"))
@@ -356,16 +346,6 @@ func (m *_OpcuaMessageResponse) SerializeWithWriteBuffer(ctx context.Context, wr
 	return m.MessagePDUContract.(*_MessagePDU).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_OpcuaMessageResponse) GetTotalLength() uint32 {
-	return m.TotalLength
-}
-
-//
-////
-
 func (m *_OpcuaMessageResponse) IsOpcuaMessageResponse() {}
 
 func (m *_OpcuaMessageResponse) DeepCopy() any {
@@ -380,7 +360,6 @@ func (m *_OpcuaMessageResponse) deepCopy() *_OpcuaMessageResponse {
 		m.MessagePDUContract.(*_MessagePDU).deepCopy(),
 		utils.DeepCopy[SecurityHeader](m.SecurityHeader),
 		utils.DeepCopy[Payload](m.Message),
-		m.TotalLength,
 	}
 	_OpcuaMessageResponseCopy.MessagePDUContract.(*_MessagePDU)._SubType = m
 	return _OpcuaMessageResponseCopy
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaOpenRequest.go b/plc4go/protocols/opcua/readwrite/model/OpcuaOpenRequest.go
index 4db7e1fc0a3..60c9dd7d6ae 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaOpenRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaOpenRequest.go
@@ -56,16 +56,13 @@ type _OpcuaOpenRequest struct {
 	MessagePDUContract
 	OpenRequest OpenChannelMessage
 	Message     Payload
-
-	// Arguments.
-	TotalLength uint32
 }
 
 var _ OpcuaOpenRequest = (*_OpcuaOpenRequest)(nil)
 var _ MessagePDURequirements = (*_OpcuaOpenRequest)(nil)
 
 // NewOpcuaOpenRequest factory function for _OpcuaOpenRequest
-func NewOpcuaOpenRequest(chunk ChunkType, openRequest OpenChannelMessage, message Payload, totalLength uint32, binary bool) *_OpcuaOpenRequest {
+func NewOpcuaOpenRequest(chunk ChunkType, openRequest OpenChannelMessage, message Payload) *_OpcuaOpenRequest {
 	if openRequest == nil {
 		panic("openRequest of type OpenChannelMessage for OpcuaOpenRequest must not be nil")
 	}
@@ -73,7 +70,7 @@ func NewOpcuaOpenRequest(chunk ChunkType, openRequest OpenChannelMessage, messag
 		panic("message of type Payload for OpcuaOpenRequest must not be nil")
 	}
 	_result := &_OpcuaOpenRequest{
-		MessagePDUContract: NewMessagePDU(chunk, binary),
+		MessagePDUContract: NewMessagePDU(chunk),
 		OpenRequest:        openRequest,
 		Message:            message,
 	}
@@ -99,8 +96,6 @@ type OpcuaOpenRequestBuilder interface {
 	WithMessage(Payload) OpcuaOpenRequestBuilder
 	// WithMessageBuilder adds Message (property field) which is build by the builder
 	WithMessageBuilder(func(PayloadBuilder) PayloadBuilder) OpcuaOpenRequestBuilder
-	// WithArgTotalLength sets a parser argument
-	WithArgTotalLength(uint32) OpcuaOpenRequestBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() MessagePDUBuilder
 	// Build builds the OpcuaOpenRequest or returns an error if something is wrong
@@ -163,11 +158,6 @@ func (b *_OpcuaOpenRequestBuilder) WithMessageBuilder(builderSupplier func(Paylo
 	return b
 }
 
-func (b *_OpcuaOpenRequestBuilder) WithArgTotalLength(totalLength uint32) OpcuaOpenRequestBuilder {
-	b.TotalLength = totalLength
-	return b
-}
-
 func (b *_OpcuaOpenRequestBuilder) Build() (OpcuaOpenRequest, error) {
 	if b.OpenRequest == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openRequest' not set"))
@@ -356,16 +346,6 @@ func (m *_OpcuaOpenRequest) SerializeWithWriteBuffer(ctx context.Context, writeB
 	return m.MessagePDUContract.(*_MessagePDU).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_OpcuaOpenRequest) GetTotalLength() uint32 {
-	return m.TotalLength
-}
-
-//
-////
-
 func (m *_OpcuaOpenRequest) IsOpcuaOpenRequest() {}
 
 func (m *_OpcuaOpenRequest) DeepCopy() any {
@@ -380,7 +360,6 @@ func (m *_OpcuaOpenRequest) deepCopy() *_OpcuaOpenRequest {
 		m.MessagePDUContract.(*_MessagePDU).deepCopy(),
 		utils.DeepCopy[OpenChannelMessage](m.OpenRequest),
 		utils.DeepCopy[Payload](m.Message),
-		m.TotalLength,
 	}
 	_OpcuaOpenRequestCopy.MessagePDUContract.(*_MessagePDU)._SubType = m
 	return _OpcuaOpenRequestCopy
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaOpenResponse.go b/plc4go/protocols/opcua/readwrite/model/OpcuaOpenResponse.go
index b7cae1927f7..ea841657046 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaOpenResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaOpenResponse.go
@@ -56,16 +56,13 @@ type _OpcuaOpenResponse struct {
 	MessagePDUContract
 	OpenResponse OpenChannelMessage
 	Message      Payload
-
-	// Arguments.
-	TotalLength uint32
 }
 
 var _ OpcuaOpenResponse = (*_OpcuaOpenResponse)(nil)
 var _ MessagePDURequirements = (*_OpcuaOpenResponse)(nil)
 
 // NewOpcuaOpenResponse factory function for _OpcuaOpenResponse
-func NewOpcuaOpenResponse(chunk ChunkType, openResponse OpenChannelMessage, message Payload, totalLength uint32, binary bool) *_OpcuaOpenResponse {
+func NewOpcuaOpenResponse(chunk ChunkType, openResponse OpenChannelMessage, message Payload) *_OpcuaOpenResponse {
 	if openResponse == nil {
 		panic("openResponse of type OpenChannelMessage for OpcuaOpenResponse must not be nil")
 	}
@@ -73,7 +70,7 @@ func NewOpcuaOpenResponse(chunk ChunkType, openResponse OpenChannelMessage, mess
 		panic("message of type Payload for OpcuaOpenResponse must not be nil")
 	}
 	_result := &_OpcuaOpenResponse{
-		MessagePDUContract: NewMessagePDU(chunk, binary),
+		MessagePDUContract: NewMessagePDU(chunk),
 		OpenResponse:       openResponse,
 		Message:            message,
 	}
@@ -99,8 +96,6 @@ type OpcuaOpenResponseBuilder interface {
 	WithMessage(Payload) OpcuaOpenResponseBuilder
 	// WithMessageBuilder adds Message (property field) which is build by the builder
 	WithMessageBuilder(func(PayloadBuilder) PayloadBuilder) OpcuaOpenResponseBuilder
-	// WithArgTotalLength sets a parser argument
-	WithArgTotalLength(uint32) OpcuaOpenResponseBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() MessagePDUBuilder
 	// Build builds the OpcuaOpenResponse or returns an error if something is wrong
@@ -163,11 +158,6 @@ func (b *_OpcuaOpenResponseBuilder) WithMessageBuilder(builderSupplier func(Payl
 	return b
 }
 
-func (b *_OpcuaOpenResponseBuilder) WithArgTotalLength(totalLength uint32) OpcuaOpenResponseBuilder {
-	b.TotalLength = totalLength
-	return b
-}
-
 func (b *_OpcuaOpenResponseBuilder) Build() (OpcuaOpenResponse, error) {
 	if b.OpenResponse == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'openResponse' not set"))
@@ -356,16 +346,6 @@ func (m *_OpcuaOpenResponse) SerializeWithWriteBuffer(ctx context.Context, write
 	return m.MessagePDUContract.(*_MessagePDU).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_OpcuaOpenResponse) GetTotalLength() uint32 {
-	return m.TotalLength
-}
-
-//
-////
-
 func (m *_OpcuaOpenResponse) IsOpcuaOpenResponse() {}
 
 func (m *_OpcuaOpenResponse) DeepCopy() any {
@@ -380,7 +360,6 @@ func (m *_OpcuaOpenResponse) deepCopy() *_OpcuaOpenResponse {
 		m.MessagePDUContract.(*_MessagePDU).deepCopy(),
 		utils.DeepCopy[OpenChannelMessage](m.OpenResponse),
 		utils.DeepCopy[Payload](m.Message),
-		m.TotalLength,
 	}
 	_OpcuaOpenResponseCopy.MessagePDUContract.(*_MessagePDU)._SubType = m
 	return _OpcuaOpenResponseCopy
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaProtocolLimits.go b/plc4go/protocols/opcua/readwrite/model/OpcuaProtocolLimits.go
index 39c42103ea1..9935b595228 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaProtocolLimits.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaProtocolLimits.go
@@ -240,7 +240,7 @@ func OpcuaProtocolLimitsParseWithBufferProducer() func(ctx context.Context, read
 }
 
 func OpcuaProtocolLimitsParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (OpcuaProtocolLimits, error) {
-	v, err := (&_OpcuaProtocolLimits{}).parse(ctx, readBuffer)
+	v, err := (new(_OpcuaProtocolLimits)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/OpenChannelMessage.go b/plc4go/protocols/opcua/readwrite/model/OpenChannelMessage.go
index 93deb997ad0..950f0c49f23 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpenChannelMessage.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpenChannelMessage.go
@@ -249,7 +249,7 @@ func OpenChannelMessageParseWithBufferProducer[T OpenChannelMessage](response bo
 }
 
 func OpenChannelMessageParseWithBuffer[T OpenChannelMessage](ctx context.Context, readBuffer utils.ReadBuffer, response bool) (T, error) {
-	v, err := (&_OpenChannelMessage{}).parse(ctx, readBuffer, response)
+	v, err := (new(_OpenChannelMessage)).parse(ctx, readBuffer, response)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/opcua/readwrite/model/PascalByteString.go b/plc4go/protocols/opcua/readwrite/model/PascalByteString.go
index 48da9ef8ce3..2605ffec435 100644
--- a/plc4go/protocols/opcua/readwrite/model/PascalByteString.go
+++ b/plc4go/protocols/opcua/readwrite/model/PascalByteString.go
@@ -208,7 +208,7 @@ func PascalByteStringParseWithBufferProducer() func(ctx context.Context, readBuf
 }
 
 func PascalByteStringParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (PascalByteString, error) {
-	v, err := (&_PascalByteString{}).parse(ctx, readBuffer)
+	v, err := (new(_PascalByteString)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/PascalString.go b/plc4go/protocols/opcua/readwrite/model/PascalString.go
index 788dafec47a..bd678190c0a 100644
--- a/plc4go/protocols/opcua/readwrite/model/PascalString.go
+++ b/plc4go/protocols/opcua/readwrite/model/PascalString.go
@@ -215,7 +215,7 @@ func PascalStringParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func PascalStringParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (PascalString, error) {
-	v, err := (&_PascalString{}).parse(ctx, readBuffer)
+	v, err := (new(_PascalString)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/Payload.go b/plc4go/protocols/opcua/readwrite/model/Payload.go
index f245dcd4a04..09ac8495c50 100644
--- a/plc4go/protocols/opcua/readwrite/model/Payload.go
+++ b/plc4go/protocols/opcua/readwrite/model/Payload.go
@@ -52,8 +52,6 @@ type Payload interface {
 type PayloadContract interface {
 	// GetSequenceHeader returns SequenceHeader (property field)
 	GetSequenceHeader() SequenceHeader
-	// GetByteCount() returns a parser argument
-	GetByteCount() uint32
 	// IsPayload is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsPayload()
 	// CreateBuilder creates a PayloadBuilder
@@ -75,19 +73,16 @@ type _Payload struct {
 		PayloadRequirements
 	}
 	SequenceHeader SequenceHeader
-
-	// Arguments.
-	ByteCount uint32
 }
 
 var _ PayloadContract = (*_Payload)(nil)
 
 // NewPayload factory function for _Payload
-func NewPayload(sequenceHeader SequenceHeader, byteCount uint32) *_Payload {
+func NewPayload(sequenceHeader SequenceHeader) *_Payload {
 	if sequenceHeader == nil {
 		panic("sequenceHeader of type SequenceHeader for Payload must not be nil")
 	}
-	return &_Payload{SequenceHeader: sequenceHeader, ByteCount: byteCount}
+	return &_Payload{SequenceHeader: sequenceHeader}
 }
 
 ///////////////////////////////////////////////////////////
@@ -104,8 +99,6 @@ type PayloadBuilder interface {
 	WithSequenceHeader(SequenceHeader) PayloadBuilder
 	// WithSequenceHeaderBuilder adds SequenceHeader (property field) which is build by the builder
 	WithSequenceHeaderBuilder(func(SequenceHeaderBuilder) SequenceHeaderBuilder) PayloadBuilder
-	// WithArgByteCount sets a parser argument
-	WithArgByteCount(uint32) PayloadBuilder
 	// AsExtensiblePayload converts this build to a subType of Payload. It is always possible to return to current builder using Done()
 	AsExtensiblePayload() ExtensiblePayloadBuilder
 	// AsBinaryPayload converts this build to a subType of Payload. It is always possible to return to current builder using Done()
@@ -160,11 +153,6 @@ func (b *_PayloadBuilder) WithSequenceHeaderBuilder(builderSupplier func(Sequenc
 	return b
 }
 
-func (b *_PayloadBuilder) WithArgByteCount(byteCount uint32) PayloadBuilder {
-	b.ByteCount = byteCount
-	return b
-}
-
 func (b *_PayloadBuilder) PartialBuild() (PayloadContract, error) {
 	if b.SequenceHeader == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'sequenceHeader' not set"))
@@ -308,7 +296,7 @@ func PayloadParseWithBufferProducer[T Payload](binary bool, byteCount uint32) fu
 }
 
 func PayloadParseWithBuffer[T Payload](ctx context.Context, readBuffer utils.ReadBuffer, binary bool, byteCount uint32) (T, error) {
-	v, err := (&_Payload{ByteCount: byteCount}).parse(ctx, readBuffer, binary, byteCount)
+	v, err := (new(_Payload)).parse(ctx, readBuffer, binary, byteCount)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -385,16 +373,6 @@ func (pm *_Payload) serializeParent(ctx context.Context, writeBuffer utils.Write
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_Payload) GetByteCount() uint32 {
-	return m.ByteCount
-}
-
-//
-////
-
 func (m *_Payload) IsPayload() {}
 
 func (m *_Payload) DeepCopy() any {
@@ -408,7 +386,6 @@ func (m *_Payload) deepCopy() *_Payload {
 	_PayloadCopy := &_Payload{
 		nil, // will be set by child
 		utils.DeepCopy[SequenceHeader](m.SequenceHeader),
-		m.ByteCount,
 	}
 	return _PayloadCopy
 }
diff --git a/plc4go/protocols/opcua/readwrite/model/QualifiedName.go b/plc4go/protocols/opcua/readwrite/model/QualifiedName.go
index 11e3a915ef3..98ae2367d8d 100644
--- a/plc4go/protocols/opcua/readwrite/model/QualifiedName.go
+++ b/plc4go/protocols/opcua/readwrite/model/QualifiedName.go
@@ -224,7 +224,7 @@ func QualifiedNameParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func QualifiedNameParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (QualifiedName, error) {
-	v, err := (&_QualifiedName{}).parse(ctx, readBuffer)
+	v, err := (new(_QualifiedName)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/RootExtensionObject.go b/plc4go/protocols/opcua/readwrite/model/RootExtensionObject.go
index cca99abbde3..f751035af1e 100644
--- a/plc4go/protocols/opcua/readwrite/model/RootExtensionObject.go
+++ b/plc4go/protocols/opcua/readwrite/model/RootExtensionObject.go
@@ -53,16 +53,13 @@ type RootExtensionObject interface {
 type _RootExtensionObject struct {
 	ExtensionObjectContract
 	Body ExtensionObjectDefinition
-
-	// Arguments.
-	ExtensionId int32
 }
 
 var _ RootExtensionObject = (*_RootExtensionObject)(nil)
 var _ ExtensionObjectRequirements = (*_RootExtensionObject)(nil)
 
 // NewRootExtensionObject factory function for _RootExtensionObject
-func NewRootExtensionObject(typeId ExpandedNodeId, body ExtensionObjectDefinition, extensionId int32) *_RootExtensionObject {
+func NewRootExtensionObject(typeId ExpandedNodeId, body ExtensionObjectDefinition) *_RootExtensionObject {
 	if body == nil {
 		panic("body of type ExtensionObjectDefinition for RootExtensionObject must not be nil")
 	}
@@ -88,8 +85,6 @@ type RootExtensionObjectBuilder interface {
 	WithBody(ExtensionObjectDefinition) RootExtensionObjectBuilder
 	// WithBodyBuilder adds Body (property field) which is build by the builder
 	WithBodyBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RootExtensionObjectBuilder
-	// WithArgExtensionId sets a parser argument
-	WithArgExtensionId(int32) RootExtensionObjectBuilder
 	// Done is used to finish work on this child and return (or create one if none) to the parent builder
 	Done() ExtensionObjectBuilder
 	// Build builds the RootExtensionObject or returns an error if something is wrong
@@ -137,11 +132,6 @@ func (b *_RootExtensionObjectBuilder) WithBodyBuilder(builderSupplier func(Exten
 	return b
 }
 
-func (b *_RootExtensionObjectBuilder) WithArgExtensionId(extensionId int32) RootExtensionObjectBuilder {
-	b.ExtensionId = extensionId
-	return b
-}
-
 func (b *_RootExtensionObjectBuilder) Build() (RootExtensionObject, error) {
 	if b.Body == nil {
 		b.collectedErr = append(b.collectedErr, errors.New("mandatory field 'body' not set"))
@@ -306,16 +296,6 @@ func (m *_RootExtensionObject) SerializeWithWriteBuffer(ctx context.Context, wri
 	return m.ExtensionObjectContract.(*_ExtensionObject).serializeParent(ctx, writeBuffer, m, ser)
 }
 
-////
-// Arguments Getter
-
-func (m *_RootExtensionObject) GetExtensionId() int32 {
-	return m.ExtensionId
-}
-
-//
-////
-
 func (m *_RootExtensionObject) IsRootExtensionObject() {}
 
 func (m *_RootExtensionObject) DeepCopy() any {
@@ -329,7 +309,6 @@ func (m *_RootExtensionObject) deepCopy() *_RootExtensionObject {
 	_RootExtensionObjectCopy := &_RootExtensionObject{
 		m.ExtensionObjectContract.(*_ExtensionObject).deepCopy(),
 		utils.DeepCopy[ExtensionObjectDefinition](m.Body),
-		m.ExtensionId,
 	}
 	_RootExtensionObjectCopy.ExtensionObjectContract.(*_ExtensionObject)._SubType = m
 	return _RootExtensionObjectCopy
diff --git a/plc4go/protocols/opcua/readwrite/model/RsaEncryptedSecret.go b/plc4go/protocols/opcua/readwrite/model/RsaEncryptedSecret.go
index 966d905c224..69e844eb97e 100644
--- a/plc4go/protocols/opcua/readwrite/model/RsaEncryptedSecret.go
+++ b/plc4go/protocols/opcua/readwrite/model/RsaEncryptedSecret.go
@@ -160,7 +160,7 @@ func RsaEncryptedSecretParseWithBufferProducer() func(ctx context.Context, readB
 }
 
 func RsaEncryptedSecretParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (RsaEncryptedSecret, error) {
-	v, err := (&_RsaEncryptedSecret{}).parse(ctx, readBuffer)
+	v, err := (new(_RsaEncryptedSecret)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/SecurityHeader.go b/plc4go/protocols/opcua/readwrite/model/SecurityHeader.go
index 43d40a059cd..7e2fdc5fb74 100644
--- a/plc4go/protocols/opcua/readwrite/model/SecurityHeader.go
+++ b/plc4go/protocols/opcua/readwrite/model/SecurityHeader.go
@@ -206,7 +206,7 @@ func SecurityHeaderParseWithBufferProducer() func(ctx context.Context, readBuffe
 }
 
 func SecurityHeaderParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (SecurityHeader, error) {
-	v, err := (&_SecurityHeader{}).parse(ctx, readBuffer)
+	v, err := (new(_SecurityHeader)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/SemanticVersionString.go b/plc4go/protocols/opcua/readwrite/model/SemanticVersionString.go
index 6a5aaa32ea0..4815fa2c23a 100644
--- a/plc4go/protocols/opcua/readwrite/model/SemanticVersionString.go
+++ b/plc4go/protocols/opcua/readwrite/model/SemanticVersionString.go
@@ -160,7 +160,7 @@ func SemanticVersionStringParseWithBufferProducer() func(ctx context.Context, re
 }
 
 func SemanticVersionStringParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (SemanticVersionString, error) {
-	v, err := (&_SemanticVersionString{}).parse(ctx, readBuffer)
+	v, err := (new(_SemanticVersionString)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/SequenceHeader.go b/plc4go/protocols/opcua/readwrite/model/SequenceHeader.go
index 37573a7ae09..cba11e4cbef 100644
--- a/plc4go/protocols/opcua/readwrite/model/SequenceHeader.go
+++ b/plc4go/protocols/opcua/readwrite/model/SequenceHeader.go
@@ -206,7 +206,7 @@ func SequenceHeaderParseWithBufferProducer() func(ctx context.Context, readBuffe
 }
 
 func SequenceHeaderParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (SequenceHeader, error) {
-	v, err := (&_SequenceHeader{}).parse(ctx, readBuffer)
+	v, err := (new(_SequenceHeader)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/SessionAuthenticationToken.go b/plc4go/protocols/opcua/readwrite/model/SessionAuthenticationToken.go
index 26356c5e1e4..397a62313ec 100644
--- a/plc4go/protocols/opcua/readwrite/model/SessionAuthenticationToken.go
+++ b/plc4go/protocols/opcua/readwrite/model/SessionAuthenticationToken.go
@@ -160,7 +160,7 @@ func SessionAuthenticationTokenParseWithBufferProducer() func(ctx context.Contex
 }
 
 func SessionAuthenticationTokenParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (SessionAuthenticationToken, error) {
-	v, err := (&_SessionAuthenticationToken{}).parse(ctx, readBuffer)
+	v, err := (new(_SessionAuthenticationToken)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/StatusCode.go b/plc4go/protocols/opcua/readwrite/model/StatusCode.go
index 2a381ce1d59..442ec60758d 100644
--- a/plc4go/protocols/opcua/readwrite/model/StatusCode.go
+++ b/plc4go/protocols/opcua/readwrite/model/StatusCode.go
@@ -189,7 +189,7 @@ func StatusCodeParseWithBufferProducer() func(ctx context.Context, readBuffer ut
 }
 
 func StatusCodeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (StatusCode, error) {
-	v, err := (&_StatusCode{}).parse(ctx, readBuffer)
+	v, err := (new(_StatusCode)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/StringNodeId.go b/plc4go/protocols/opcua/readwrite/model/StringNodeId.go
index fa2dc03cb59..a86518128a2 100644
--- a/plc4go/protocols/opcua/readwrite/model/StringNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/StringNodeId.go
@@ -224,7 +224,7 @@ func StringNodeIdParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func StringNodeIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (StringNodeId, error) {
-	v, err := (&_StringNodeId{}).parse(ctx, readBuffer)
+	v, err := (new(_StringNodeId)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/Structure.go b/plc4go/protocols/opcua/readwrite/model/Structure.go
index b92c83e9264..792de6ef696 100644
--- a/plc4go/protocols/opcua/readwrite/model/Structure.go
+++ b/plc4go/protocols/opcua/readwrite/model/Structure.go
@@ -160,7 +160,7 @@ func StructureParseWithBufferProducer() func(ctx context.Context, readBuffer uti
 }
 
 func StructureParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (Structure, error) {
-	v, err := (&_Structure{}).parse(ctx, readBuffer)
+	v, err := (new(_Structure)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/TimeString.go b/plc4go/protocols/opcua/readwrite/model/TimeString.go
index 5ac7bb3ef96..d425bc76b82 100644
--- a/plc4go/protocols/opcua/readwrite/model/TimeString.go
+++ b/plc4go/protocols/opcua/readwrite/model/TimeString.go
@@ -160,7 +160,7 @@ func TimeStringParseWithBufferProducer() func(ctx context.Context, readBuffer ut
 }
 
 func TimeStringParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (TimeString, error) {
-	v, err := (&_TimeString{}).parse(ctx, readBuffer)
+	v, err := (new(_TimeString)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/TrimmedString.go b/plc4go/protocols/opcua/readwrite/model/TrimmedString.go
index 4e3cc426bc6..82c66d40585 100644
--- a/plc4go/protocols/opcua/readwrite/model/TrimmedString.go
+++ b/plc4go/protocols/opcua/readwrite/model/TrimmedString.go
@@ -160,7 +160,7 @@ func TrimmedStringParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func TrimmedStringParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (TrimmedString, error) {
-	v, err := (&_TrimmedString{}).parse(ctx, readBuffer)
+	v, err := (new(_TrimmedString)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/TwoByteNodeId.go b/plc4go/protocols/opcua/readwrite/model/TwoByteNodeId.go
index f7e9b65207b..77fde1b1499 100644
--- a/plc4go/protocols/opcua/readwrite/model/TwoByteNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/TwoByteNodeId.go
@@ -189,7 +189,7 @@ func TwoByteNodeIdParseWithBufferProducer() func(ctx context.Context, readBuffer
 }
 
 func TwoByteNodeIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (TwoByteNodeId, error) {
-	v, err := (&_TwoByteNodeId{}).parse(ctx, readBuffer)
+	v, err := (new(_TwoByteNodeId)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/UriString.go b/plc4go/protocols/opcua/readwrite/model/UriString.go
index 2fe8d832c91..9e04ce3d702 100644
--- a/plc4go/protocols/opcua/readwrite/model/UriString.go
+++ b/plc4go/protocols/opcua/readwrite/model/UriString.go
@@ -160,7 +160,7 @@ func UriStringParseWithBufferProducer() func(ctx context.Context, readBuffer uti
 }
 
 func UriStringParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (UriString, error) {
-	v, err := (&_UriString{}).parse(ctx, readBuffer)
+	v, err := (new(_UriString)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/UtcTime.go b/plc4go/protocols/opcua/readwrite/model/UtcTime.go
index 339ac864b29..61ac5dc3db0 100644
--- a/plc4go/protocols/opcua/readwrite/model/UtcTime.go
+++ b/plc4go/protocols/opcua/readwrite/model/UtcTime.go
@@ -160,7 +160,7 @@ func UtcTimeParseWithBufferProducer() func(ctx context.Context, readBuffer utils
 }
 
 func UtcTimeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (UtcTime, error) {
-	v, err := (&_UtcTime{}).parse(ctx, readBuffer)
+	v, err := (new(_UtcTime)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/Variant.go b/plc4go/protocols/opcua/readwrite/model/Variant.go
index c1ce6859686..db2fe1c2906 100644
--- a/plc4go/protocols/opcua/readwrite/model/Variant.go
+++ b/plc4go/protocols/opcua/readwrite/model/Variant.go
@@ -625,7 +625,7 @@ func VariantParseWithBufferProducer[T Variant]() func(ctx context.Context, readB
 }
 
 func VariantParseWithBuffer[T Variant](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_Variant{}).parse(ctx, readBuffer)
+	v, err := (new(_Variant)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/opcua/readwrite/model/VersionTime.go b/plc4go/protocols/opcua/readwrite/model/VersionTime.go
index bc0041bb95f..4de9ea3b99e 100644
--- a/plc4go/protocols/opcua/readwrite/model/VersionTime.go
+++ b/plc4go/protocols/opcua/readwrite/model/VersionTime.go
@@ -160,7 +160,7 @@ func VersionTimeParseWithBufferProducer() func(ctx context.Context, readBuffer u
 }
 
 func VersionTimeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (VersionTime, error) {
-	v, err := (&_VersionTime{}).parse(ctx, readBuffer)
+	v, err := (new(_VersionTime)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/opcua/readwrite/model/XmlElement.go b/plc4go/protocols/opcua/readwrite/model/XmlElement.go
index 7cb2a568817..c6c338e4291 100644
--- a/plc4go/protocols/opcua/readwrite/model/XmlElement.go
+++ b/plc4go/protocols/opcua/readwrite/model/XmlElement.go
@@ -208,7 +208,7 @@ func XmlElementParseWithBufferProducer() func(ctx context.Context, readBuffer ut
 }
 
 func XmlElementParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (XmlElement, error) {
-	v, err := (&_XmlElement{}).parse(ctx, readBuffer)
+	v, err := (new(_XmlElement)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/Alarm8MessageQueryType.go b/plc4go/protocols/s7/readwrite/model/Alarm8MessageQueryType.go
index 22a6b1b760d..2f29a8d6c0a 100644
--- a/plc4go/protocols/s7/readwrite/model/Alarm8MessageQueryType.go
+++ b/plc4go/protocols/s7/readwrite/model/Alarm8MessageQueryType.go
@@ -279,7 +279,7 @@ func Alarm8MessageQueryTypeParseWithBufferProducer() func(ctx context.Context, r
 }
 
 func Alarm8MessageQueryTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (Alarm8MessageQueryType, error) {
-	v, err := (&_Alarm8MessageQueryType{}).parse(ctx, readBuffer)
+	v, err := (new(_Alarm8MessageQueryType)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckObjectPushType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckObjectPushType.go
index 59e8c58b19b..3af71e4d880 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckObjectPushType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckObjectPushType.go
@@ -329,7 +329,7 @@ func AlarmMessageAckObjectPushTypeParseWithBufferProducer() func(ctx context.Con
 }
 
 func AlarmMessageAckObjectPushTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AlarmMessageAckObjectPushType, error) {
-	v, err := (&_AlarmMessageAckObjectPushType{}).parse(ctx, readBuffer)
+	v, err := (new(_AlarmMessageAckObjectPushType)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckPushType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckPushType.go
index f7f2af6d8d2..a0a4bd1fe64 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckPushType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckPushType.go
@@ -263,7 +263,7 @@ func AlarmMessageAckPushTypeParseWithBufferProducer() func(ctx context.Context,
 }
 
 func AlarmMessageAckPushTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AlarmMessageAckPushType, error) {
-	v, err := (&_AlarmMessageAckPushType{}).parse(ctx, readBuffer)
+	v, err := (new(_AlarmMessageAckPushType)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckResponseType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckResponseType.go
index d77d8424034..c71f3c4876c 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckResponseType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckResponseType.go
@@ -225,7 +225,7 @@ func AlarmMessageAckResponseTypeParseWithBufferProducer() func(ctx context.Conte
 }
 
 func AlarmMessageAckResponseTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AlarmMessageAckResponseType, error) {
-	v, err := (&_AlarmMessageAckResponseType{}).parse(ctx, readBuffer)
+	v, err := (new(_AlarmMessageAckResponseType)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckType.go
index 9b062683172..0e53caedc5a 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckType.go
@@ -228,7 +228,7 @@ func AlarmMessageAckTypeParseWithBufferProducer() func(ctx context.Context, read
 }
 
 func AlarmMessageAckTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AlarmMessageAckType, error) {
-	v, err := (&_AlarmMessageAckType{}).parse(ctx, readBuffer)
+	v, err := (new(_AlarmMessageAckType)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectAckType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectAckType.go
index 149a1c5eeb6..781a245dc55 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectAckType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectAckType.go
@@ -320,7 +320,7 @@ func AlarmMessageObjectAckTypeParseWithBufferProducer() func(ctx context.Context
 }
 
 func AlarmMessageObjectAckTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AlarmMessageObjectAckType, error) {
-	v, err := (&_AlarmMessageObjectAckType{}).parse(ctx, readBuffer)
+	v, err := (new(_AlarmMessageObjectAckType)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectPushType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectPushType.go
index 8a9dfc88701..672bc4cf53b 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectPushType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectPushType.go
@@ -421,7 +421,7 @@ func AlarmMessageObjectPushTypeParseWithBufferProducer() func(ctx context.Contex
 }
 
 func AlarmMessageObjectPushTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AlarmMessageObjectPushType, error) {
-	v, err := (&_AlarmMessageObjectPushType{}).parse(ctx, readBuffer)
+	v, err := (new(_AlarmMessageObjectPushType)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectQueryType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectQueryType.go
index d588eba3725..f5e15ee80ca 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectQueryType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectQueryType.go
@@ -458,7 +458,7 @@ func AlarmMessageObjectQueryTypeParseWithBufferProducer() func(ctx context.Conte
 }
 
 func AlarmMessageObjectQueryTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AlarmMessageObjectQueryType, error) {
-	v, err := (&_AlarmMessageObjectQueryType{}).parse(ctx, readBuffer)
+	v, err := (new(_AlarmMessageObjectQueryType)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessagePushType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessagePushType.go
index fd49895a3da..0301fc4843a 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessagePushType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessagePushType.go
@@ -263,7 +263,7 @@ func AlarmMessagePushTypeParseWithBufferProducer() func(ctx context.Context, rea
 }
 
 func AlarmMessagePushTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AlarmMessagePushType, error) {
-	v, err := (&_AlarmMessagePushType{}).parse(ctx, readBuffer)
+	v, err := (new(_AlarmMessagePushType)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageQueryType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageQueryType.go
index b163e8e88b4..44ea991683f 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageQueryType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageQueryType.go
@@ -281,7 +281,7 @@ func AlarmMessageQueryTypeParseWithBufferProducer() func(ctx context.Context, re
 }
 
 func AlarmMessageQueryTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AlarmMessageQueryType, error) {
-	v, err := (&_AlarmMessageQueryType{}).parse(ctx, readBuffer)
+	v, err := (new(_AlarmMessageQueryType)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/AssociatedQueryValueType.go b/plc4go/protocols/s7/readwrite/model/AssociatedQueryValueType.go
index 1f08efac6d6..b89036d1e13 100644
--- a/plc4go/protocols/s7/readwrite/model/AssociatedQueryValueType.go
+++ b/plc4go/protocols/s7/readwrite/model/AssociatedQueryValueType.go
@@ -242,7 +242,7 @@ func AssociatedQueryValueTypeParseWithBufferProducer() func(ctx context.Context,
 }
 
 func AssociatedQueryValueTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AssociatedQueryValueType, error) {
-	v, err := (&_AssociatedQueryValueType{}).parse(ctx, readBuffer)
+	v, err := (new(_AssociatedQueryValueType)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/AssociatedValueType.go b/plc4go/protocols/s7/readwrite/model/AssociatedValueType.go
index d998dab4998..97d996bf941 100644
--- a/plc4go/protocols/s7/readwrite/model/AssociatedValueType.go
+++ b/plc4go/protocols/s7/readwrite/model/AssociatedValueType.go
@@ -242,7 +242,7 @@ func AssociatedValueTypeParseWithBufferProducer() func(ctx context.Context, read
 }
 
 func AssociatedValueTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AssociatedValueType, error) {
-	v, err := (&_AssociatedValueType{}).parse(ctx, readBuffer)
+	v, err := (new(_AssociatedValueType)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/COTPPacket.go b/plc4go/protocols/s7/readwrite/model/COTPPacket.go
index 71f8e7dc40d..83faf084e89 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPPacket.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPPacket.go
@@ -54,8 +54,6 @@ type COTPPacketContract interface {
 	GetParameters() []COTPParameter
 	// GetPayload returns Payload (property field)
 	GetPayload() S7Message
-	// GetCotpLen() returns a parser argument
-	GetCotpLen() uint16
 	// IsCOTPPacket is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsCOTPPacket()
 	// CreateBuilder creates a COTPPacketBuilder
@@ -78,16 +76,13 @@ type _COTPPacket struct {
 	}
 	Parameters []COTPParameter
 	Payload    S7Message
-
-	// Arguments.
-	CotpLen uint16
 }
 
 var _ COTPPacketContract = (*_COTPPacket)(nil)
 
 // NewCOTPPacket factory function for _COTPPacket
-func NewCOTPPacket(parameters []COTPParameter, payload S7Message, cotpLen uint16) *_COTPPacket {
-	return &_COTPPacket{Parameters: parameters, Payload: payload, CotpLen: cotpLen}
+func NewCOTPPacket(parameters []COTPParameter, payload S7Message) *_COTPPacket {
+	return &_COTPPacket{Parameters: parameters, Payload: payload}
 }
 
 ///////////////////////////////////////////////////////////
@@ -106,8 +101,6 @@ type COTPPacketBuilder interface {
 	WithOptionalPayload(S7Message) COTPPacketBuilder
 	// WithOptionalPayloadBuilder adds Payload (property field) which is build by the builder
 	WithOptionalPayloadBuilder(func(S7MessageBuilder) S7MessageBuilder) COTPPacketBuilder
-	// WithArgCotpLen sets a parser argument
-	WithArgCotpLen(uint16) COTPPacketBuilder
 	// AsCOTPPacketData converts this build to a subType of COTPPacket. It is always possible to return to current builder using Done()
 	AsCOTPPacketData() COTPPacketDataBuilder
 	// AsCOTPPacketConnectionRequest converts this build to a subType of COTPPacket. It is always possible to return to current builder using Done()
@@ -175,11 +168,6 @@ func (b *_COTPPacketBuilder) WithOptionalPayloadBuilder(builderSupplier func(S7M
 	return b
 }
 
-func (b *_COTPPacketBuilder) WithArgCotpLen(cotpLen uint16) COTPPacketBuilder {
-	b.CotpLen = cotpLen
-	return b
-}
-
 func (b *_COTPPacketBuilder) PartialBuild() (COTPPacketContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -378,7 +366,7 @@ func COTPPacketParseWithBufferProducer[T COTPPacket](cotpLen uint16) func(ctx co
 }
 
 func COTPPacketParseWithBuffer[T COTPPacket](ctx context.Context, readBuffer utils.ReadBuffer, cotpLen uint16) (T, error) {
-	v, err := (&_COTPPacket{CotpLen: cotpLen}).parse(ctx, readBuffer, cotpLen)
+	v, err := (new(_COTPPacket)).parse(ctx, readBuffer, cotpLen)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -506,16 +494,6 @@ func (pm *_COTPPacket) serializeParent(ctx context.Context, writeBuffer utils.Wr
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_COTPPacket) GetCotpLen() uint16 {
-	return m.CotpLen
-}
-
-//
-////
-
 func (m *_COTPPacket) IsCOTPPacket() {}
 
 func (m *_COTPPacket) DeepCopy() any {
@@ -530,7 +508,6 @@ func (m *_COTPPacket) deepCopy() *_COTPPacket {
 		nil, // will be set by child
 		utils.DeepCopySlice[COTPParameter, COTPParameter](m.Parameters),
 		utils.DeepCopy[S7Message](m.Payload),
-		m.CotpLen,
 	}
 	return _COTPPacketCopy
 }
diff --git a/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionRequest.go b/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionRequest.go
index 17f94ead6ee..2a8fb850157 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionRequest.go
@@ -65,9 +65,9 @@ var _ COTPPacketConnectionRequest = (*_COTPPacketConnectionRequest)(nil)
 var _ COTPPacketRequirements = (*_COTPPacketConnectionRequest)(nil)
 
 // NewCOTPPacketConnectionRequest factory function for _COTPPacketConnectionRequest
-func NewCOTPPacketConnectionRequest(parameters []COTPParameter, payload S7Message, destinationReference uint16, sourceReference uint16, protocolClass COTPProtocolClass, cotpLen uint16) *_COTPPacketConnectionRequest {
+func NewCOTPPacketConnectionRequest(parameters []COTPParameter, payload S7Message, destinationReference uint16, sourceReference uint16, protocolClass COTPProtocolClass) *_COTPPacketConnectionRequest {
 	_result := &_COTPPacketConnectionRequest{
-		COTPPacketContract:   NewCOTPPacket(parameters, payload, cotpLen),
+		COTPPacketContract:   NewCOTPPacket(parameters, payload),
 		DestinationReference: destinationReference,
 		SourceReference:      sourceReference,
 		ProtocolClass:        protocolClass,
diff --git a/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionResponse.go b/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionResponse.go
index 59954a94c5d..b16b47a386d 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionResponse.go
@@ -65,9 +65,9 @@ var _ COTPPacketConnectionResponse = (*_COTPPacketConnectionResponse)(nil)
 var _ COTPPacketRequirements = (*_COTPPacketConnectionResponse)(nil)
 
 // NewCOTPPacketConnectionResponse factory function for _COTPPacketConnectionResponse
-func NewCOTPPacketConnectionResponse(parameters []COTPParameter, payload S7Message, destinationReference uint16, sourceReference uint16, protocolClass COTPProtocolClass, cotpLen uint16) *_COTPPacketConnectionResponse {
+func NewCOTPPacketConnectionResponse(parameters []COTPParameter, payload S7Message, destinationReference uint16, sourceReference uint16, protocolClass COTPProtocolClass) *_COTPPacketConnectionResponse {
 	_result := &_COTPPacketConnectionResponse{
-		COTPPacketContract:   NewCOTPPacket(parameters, payload, cotpLen),
+		COTPPacketContract:   NewCOTPPacket(parameters, payload),
 		DestinationReference: destinationReference,
 		SourceReference:      sourceReference,
 		ProtocolClass:        protocolClass,
diff --git a/plc4go/protocols/s7/readwrite/model/COTPPacketData.go b/plc4go/protocols/s7/readwrite/model/COTPPacketData.go
index b77163f0c04..f20649b3eb2 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPPacketData.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPPacketData.go
@@ -62,9 +62,9 @@ var _ COTPPacketData = (*_COTPPacketData)(nil)
 var _ COTPPacketRequirements = (*_COTPPacketData)(nil)
 
 // NewCOTPPacketData factory function for _COTPPacketData
-func NewCOTPPacketData(parameters []COTPParameter, payload S7Message, eot bool, tpduRef uint8, cotpLen uint16) *_COTPPacketData {
+func NewCOTPPacketData(parameters []COTPParameter, payload S7Message, eot bool, tpduRef uint8) *_COTPPacketData {
 	_result := &_COTPPacketData{
-		COTPPacketContract: NewCOTPPacket(parameters, payload, cotpLen),
+		COTPPacketContract: NewCOTPPacket(parameters, payload),
 		Eot:                eot,
 		TpduRef:            tpduRef,
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectRequest.go b/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectRequest.go
index 072c7260ed8..291dce36d7c 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectRequest.go
@@ -65,9 +65,9 @@ var _ COTPPacketDisconnectRequest = (*_COTPPacketDisconnectRequest)(nil)
 var _ COTPPacketRequirements = (*_COTPPacketDisconnectRequest)(nil)
 
 // NewCOTPPacketDisconnectRequest factory function for _COTPPacketDisconnectRequest
-func NewCOTPPacketDisconnectRequest(parameters []COTPParameter, payload S7Message, destinationReference uint16, sourceReference uint16, protocolClass COTPProtocolClass, cotpLen uint16) *_COTPPacketDisconnectRequest {
+func NewCOTPPacketDisconnectRequest(parameters []COTPParameter, payload S7Message, destinationReference uint16, sourceReference uint16, protocolClass COTPProtocolClass) *_COTPPacketDisconnectRequest {
 	_result := &_COTPPacketDisconnectRequest{
-		COTPPacketContract:   NewCOTPPacket(parameters, payload, cotpLen),
+		COTPPacketContract:   NewCOTPPacket(parameters, payload),
 		DestinationReference: destinationReference,
 		SourceReference:      sourceReference,
 		ProtocolClass:        protocolClass,
diff --git a/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectResponse.go b/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectResponse.go
index c18deedd88d..ef9d7ed1bcc 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectResponse.go
@@ -62,9 +62,9 @@ var _ COTPPacketDisconnectResponse = (*_COTPPacketDisconnectResponse)(nil)
 var _ COTPPacketRequirements = (*_COTPPacketDisconnectResponse)(nil)
 
 // NewCOTPPacketDisconnectResponse factory function for _COTPPacketDisconnectResponse
-func NewCOTPPacketDisconnectResponse(parameters []COTPParameter, payload S7Message, destinationReference uint16, sourceReference uint16, cotpLen uint16) *_COTPPacketDisconnectResponse {
+func NewCOTPPacketDisconnectResponse(parameters []COTPParameter, payload S7Message, destinationReference uint16, sourceReference uint16) *_COTPPacketDisconnectResponse {
 	_result := &_COTPPacketDisconnectResponse{
-		COTPPacketContract:   NewCOTPPacket(parameters, payload, cotpLen),
+		COTPPacketContract:   NewCOTPPacket(parameters, payload),
 		DestinationReference: destinationReference,
 		SourceReference:      sourceReference,
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/COTPPacketTpduError.go b/plc4go/protocols/s7/readwrite/model/COTPPacketTpduError.go
index 26f879776f2..58a081395fb 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPPacketTpduError.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPPacketTpduError.go
@@ -62,9 +62,9 @@ var _ COTPPacketTpduError = (*_COTPPacketTpduError)(nil)
 var _ COTPPacketRequirements = (*_COTPPacketTpduError)(nil)
 
 // NewCOTPPacketTpduError factory function for _COTPPacketTpduError
-func NewCOTPPacketTpduError(parameters []COTPParameter, payload S7Message, destinationReference uint16, rejectCause uint8, cotpLen uint16) *_COTPPacketTpduError {
+func NewCOTPPacketTpduError(parameters []COTPParameter, payload S7Message, destinationReference uint16, rejectCause uint8) *_COTPPacketTpduError {
 	_result := &_COTPPacketTpduError{
-		COTPPacketContract:   NewCOTPPacket(parameters, payload, cotpLen),
+		COTPPacketContract:   NewCOTPPacket(parameters, payload),
 		DestinationReference: destinationReference,
 		RejectCause:          rejectCause,
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/COTPParameter.go b/plc4go/protocols/s7/readwrite/model/COTPParameter.go
index 966170b4a63..8813c95b40c 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPParameter.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPParameter.go
@@ -50,8 +50,6 @@ type COTPParameter interface {
 
 // COTPParameterContract provides a set of functions which can be overwritten by a sub struct
 type COTPParameterContract interface {
-	// GetRest() returns a parser argument
-	GetRest() uint8
 	// IsCOTPParameter is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsCOTPParameter()
 	// CreateBuilder creates a COTPParameterBuilder
@@ -72,16 +70,13 @@ type _COTPParameter struct {
 		COTPParameterContract
 		COTPParameterRequirements
 	}
-
-	// Arguments.
-	Rest uint8
 }
 
 var _ COTPParameterContract = (*_COTPParameter)(nil)
 
 // NewCOTPParameter factory function for _COTPParameter
-func NewCOTPParameter(rest uint8) *_COTPParameter {
-	return &_COTPParameter{Rest: rest}
+func NewCOTPParameter() *_COTPParameter {
+	return &_COTPParameter{}
 }
 
 ///////////////////////////////////////////////////////////
@@ -94,8 +89,6 @@ type COTPParameterBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
 	WithMandatoryFields() COTPParameterBuilder
-	// WithArgRest sets a parser argument
-	WithArgRest(uint8) COTPParameterBuilder
 	// AsCOTPParameterTpduSize converts this build to a subType of COTPParameter. It is always possible to return to current builder using Done()
 	AsCOTPParameterTpduSize() COTPParameterTpduSizeBuilder
 	// AsCOTPParameterCallingTsap converts this build to a subType of COTPParameter. It is always possible to return to current builder using Done()
@@ -141,11 +134,6 @@ func (b *_COTPParameterBuilder) WithMandatoryFields() COTPParameterBuilder {
 	return b
 }
 
-func (b *_COTPParameterBuilder) WithArgRest(rest uint8) COTPParameterBuilder {
-	b.Rest = rest
-	return b
-}
-
 func (b *_COTPParameterBuilder) PartialBuild() (COTPParameterContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -304,7 +292,7 @@ func COTPParameterParseWithBufferProducer[T COTPParameter](rest uint8) func(ctx
 }
 
 func COTPParameterParseWithBuffer[T COTPParameter](ctx context.Context, readBuffer utils.ReadBuffer, rest uint8) (T, error) {
-	v, err := (&_COTPParameter{Rest: rest}).parse(ctx, readBuffer, rest)
+	v, err := (new(_COTPParameter)).parse(ctx, readBuffer, rest)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -402,16 +390,6 @@ func (pm *_COTPParameter) serializeParent(ctx context.Context, writeBuffer utils
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_COTPParameter) GetRest() uint8 {
-	return m.Rest
-}
-
-//
-////
-
 func (m *_COTPParameter) IsCOTPParameter() {}
 
 func (m *_COTPParameter) DeepCopy() any {
@@ -424,7 +402,6 @@ func (m *_COTPParameter) deepCopy() *_COTPParameter {
 	}
 	_COTPParameterCopy := &_COTPParameter{
 		nil, // will be set by child
-		m.Rest,
 	}
 	return _COTPParameterCopy
 }
diff --git a/plc4go/protocols/s7/readwrite/model/COTPParameterCalledTsap.go b/plc4go/protocols/s7/readwrite/model/COTPParameterCalledTsap.go
index 031371f7055..da4daec93f1 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPParameterCalledTsap.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPParameterCalledTsap.go
@@ -59,9 +59,9 @@ var _ COTPParameterCalledTsap = (*_COTPParameterCalledTsap)(nil)
 var _ COTPParameterRequirements = (*_COTPParameterCalledTsap)(nil)
 
 // NewCOTPParameterCalledTsap factory function for _COTPParameterCalledTsap
-func NewCOTPParameterCalledTsap(tsapId uint16, rest uint8) *_COTPParameterCalledTsap {
+func NewCOTPParameterCalledTsap(tsapId uint16) *_COTPParameterCalledTsap {
 	_result := &_COTPParameterCalledTsap{
-		COTPParameterContract: NewCOTPParameter(rest),
+		COTPParameterContract: NewCOTPParameter(),
 		TsapId:                tsapId,
 	}
 	_result.COTPParameterContract.(*_COTPParameter)._SubType = _result
diff --git a/plc4go/protocols/s7/readwrite/model/COTPParameterCallingTsap.go b/plc4go/protocols/s7/readwrite/model/COTPParameterCallingTsap.go
index 6145d3cd03f..e55bfa170bf 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPParameterCallingTsap.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPParameterCallingTsap.go
@@ -59,9 +59,9 @@ var _ COTPParameterCallingTsap = (*_COTPParameterCallingTsap)(nil)
 var _ COTPParameterRequirements = (*_COTPParameterCallingTsap)(nil)
 
 // NewCOTPParameterCallingTsap factory function for _COTPParameterCallingTsap
-func NewCOTPParameterCallingTsap(tsapId uint16, rest uint8) *_COTPParameterCallingTsap {
+func NewCOTPParameterCallingTsap(tsapId uint16) *_COTPParameterCallingTsap {
 	_result := &_COTPParameterCallingTsap{
-		COTPParameterContract: NewCOTPParameter(rest),
+		COTPParameterContract: NewCOTPParameter(),
 		TsapId:                tsapId,
 	}
 	_result.COTPParameterContract.(*_COTPParameter)._SubType = _result
diff --git a/plc4go/protocols/s7/readwrite/model/COTPParameterChecksum.go b/plc4go/protocols/s7/readwrite/model/COTPParameterChecksum.go
index 71ffd936b85..f038058ba70 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPParameterChecksum.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPParameterChecksum.go
@@ -59,9 +59,9 @@ var _ COTPParameterChecksum = (*_COTPParameterChecksum)(nil)
 var _ COTPParameterRequirements = (*_COTPParameterChecksum)(nil)
 
 // NewCOTPParameterChecksum factory function for _COTPParameterChecksum
-func NewCOTPParameterChecksum(crc uint8, rest uint8) *_COTPParameterChecksum {
+func NewCOTPParameterChecksum(crc uint8) *_COTPParameterChecksum {
 	_result := &_COTPParameterChecksum{
-		COTPParameterContract: NewCOTPParameter(rest),
+		COTPParameterContract: NewCOTPParameter(),
 		Crc:                   crc,
 	}
 	_result.COTPParameterContract.(*_COTPParameter)._SubType = _result
diff --git a/plc4go/protocols/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go b/plc4go/protocols/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
index fc6c116d613..27ba3557f81 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
@@ -59,9 +59,9 @@ var _ COTPParameterDisconnectAdditionalInformation = (*_COTPParameterDisconnectA
 var _ COTPParameterRequirements = (*_COTPParameterDisconnectAdditionalInformation)(nil)
 
 // NewCOTPParameterDisconnectAdditionalInformation factory function for _COTPParameterDisconnectAdditionalInformation
-func NewCOTPParameterDisconnectAdditionalInformation(data []byte, rest uint8) *_COTPParameterDisconnectAdditionalInformation {
+func NewCOTPParameterDisconnectAdditionalInformation(data []byte) *_COTPParameterDisconnectAdditionalInformation {
 	_result := &_COTPParameterDisconnectAdditionalInformation{
-		COTPParameterContract: NewCOTPParameter(rest),
+		COTPParameterContract: NewCOTPParameter(),
 		Data:                  data,
 	}
 	_result.COTPParameterContract.(*_COTPParameter)._SubType = _result
diff --git a/plc4go/protocols/s7/readwrite/model/COTPParameterTpduSize.go b/plc4go/protocols/s7/readwrite/model/COTPParameterTpduSize.go
index f857f4c279d..36163961840 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPParameterTpduSize.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPParameterTpduSize.go
@@ -59,9 +59,9 @@ var _ COTPParameterTpduSize = (*_COTPParameterTpduSize)(nil)
 var _ COTPParameterRequirements = (*_COTPParameterTpduSize)(nil)
 
 // NewCOTPParameterTpduSize factory function for _COTPParameterTpduSize
-func NewCOTPParameterTpduSize(tpduSize COTPTpduSize, rest uint8) *_COTPParameterTpduSize {
+func NewCOTPParameterTpduSize(tpduSize COTPTpduSize) *_COTPParameterTpduSize {
 	_result := &_COTPParameterTpduSize{
-		COTPParameterContract: NewCOTPParameter(rest),
+		COTPParameterContract: NewCOTPParameter(),
 		TpduSize:              tpduSize,
 	}
 	_result.COTPParameterContract.(*_COTPParameter)._SubType = _result
diff --git a/plc4go/protocols/s7/readwrite/model/CycServiceItemType.go b/plc4go/protocols/s7/readwrite/model/CycServiceItemType.go
index 4bd018695bf..cda1f4f62e3 100644
--- a/plc4go/protocols/s7/readwrite/model/CycServiceItemType.go
+++ b/plc4go/protocols/s7/readwrite/model/CycServiceItemType.go
@@ -314,7 +314,7 @@ func CycServiceItemTypeParseWithBufferProducer[T CycServiceItemType]() func(ctx
 }
 
 func CycServiceItemTypeParseWithBuffer[T CycServiceItemType](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_CycServiceItemType{}).parse(ctx, readBuffer)
+	v, err := (new(_CycServiceItemType)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/s7/readwrite/model/DateAndTime.go b/plc4go/protocols/s7/readwrite/model/DateAndTime.go
index 8afd18881e7..1cd1b4393e0 100644
--- a/plc4go/protocols/s7/readwrite/model/DateAndTime.go
+++ b/plc4go/protocols/s7/readwrite/model/DateAndTime.go
@@ -309,7 +309,7 @@ func DateAndTimeParseWithBufferProducer() func(ctx context.Context, readBuffer u
 }
 
 func DateAndTimeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (DateAndTime, error) {
-	v, err := (&_DateAndTime{}).parse(ctx, readBuffer)
+	v, err := (new(_DateAndTime)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/S7Address.go b/plc4go/protocols/s7/readwrite/model/S7Address.go
index 2540946abd3..e573ca79f68 100644
--- a/plc4go/protocols/s7/readwrite/model/S7Address.go
+++ b/plc4go/protocols/s7/readwrite/model/S7Address.go
@@ -241,7 +241,7 @@ func S7AddressParseWithBufferProducer[T S7Address]() func(ctx context.Context, r
 }
 
 func S7AddressParseWithBuffer[T S7Address](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_S7Address{}).parse(ctx, readBuffer)
+	v, err := (new(_S7Address)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/s7/readwrite/model/S7DataAlarmMessage.go b/plc4go/protocols/s7/readwrite/model/S7DataAlarmMessage.go
index dc7c5adc36e..6ae50447ac9 100644
--- a/plc4go/protocols/s7/readwrite/model/S7DataAlarmMessage.go
+++ b/plc4go/protocols/s7/readwrite/model/S7DataAlarmMessage.go
@@ -279,7 +279,7 @@ func S7DataAlarmMessageParseWithBufferProducer[T S7DataAlarmMessage](cpuFunction
 }
 
 func S7DataAlarmMessageParseWithBuffer[T S7DataAlarmMessage](ctx context.Context, readBuffer utils.ReadBuffer, cpuFunctionType uint8) (T, error) {
-	v, err := (&_S7DataAlarmMessage{}).parse(ctx, readBuffer, cpuFunctionType)
+	v, err := (new(_S7DataAlarmMessage)).parse(ctx, readBuffer, cpuFunctionType)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/s7/readwrite/model/S7Message.go b/plc4go/protocols/s7/readwrite/model/S7Message.go
index e5c501c62c6..ffbfa584f2a 100644
--- a/plc4go/protocols/s7/readwrite/model/S7Message.go
+++ b/plc4go/protocols/s7/readwrite/model/S7Message.go
@@ -396,7 +396,7 @@ func S7MessageParseWithBufferProducer[T S7Message]() func(ctx context.Context, r
 }
 
 func S7MessageParseWithBuffer[T S7Message](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_S7Message{}).parse(ctx, readBuffer)
+	v, err := (new(_S7Message)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/s7/readwrite/model/S7Parameter.go b/plc4go/protocols/s7/readwrite/model/S7Parameter.go
index b68e0bbcc7b..e31e61cb6b7 100644
--- a/plc4go/protocols/s7/readwrite/model/S7Parameter.go
+++ b/plc4go/protocols/s7/readwrite/model/S7Parameter.go
@@ -315,7 +315,7 @@ func S7ParameterParseWithBufferProducer[T S7Parameter](messageType uint8) func(c
 }
 
 func S7ParameterParseWithBuffer[T S7Parameter](ctx context.Context, readBuffer utils.ReadBuffer, messageType uint8) (T, error) {
-	v, err := (&_S7Parameter{}).parse(ctx, readBuffer, messageType)
+	v, err := (new(_S7Parameter)).parse(ctx, readBuffer, messageType)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/s7/readwrite/model/S7ParameterUserDataItem.go b/plc4go/protocols/s7/readwrite/model/S7ParameterUserDataItem.go
index 636e4b7d8b7..87f1bbdc81d 100644
--- a/plc4go/protocols/s7/readwrite/model/S7ParameterUserDataItem.go
+++ b/plc4go/protocols/s7/readwrite/model/S7ParameterUserDataItem.go
@@ -241,7 +241,7 @@ func S7ParameterUserDataItemParseWithBufferProducer[T S7ParameterUserDataItem]()
 }
 
 func S7ParameterUserDataItemParseWithBuffer[T S7ParameterUserDataItem](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_S7ParameterUserDataItem{}).parse(ctx, readBuffer)
+	v, err := (new(_S7ParameterUserDataItem)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/s7/readwrite/model/S7Payload.go b/plc4go/protocols/s7/readwrite/model/S7Payload.go
index 04aa5089825..8b830f9d6a8 100644
--- a/plc4go/protocols/s7/readwrite/model/S7Payload.go
+++ b/plc4go/protocols/s7/readwrite/model/S7Payload.go
@@ -48,8 +48,6 @@ type S7Payload interface {
 
 // S7PayloadContract provides a set of functions which can be overwritten by a sub struct
 type S7PayloadContract interface {
-	// GetParameter() returns a parser argument
-	GetParameter() S7Parameter
 	// IsS7Payload is a marker method to prevent unintentional type checks (interfaces of same signature)
 	IsS7Payload()
 	// CreateBuilder creates a S7PayloadBuilder
@@ -72,16 +70,13 @@ type _S7Payload struct {
 		S7PayloadContract
 		S7PayloadRequirements
 	}
-
-	// Arguments.
-	Parameter S7Parameter
 }
 
 var _ S7PayloadContract = (*_S7Payload)(nil)
 
 // NewS7Payload factory function for _S7Payload
-func NewS7Payload(parameter S7Parameter) *_S7Payload {
-	return &_S7Payload{Parameter: parameter}
+func NewS7Payload() *_S7Payload {
+	return &_S7Payload{}
 }
 
 ///////////////////////////////////////////////////////////
@@ -94,8 +89,6 @@ type S7PayloadBuilder interface {
 	utils.Copyable
 	// WithMandatoryFields adds all mandatory fields (convenience for using multiple builder calls)
 	WithMandatoryFields() S7PayloadBuilder
-	// WithArgParameter sets a parser argument
-	WithArgParameter(S7Parameter) S7PayloadBuilder
 	// AsS7PayloadReadVarResponse converts this build to a subType of S7Payload. It is always possible to return to current builder using Done()
 	AsS7PayloadReadVarResponse() S7PayloadReadVarResponseBuilder
 	// AsS7PayloadWriteVarRequest converts this build to a subType of S7Payload. It is always possible to return to current builder using Done()
@@ -139,11 +132,6 @@ func (b *_S7PayloadBuilder) WithMandatoryFields() S7PayloadBuilder {
 	return b
 }
 
-func (b *_S7PayloadBuilder) WithArgParameter(parameter S7Parameter) S7PayloadBuilder {
-	b.Parameter = parameter
-	return b
-}
-
 func (b *_S7PayloadBuilder) PartialBuild() (S7PayloadContract, error) {
 	if err := stdErrors.Join(b.collectedErr...); err != nil {
 		return nil, errors.Wrap(err, "error occurred during build")
@@ -287,7 +275,7 @@ func S7PayloadParseWithBufferProducer[T S7Payload](messageType uint8, parameter
 }
 
 func S7PayloadParseWithBuffer[T S7Payload](ctx context.Context, readBuffer utils.ReadBuffer, messageType uint8, parameter S7Parameter) (T, error) {
-	v, err := (&_S7Payload{Parameter: parameter}).parse(ctx, readBuffer, messageType, parameter)
+	v, err := (new(_S7Payload)).parse(ctx, readBuffer, messageType, parameter)
 	if err != nil {
 		var zero T
 		return zero, err
@@ -362,16 +350,6 @@ func (pm *_S7Payload) serializeParent(ctx context.Context, writeBuffer utils.Wri
 	return nil
 }
 
-////
-// Arguments Getter
-
-func (m *_S7Payload) GetParameter() S7Parameter {
-	return m.Parameter
-}
-
-//
-////
-
 func (m *_S7Payload) IsS7Payload() {}
 
 func (m *_S7Payload) DeepCopy() any {
@@ -384,7 +362,6 @@ func (m *_S7Payload) deepCopy() *_S7Payload {
 	}
 	_S7PayloadCopy := &_S7Payload{
 		nil, // will be set by child
-		m.Parameter,
 	}
 	return _S7PayloadCopy
 }
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadReadVarResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadReadVarResponse.go
index 08cef852bb6..1315b613a24 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadReadVarResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadReadVarResponse.go
@@ -59,9 +59,9 @@ var _ S7PayloadReadVarResponse = (*_S7PayloadReadVarResponse)(nil)
 var _ S7PayloadRequirements = (*_S7PayloadReadVarResponse)(nil)
 
 // NewS7PayloadReadVarResponse factory function for _S7PayloadReadVarResponse
-func NewS7PayloadReadVarResponse(items []S7VarPayloadDataItem, parameter S7Parameter) *_S7PayloadReadVarResponse {
+func NewS7PayloadReadVarResponse(items []S7VarPayloadDataItem) *_S7PayloadReadVarResponse {
 	_result := &_S7PayloadReadVarResponse{
-		S7PayloadContract: NewS7Payload(parameter),
+		S7PayloadContract: NewS7Payload(),
 		Items:             items,
 	}
 	_result.S7PayloadContract.(*_S7Payload)._SubType = _result
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserData.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserData.go
index feb8e28736b..b929f09ae68 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserData.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserData.go
@@ -59,9 +59,9 @@ var _ S7PayloadUserData = (*_S7PayloadUserData)(nil)
 var _ S7PayloadRequirements = (*_S7PayloadUserData)(nil)
 
 // NewS7PayloadUserData factory function for _S7PayloadUserData
-func NewS7PayloadUserData(items []S7PayloadUserDataItem, parameter S7Parameter) *_S7PayloadUserData {
+func NewS7PayloadUserData(items []S7PayloadUserDataItem) *_S7PayloadUserData {
 	_result := &_S7PayloadUserData{
-		S7PayloadContract: NewS7Payload(parameter),
+		S7PayloadContract: NewS7Payload(),
 		Items:             items,
 	}
 	_result.S7PayloadContract.(*_S7Payload)._SubType = _result
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItem.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItem.go
index 0c83ec5ed6a..a841ec48b7f 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItem.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItem.go
@@ -702,7 +702,7 @@ func S7PayloadUserDataItemParseWithBufferProducer[T S7PayloadUserDataItem](cpuFu
 }
 
 func S7PayloadUserDataItemParseWithBuffer[T S7PayloadUserDataItem](ctx context.Context, readBuffer utils.ReadBuffer, cpuFunctionGroup uint8, cpuFunctionType uint8, cpuSubfunction uint8) (T, error) {
-	v, err := (&_S7PayloadUserDataItem{}).parse(ctx, readBuffer, cpuFunctionGroup, cpuFunctionType, cpuSubfunction)
+	v, err := (new(_S7PayloadUserDataItem)).parse(ctx, readBuffer, cpuFunctionGroup, cpuFunctionType, cpuSubfunction)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarRequest.go b/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarRequest.go
index 6be0fbc1d8f..82f4e37a253 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarRequest.go
@@ -59,9 +59,9 @@ var _ S7PayloadWriteVarRequest = (*_S7PayloadWriteVarRequest)(nil)
 var _ S7PayloadRequirements = (*_S7PayloadWriteVarRequest)(nil)
 
 // NewS7PayloadWriteVarRequest factory function for _S7PayloadWriteVarRequest
-func NewS7PayloadWriteVarRequest(items []S7VarPayloadDataItem, parameter S7Parameter) *_S7PayloadWriteVarRequest {
+func NewS7PayloadWriteVarRequest(items []S7VarPayloadDataItem) *_S7PayloadWriteVarRequest {
 	_result := &_S7PayloadWriteVarRequest{
-		S7PayloadContract: NewS7Payload(parameter),
+		S7PayloadContract: NewS7Payload(),
 		Items:             items,
 	}
 	_result.S7PayloadContract.(*_S7Payload)._SubType = _result
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarResponse.go
index 4c69a842273..1eacb525fac 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarResponse.go
@@ -59,9 +59,9 @@ var _ S7PayloadWriteVarResponse = (*_S7PayloadWriteVarResponse)(nil)
 var _ S7PayloadRequirements = (*_S7PayloadWriteVarResponse)(nil)
 
 // NewS7PayloadWriteVarResponse factory function for _S7PayloadWriteVarResponse
-func NewS7PayloadWriteVarResponse(items []S7VarPayloadStatusItem, parameter S7Parameter) *_S7PayloadWriteVarResponse {
+func NewS7PayloadWriteVarResponse(items []S7VarPayloadStatusItem) *_S7PayloadWriteVarResponse {
 	_result := &_S7PayloadWriteVarResponse{
-		S7PayloadContract: NewS7Payload(parameter),
+		S7PayloadContract: NewS7Payload(),
 		Items:             items,
 	}
 	_result.S7PayloadContract.(*_S7Payload)._SubType = _result
diff --git a/plc4go/protocols/s7/readwrite/model/S7VarPayloadDataItem.go b/plc4go/protocols/s7/readwrite/model/S7VarPayloadDataItem.go
index 368baa00f8f..e36ddced5a6 100644
--- a/plc4go/protocols/s7/readwrite/model/S7VarPayloadDataItem.go
+++ b/plc4go/protocols/s7/readwrite/model/S7VarPayloadDataItem.go
@@ -235,7 +235,7 @@ func S7VarPayloadDataItemParseWithBufferProducer() func(ctx context.Context, rea
 }
 
 func S7VarPayloadDataItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (S7VarPayloadDataItem, error) {
-	v, err := (&_S7VarPayloadDataItem{}).parse(ctx, readBuffer)
+	v, err := (new(_S7VarPayloadDataItem)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/S7VarPayloadStatusItem.go b/plc4go/protocols/s7/readwrite/model/S7VarPayloadStatusItem.go
index 3c3d9d8ed4a..345521d885a 100644
--- a/plc4go/protocols/s7/readwrite/model/S7VarPayloadStatusItem.go
+++ b/plc4go/protocols/s7/readwrite/model/S7VarPayloadStatusItem.go
@@ -189,7 +189,7 @@ func S7VarPayloadStatusItemParseWithBufferProducer() func(ctx context.Context, r
 }
 
 func S7VarPayloadStatusItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (S7VarPayloadStatusItem, error) {
-	v, err := (&_S7VarPayloadStatusItem{}).parse(ctx, readBuffer)
+	v, err := (new(_S7VarPayloadStatusItem)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/S7VarRequestParameterItem.go b/plc4go/protocols/s7/readwrite/model/S7VarRequestParameterItem.go
index d2b64b38231..a81ebec2d2a 100644
--- a/plc4go/protocols/s7/readwrite/model/S7VarRequestParameterItem.go
+++ b/plc4go/protocols/s7/readwrite/model/S7VarRequestParameterItem.go
@@ -241,7 +241,7 @@ func S7VarRequestParameterItemParseWithBufferProducer[T S7VarRequestParameterIte
 }
 
 func S7VarRequestParameterItemParseWithBuffer[T S7VarRequestParameterItem](ctx context.Context, readBuffer utils.ReadBuffer) (T, error) {
-	v, err := (&_S7VarRequestParameterItem{}).parse(ctx, readBuffer)
+	v, err := (new(_S7VarRequestParameterItem)).parse(ctx, readBuffer)
 	if err != nil {
 		var zero T
 		return zero, err
diff --git a/plc4go/protocols/s7/readwrite/model/State.go b/plc4go/protocols/s7/readwrite/model/State.go
index ea14d21da64..c62688bc6ed 100644
--- a/plc4go/protocols/s7/readwrite/model/State.go
+++ b/plc4go/protocols/s7/readwrite/model/State.go
@@ -308,7 +308,7 @@ func StateParseWithBufferProducer() func(ctx context.Context, readBuffer utils.R
 }
 
 func StateParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (State, error) {
-	v, err := (&_State{}).parse(ctx, readBuffer)
+	v, err := (new(_State)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/SubItem.go b/plc4go/protocols/s7/readwrite/model/SubItem.go
index aa4eae9fd2d..1607a472550 100644
--- a/plc4go/protocols/s7/readwrite/model/SubItem.go
+++ b/plc4go/protocols/s7/readwrite/model/SubItem.go
@@ -223,7 +223,7 @@ func SubItemParseWithBufferProducer() func(ctx context.Context, readBuffer utils
 }
 
 func SubItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (SubItem, error) {
-	v, err := (&_SubItem{}).parse(ctx, readBuffer)
+	v, err := (new(_SubItem)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/SzlDataTreeItem.go b/plc4go/protocols/s7/readwrite/model/SzlDataTreeItem.go
index b3f91722684..4e2b10b6f30 100644
--- a/plc4go/protocols/s7/readwrite/model/SzlDataTreeItem.go
+++ b/plc4go/protocols/s7/readwrite/model/SzlDataTreeItem.go
@@ -259,7 +259,7 @@ func SzlDataTreeItemParseWithBufferProducer() func(ctx context.Context, readBuff
 }
 
 func SzlDataTreeItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (SzlDataTreeItem, error) {
-	v, err := (&_SzlDataTreeItem{}).parse(ctx, readBuffer)
+	v, err := (new(_SzlDataTreeItem)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/SzlId.go b/plc4go/protocols/s7/readwrite/model/SzlId.go
index 6b639b139c9..6dd4e2d852f 100644
--- a/plc4go/protocols/s7/readwrite/model/SzlId.go
+++ b/plc4go/protocols/s7/readwrite/model/SzlId.go
@@ -223,7 +223,7 @@ func SzlIdParseWithBufferProducer() func(ctx context.Context, readBuffer utils.R
 }
 
 func SzlIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (SzlId, error) {
-	v, err := (&_SzlId{}).parse(ctx, readBuffer)
+	v, err := (new(_SzlId)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/s7/readwrite/model/TPKTPacket.go b/plc4go/protocols/s7/readwrite/model/TPKTPacket.go
index 34ac83b3b50..46b1436cfdd 100644
--- a/plc4go/protocols/s7/readwrite/model/TPKTPacket.go
+++ b/plc4go/protocols/s7/readwrite/model/TPKTPacket.go
@@ -236,7 +236,7 @@ func TPKTPacketParseWithBufferProducer() func(ctx context.Context, readBuffer ut
 }
 
 func TPKTPacketParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (TPKTPacket, error) {
-	v, err := (&_TPKTPacket{}).parse(ctx, readBuffer)
+	v, err := (new(_TPKTPacket)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4go/protocols/simulated/readwrite/model/Dummy.go b/plc4go/protocols/simulated/readwrite/model/Dummy.go
index 43b4537b6e5..64ec485fb56 100644
--- a/plc4go/protocols/simulated/readwrite/model/Dummy.go
+++ b/plc4go/protocols/simulated/readwrite/model/Dummy.go
@@ -191,7 +191,7 @@ func DummyParseWithBufferProducer() func(ctx context.Context, readBuffer utils.R
 }
 
 func DummyParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (Dummy, error) {
-	v, err := (&_Dummy{}).parse(ctx, readBuffer)
+	v, err := (new(_Dummy)).parse(ctx, readBuffer)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryConstants.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryConstants.java
deleted file mode 100644
index 0db2e08b57a..00000000000
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryConstants.java
+++ /dev/null
@@ -1,127 +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.ads.discovery.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 AdsDiscoveryConstants implements Message {
-
-  // Constant values.
-  public static final Integer ADSDISCOVERYUDPDEFAULTPORT = 48899;
-
-  public AdsDiscoveryConstants() {
-    super();
-  }
-
-  public int getAdsDiscoveryUdpDefaultPort() {
-    return ADSDISCOVERYUDPDEFAULTPORT;
-  }
-
-  public void serialize(WriteBuffer writeBuffer) throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("AdsDiscoveryConstants");
-
-    // Const Field (adsDiscoveryUdpDefaultPort)
-    writeConstField(
-        "adsDiscoveryUdpDefaultPort",
-        ADSDISCOVERYUDPDEFAULTPORT,
-        writeUnsignedInt(writeBuffer, 16));
-
-    writeBuffer.popContext("AdsDiscoveryConstants");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = 0;
-    AdsDiscoveryConstants _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    // Const Field (adsDiscoveryUdpDefaultPort)
-    lengthInBits += 16;
-
-    return lengthInBits;
-  }
-
-  public static AdsDiscoveryConstants staticParse(ReadBuffer readBuffer) throws ParseException {
-    readBuffer.pullContext("AdsDiscoveryConstants");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    int adsDiscoveryUdpDefaultPort =
-        readConstField(
-            "adsDiscoveryUdpDefaultPort",
-            readUnsignedInt(readBuffer, 16),
-            AdsDiscoveryConstants.ADSDISCOVERYUDPDEFAULTPORT);
-
-    readBuffer.closeContext("AdsDiscoveryConstants");
-    // Create the instance
-    AdsDiscoveryConstants _adsDiscoveryConstants;
-    _adsDiscoveryConstants = new AdsDiscoveryConstants();
-    return _adsDiscoveryConstants;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof AdsDiscoveryConstants)) {
-      return false;
-    }
-    AdsDiscoveryConstants that = (AdsDiscoveryConstants) o;
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash();
-  }
-
-  @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/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/Constants.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/Constants.java
new file mode 100644
index 00000000000..c3b03243bc1
--- /dev/null
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/Constants.java
@@ -0,0 +1,42 @@
+/*
+ * 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.ads.discovery.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 Constants {
+
+  // Constant values.
+  public static final Integer ADSDISCOVERYUDPDEFAULTPORT = 48899;
+}
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsConstants.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsConstants.java
deleted file mode 100644
index 664b244736b..00000000000
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsConstants.java
+++ /dev/null
@@ -1,122 +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.ads.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 AdsConstants implements Message {
-
-  // Constant values.
-  public static final Integer ADSTCPDEFAULTPORT = 48898;
-
-  public AdsConstants() {
-    super();
-  }
-
-  public int getAdsTcpDefaultPort() {
-    return ADSTCPDEFAULTPORT;
-  }
-
-  public void serialize(WriteBuffer writeBuffer) throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("AdsConstants");
-
-    // Const Field (adsTcpDefaultPort)
-    writeConstField("adsTcpDefaultPort", ADSTCPDEFAULTPORT, writeUnsignedInt(writeBuffer, 16));
-
-    writeBuffer.popContext("AdsConstants");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = 0;
-    AdsConstants _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    // Const Field (adsTcpDefaultPort)
-    lengthInBits += 16;
-
-    return lengthInBits;
-  }
-
-  public static AdsConstants staticParse(ReadBuffer readBuffer) throws ParseException {
-    readBuffer.pullContext("AdsConstants");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    int adsTcpDefaultPort =
-        readConstField(
-            "adsTcpDefaultPort", readUnsignedInt(readBuffer, 16), AdsConstants.ADSTCPDEFAULTPORT);
-
-    readBuffer.closeContext("AdsConstants");
-    // Create the instance
-    AdsConstants _adsConstants;
-    _adsConstants = new AdsConstants();
-    return _adsConstants;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof AdsConstants)) {
-      return false;
-    }
-    AdsConstants that = (AdsConstants) o;
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash();
-  }
-
-  @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/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/Constants.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/Constants.java
new file mode 100644
index 00000000000..298ab7a814b
--- /dev/null
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/Constants.java
@@ -0,0 +1,42 @@
+/*
+ * 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.ads.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 Constants {
+
+  // Constant values.
+  public static final Integer ADSTCPDEFAULTPORT = 48898;
+}
diff --git a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/configuration/AdsTcpTransportConfiguration.java b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/configuration/AdsTcpTransportConfiguration.java
index d902487674b..db0b5078c36 100644
--- a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/configuration/AdsTcpTransportConfiguration.java
+++ b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/configuration/AdsTcpTransportConfiguration.java
@@ -19,14 +19,14 @@
 
 package org.apache.plc4x.java.ads.configuration;
 
-import org.apache.plc4x.java.ads.readwrite.AdsConstants;
+import org.apache.plc4x.java.ads.readwrite.Constants;
 import org.apache.plc4x.java.transport.tcp.DefaultTcpTransportConfiguration;
 
 public class AdsTcpTransportConfiguration extends DefaultTcpTransportConfiguration {
 
     @Override
     public int getDefaultPort() {
-        return AdsConstants.ADSTCPDEFAULTPORT;
+        return Constants.ADSTCPDEFAULTPORT;
     }
 
 }
diff --git a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/discovery/AdsPlcDiscoverer.java b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/discovery/AdsPlcDiscoverer.java
index 43ad586bea6..9313f4e8ae4 100644
--- a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/discovery/AdsPlcDiscoverer.java
+++ b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/discovery/AdsPlcDiscoverer.java
@@ -19,7 +19,6 @@
 package org.apache.plc4x.java.ads.discovery;
 
 import org.apache.plc4x.java.ads.discovery.readwrite.*;
-import org.apache.plc4x.java.ads.readwrite.AdsConstants;
 import org.apache.plc4x.java.api.messages.PlcDiscoveryItem;
 import org.apache.plc4x.java.api.messages.PlcDiscoveryItemHandler;
 import org.apache.plc4x.java.api.messages.PlcDiscoveryRequest;
@@ -63,7 +62,7 @@ public CompletableFuture<PlcDiscoveryResponse> discoverWithHandler(PlcDiscoveryR
                         if ((interfaceAddress.getBroadcast() != null) && (interfaceAddress.getAddress() instanceof Inet4Address)) {
                             Inet4Address inet4Address = (Inet4Address) interfaceAddress.getAddress();
                             // Open a listening socket on the AMS discovery default port for taking in responses.
-                            DatagramSocket adsDiscoverySocket = new DatagramSocket(AdsDiscoveryConstants.ADSDISCOVERYUDPDEFAULTPORT, inet4Address);
+                            DatagramSocket adsDiscoverySocket = new DatagramSocket(Constants.ADSDISCOVERYUDPDEFAULTPORT, inet4Address);
                             adsDiscoverySocket.setBroadcast(true);
 
                             openSockets.add(adsDiscoverySocket);
@@ -133,7 +132,7 @@ public CompletableFuture<PlcDiscoveryResponse> discoverWithHandler(PlcDiscoveryR
                                                 // Add an entry to the results.
                                                 PlcDiscoveryItem plcDiscoveryItem = new DefaultPlcDiscoveryItem(
                                                     "ads", "tcp",
-                                                    plcAddress.getHostAddress() + ":" + AdsConstants.ADSTCPDEFAULTPORT,
+                                                    plcAddress.getHostAddress() + ":" + org.apache.plc4x.java.ads.readwrite.Constants.ADSTCPDEFAULTPORT,
                                                     options, hostNameBlock.getHostName().getText(), attributes);
 
                                                 // If we've got an explicit handler, pass the new item to that.
@@ -174,7 +173,7 @@ public CompletableFuture<PlcDiscoveryResponse> discoverWithHandler(PlcDiscoveryR
                                 InetAddress broadcastAddress = interfaceAddress.getBroadcast();
 
                                 // Create the UDP packet to the broadcast address.
-                                DatagramPacket discoveryRequestPacket = new DatagramPacket(writeBuffer.getBytes(), writeBuffer.getBytes().length, broadcastAddress, AdsDiscoveryConstants.ADSDISCOVERYUDPDEFAULTPORT);
+                                DatagramPacket discoveryRequestPacket = new DatagramPacket(writeBuffer.getBytes(), writeBuffer.getBytes().length, broadcastAddress, Constants.ADSDISCOVERYUDPDEFAULTPORT);
                                 adsDiscoverySocket.send(discoveryRequestPacket);
                             } catch (SerializationException e) {
                                 logger.error("Error serializing ADS discovery request", e);
diff --git a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/protocol/AdsProtocolLogic.java b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/protocol/AdsProtocolLogic.java
index 9d8e59afe1a..1ca0279f13d 100644
--- a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/protocol/AdsProtocolLogic.java
+++ b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/protocol/AdsProtocolLogic.java
@@ -21,6 +21,7 @@
 import org.apache.plc4x.java.ads.configuration.AdsConfiguration;
 import org.apache.plc4x.java.ads.discovery.readwrite.AmsNetId;
 import org.apache.plc4x.java.ads.discovery.readwrite.*;
+import org.apache.plc4x.java.ads.discovery.readwrite.Constants;
 import org.apache.plc4x.java.ads.model.AdsSubscriptionHandle;
 import org.apache.plc4x.java.ads.readwrite.*;
 import org.apache.plc4x.java.ads.tag.AdsTag;
@@ -281,7 +282,7 @@ protected CompletableFuture<Void> setupAmsRoute(PlcUsernamePasswordAuthenticatio
                     new AdsDiscoveryBlockHostName(new AmsString(localAddress.getHostAddress()))));
 
             // Send the request to the PLC using a UDP socket.
-            try (DatagramSocket adsDiscoverySocket = new DatagramSocket(AdsDiscoveryConstants.ADSDISCOVERYUDPDEFAULTPORT)) {
+            try (DatagramSocket adsDiscoverySocket = new DatagramSocket(Constants.ADSDISCOVERYUDPDEFAULTPORT)) {
                 // Serialize the message.
                 WriteBufferByteBased writeBuffer = new WriteBufferByteBased(
                     addOrUpdateRouteRequest.getLengthInBytes(), ByteOrder.LITTLE_ENDIAN);
@@ -294,7 +295,7 @@ protected CompletableFuture<Void> setupAmsRoute(PlcUsernamePasswordAuthenticatio
                 // Create the UDP packet to the broadcast address.
                 DatagramPacket discoveryRequestPacket = new DatagramPacket(
                     writeBuffer.getBytes(), writeBuffer.getBytes().length,
-                    remoteAddress, AdsDiscoveryConstants.ADSDISCOVERYUDPDEFAULTPORT);
+                    remoteAddress, Constants.ADSDISCOVERYUDPDEFAULTPORT);
                 adsDiscoverySocket.send(discoveryRequestPacket);
 
                 // The actual length would be 32, but better be prepared for a more verbose response
diff --git a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/protocol/ads/ProbeAdsDiscoveryCommands.java b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/protocol/ads/ProbeAdsDiscoveryCommands.java
index 76369733a81..201e6c9df74 100644
--- a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/protocol/ads/ProbeAdsDiscoveryCommands.java
+++ b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/protocol/ads/ProbeAdsDiscoveryCommands.java
@@ -43,7 +43,7 @@ public static void main(String[] args) {
                 new AdsDiscoveryBlockAmsNetId(new AmsNetId((byte) 192, (byte) 168, (byte) 23, (byte) 20, (byte) 1, (byte) 1))
             ));
 
-        try (DatagramSocket adsDiscoverySocket = new DatagramSocket(AdsDiscoveryConstants.ADSDISCOVERYUDPDEFAULTPORT)) {
+        try (DatagramSocket adsDiscoverySocket = new DatagramSocket(Constants.ADSDISCOVERYUDPDEFAULTPORT)) {
             // Serialize the message.
             WriteBufferByteBased writeBuffer = new WriteBufferByteBased(discoveryRequestMessage.getLengthInBytes(), ByteOrder.LITTLE_ENDIAN);
             discoveryRequestMessage.serialize(writeBuffer);
@@ -52,7 +52,7 @@ public static void main(String[] args) {
             InetAddress address = InetAddress.getByAddress(new byte[]{(byte) 192, (byte) 168, (byte) 23, (byte) 20});
 
             // Create the UDP packet to the broadcast address.
-            DatagramPacket discoveryRequestPacket = new DatagramPacket(writeBuffer.getBytes(), writeBuffer.getBytes().length, address, AdsDiscoveryConstants.ADSDISCOVERYUDPDEFAULTPORT);
+            DatagramPacket discoveryRequestPacket = new DatagramPacket(writeBuffer.getBytes(), writeBuffer.getBytes().length, address, Constants.ADSDISCOVERYUDPDEFAULTPORT);
             adsDiscoverySocket.send(discoveryRequestPacket);
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/plc4j/drivers/bacnet/pom.xml b/plc4j/drivers/bacnet/pom.xml
index d860f3312e9..e5015b2d853 100644
--- a/plc4j/drivers/bacnet/pom.xml
+++ b/plc4j/drivers/bacnet/pom.xml
@@ -221,7 +221,6 @@
                   <outputFlavor>read-write</outputFlavor>
                   <outputDir>src/main/generated</outputDir>
                   <options>
-                    <generate-properties-for-parser-arguments>true</generate-properties-for-parser-arguments>
                     <!-- We want properties that contain the values of reserved fields, if the value differs from the expected one -->
                     <generate-properties-for-reserved-fields>true</generate-properties-for-reserved-fields>
                   </options>
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDU.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDU.java
index 72ed5d90181..1b3f13bead1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDU.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDU.java
@@ -40,12 +40,8 @@ public abstract class APDU implements Message {
   // Abstract accessors for discriminator values.
   public abstract ApduType getApduType();
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public APDU(Integer apduLength) {
+  public APDU() {
     super();
-    this.apduLength = apduLength;
   }
 
   protected abstract void serializeAPDUChild(WriteBuffer writeBuffer) throws SerializationException;
@@ -130,13 +126,12 @@ public static APDU staticParse(ReadBuffer readBuffer, Integer apduLength) throws
 
     readBuffer.closeContext("APDU");
     // Create the instance
-    APDU _aPDU = builder.build(apduLength);
-
+    APDU _aPDU = builder.build();
     return _aPDU;
   }
 
   public interface APDUBuilder {
-    APDU build(Integer apduLength);
+    APDU build();
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUAbort.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUAbort.java
index 4487ef063c6..4ba4b706f48 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUAbort.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUAbort.java
@@ -46,22 +46,14 @@ public ApduType getApduType() {
   protected final boolean server;
   protected final short originalInvokeId;
   protected final BACnetAbortReasonTagged abortReason;
-
-  // Arguments.
-  protected final Integer apduLength;
   // Reserved Fields
   private Byte reservedField0;
 
-  public APDUAbort(
-      boolean server,
-      short originalInvokeId,
-      BACnetAbortReasonTagged abortReason,
-      Integer apduLength) {
-    super(apduLength);
+  public APDUAbort(boolean server, short originalInvokeId, BACnetAbortReasonTagged abortReason) {
+    super();
     this.server = server;
     this.originalInvokeId = originalInvokeId;
     this.abortReason = abortReason;
-    this.apduLength = apduLength;
   }
 
   public boolean getServer() {
@@ -147,33 +139,28 @@ public static APDUBuilder staticParseAPDUBuilder(ReadBuffer readBuffer, Integer
 
     readBuffer.closeContext("APDUAbort");
     // Create the instance
-    return new APDUAbortBuilderImpl(
-        server, originalInvokeId, abortReason, apduLength, reservedField0);
+    return new APDUAbortBuilderImpl(server, originalInvokeId, abortReason, reservedField0);
   }
 
   public static class APDUAbortBuilderImpl implements APDU.APDUBuilder {
     private final boolean server;
     private final short originalInvokeId;
     private final BACnetAbortReasonTagged abortReason;
-    private final Integer apduLength;
     private final Byte reservedField0;
 
     public APDUAbortBuilderImpl(
         boolean server,
         short originalInvokeId,
         BACnetAbortReasonTagged abortReason,
-        Integer apduLength,
         Byte reservedField0) {
       this.server = server;
       this.originalInvokeId = originalInvokeId;
       this.abortReason = abortReason;
-      this.apduLength = apduLength;
       this.reservedField0 = reservedField0;
     }
 
-    public APDUAbort build(Integer apduLength) {
-
-      APDUAbort aPDUAbort = new APDUAbort(server, originalInvokeId, abortReason, apduLength);
+    public APDUAbort build() {
+      APDUAbort aPDUAbort = new APDUAbort(server, originalInvokeId, abortReason);
       aPDUAbort.reservedField0 = reservedField0;
       return aPDUAbort;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUComplexAck.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUComplexAck.java
index ddf0100b7bc..7d8baf1ff02 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUComplexAck.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUComplexAck.java
@@ -51,9 +51,6 @@ public ApduType getApduType() {
   protected final BACnetServiceAck serviceAck;
   protected final BACnetConfirmedServiceChoice segmentServiceChoice;
   protected final byte[] segment;
-
-  // Arguments.
-  protected final Integer apduLength;
   // Reserved Fields
   private Byte reservedField0;
 
@@ -65,9 +62,8 @@ public APDUComplexAck(
       Short proposedWindowSize,
       BACnetServiceAck serviceAck,
       BACnetConfirmedServiceChoice segmentServiceChoice,
-      byte[] segment,
-      Integer apduLength) {
-    super(apduLength);
+      byte[] segment) {
+    super();
     this.segmentedMessage = segmentedMessage;
     this.moreFollows = moreFollows;
     this.originalInvokeId = originalInvokeId;
@@ -76,7 +72,6 @@ public APDUComplexAck(
     this.serviceAck = serviceAck;
     this.segmentServiceChoice = segmentServiceChoice;
     this.segment = segment;
-    this.apduLength = apduLength;
   }
 
   public boolean getSegmentedMessage() {
@@ -144,26 +139,18 @@ protected void serializeAPDUChild(WriteBuffer writeBuffer) throws SerializationE
     writeSimpleField("originalInvokeId", originalInvokeId, writeUnsignedShort(writeBuffer, 8));
 
     // Optional Field (sequenceNumber) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "sequenceNumber",
-        sequenceNumber,
-        writeUnsignedShort(writeBuffer, 8),
-        getSegmentedMessage());
+    writeOptionalField("sequenceNumber", sequenceNumber, writeUnsignedShort(writeBuffer, 8));
 
     // Optional Field (proposedWindowSize) (Can be skipped, if the value is null)
     writeOptionalField(
-        "proposedWindowSize",
-        proposedWindowSize,
-        writeUnsignedShort(writeBuffer, 8),
-        getSegmentedMessage());
+        "proposedWindowSize", proposedWindowSize, writeUnsignedShort(writeBuffer, 8));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     int apduHeaderReduction = getApduHeaderReduction();
     writeBuffer.writeVirtual("apduHeaderReduction", apduHeaderReduction);
 
     // Optional Field (serviceAck) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "serviceAck", serviceAck, writeComplex(writeBuffer), !(getSegmentedMessage()));
+    writeOptionalField("serviceAck", serviceAck, writeComplex(writeBuffer));
 
     // Optional Field (segmentServiceChoice) (Can be skipped, if the value is null)
     writeOptionalEnumField(
@@ -309,7 +296,6 @@ public static APDUBuilder staticParseAPDUBuilder(ReadBuffer readBuffer, Integer
         serviceAck,
         segmentServiceChoice,
         segment,
-        apduLength,
         reservedField0);
   }
 
@@ -322,7 +308,6 @@ public static class APDUComplexAckBuilderImpl implements APDU.APDUBuilder {
     private final BACnetServiceAck serviceAck;
     private final BACnetConfirmedServiceChoice segmentServiceChoice;
     private final byte[] segment;
-    private final Integer apduLength;
     private final Byte reservedField0;
 
     public APDUComplexAckBuilderImpl(
@@ -334,7 +319,6 @@ public APDUComplexAckBuilderImpl(
         BACnetServiceAck serviceAck,
         BACnetConfirmedServiceChoice segmentServiceChoice,
         byte[] segment,
-        Integer apduLength,
         Byte reservedField0) {
       this.segmentedMessage = segmentedMessage;
       this.moreFollows = moreFollows;
@@ -344,12 +328,10 @@ public APDUComplexAckBuilderImpl(
       this.serviceAck = serviceAck;
       this.segmentServiceChoice = segmentServiceChoice;
       this.segment = segment;
-      this.apduLength = apduLength;
       this.reservedField0 = reservedField0;
     }
 
-    public APDUComplexAck build(Integer apduLength) {
-
+    public APDUComplexAck build() {
       APDUComplexAck aPDUComplexAck =
           new APDUComplexAck(
               segmentedMessage,
@@ -359,8 +341,7 @@ public APDUComplexAck build(Integer apduLength) {
               proposedWindowSize,
               serviceAck,
               segmentServiceChoice,
-              segment,
-              apduLength);
+              segment);
       aPDUComplexAck.reservedField0 = reservedField0;
       return aPDUComplexAck;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUConfirmedRequest.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUConfirmedRequest.java
index c182319ddba..f5bcade900a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUConfirmedRequest.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUConfirmedRequest.java
@@ -54,9 +54,6 @@ public ApduType getApduType() {
   protected final BACnetConfirmedServiceRequest serviceRequest;
   protected final BACnetConfirmedServiceChoice segmentServiceChoice;
   protected final byte[] segment;
-
-  // Arguments.
-  protected final Integer apduLength;
   // Reserved Fields
   private Byte reservedField0;
 
@@ -71,9 +68,8 @@ public APDUConfirmedRequest(
       Short proposedWindowSize,
       BACnetConfirmedServiceRequest serviceRequest,
       BACnetConfirmedServiceChoice segmentServiceChoice,
-      byte[] segment,
-      Integer apduLength) {
-    super(apduLength);
+      byte[] segment) {
+    super();
     this.segmentedMessage = segmentedMessage;
     this.moreFollows = moreFollows;
     this.segmentedResponseAccepted = segmentedResponseAccepted;
@@ -85,7 +81,6 @@ public APDUConfirmedRequest(
     this.serviceRequest = serviceRequest;
     this.segmentServiceChoice = segmentServiceChoice;
     this.segment = segment;
-    this.apduLength = apduLength;
   }
 
   public boolean getSegmentedMessage() {
@@ -189,26 +184,18 @@ protected void serializeAPDUChild(WriteBuffer writeBuffer) throws SerializationE
     writeSimpleField("invokeId", invokeId, writeUnsignedShort(writeBuffer, 8));
 
     // Optional Field (sequenceNumber) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "sequenceNumber",
-        sequenceNumber,
-        writeUnsignedShort(writeBuffer, 8),
-        getSegmentedMessage());
+    writeOptionalField("sequenceNumber", sequenceNumber, writeUnsignedShort(writeBuffer, 8));
 
     // Optional Field (proposedWindowSize) (Can be skipped, if the value is null)
     writeOptionalField(
-        "proposedWindowSize",
-        proposedWindowSize,
-        writeUnsignedShort(writeBuffer, 8),
-        getSegmentedMessage());
+        "proposedWindowSize", proposedWindowSize, writeUnsignedShort(writeBuffer, 8));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     int apduHeaderReduction = getApduHeaderReduction();
     writeBuffer.writeVirtual("apduHeaderReduction", apduHeaderReduction);
 
     // Optional Field (serviceRequest) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "serviceRequest", serviceRequest, writeComplex(writeBuffer), !(getSegmentedMessage()));
+    writeOptionalField("serviceRequest", serviceRequest, writeComplex(writeBuffer));
 
     // Optional Field (segmentServiceChoice) (Can be skipped, if the value is null)
     writeOptionalEnumField(
@@ -381,7 +368,6 @@ public static APDUBuilder staticParseAPDUBuilder(ReadBuffer readBuffer, Integer
         serviceRequest,
         segmentServiceChoice,
         segment,
-        apduLength,
         reservedField0);
   }
 
@@ -397,7 +383,6 @@ public static class APDUConfirmedRequestBuilderImpl implements APDU.APDUBuilder
     private final BACnetConfirmedServiceRequest serviceRequest;
     private final BACnetConfirmedServiceChoice segmentServiceChoice;
     private final byte[] segment;
-    private final Integer apduLength;
     private final Byte reservedField0;
 
     public APDUConfirmedRequestBuilderImpl(
@@ -412,7 +397,6 @@ public APDUConfirmedRequestBuilderImpl(
         BACnetConfirmedServiceRequest serviceRequest,
         BACnetConfirmedServiceChoice segmentServiceChoice,
         byte[] segment,
-        Integer apduLength,
         Byte reservedField0) {
       this.segmentedMessage = segmentedMessage;
       this.moreFollows = moreFollows;
@@ -425,12 +409,10 @@ public APDUConfirmedRequestBuilderImpl(
       this.serviceRequest = serviceRequest;
       this.segmentServiceChoice = segmentServiceChoice;
       this.segment = segment;
-      this.apduLength = apduLength;
       this.reservedField0 = reservedField0;
     }
 
-    public APDUConfirmedRequest build(Integer apduLength) {
-
+    public APDUConfirmedRequest build() {
       APDUConfirmedRequest aPDUConfirmedRequest =
           new APDUConfirmedRequest(
               segmentedMessage,
@@ -443,8 +425,7 @@ public APDUConfirmedRequest build(Integer apduLength) {
               proposedWindowSize,
               serviceRequest,
               segmentServiceChoice,
-              segment,
-              apduLength);
+              segment);
       aPDUConfirmedRequest.reservedField0 = reservedField0;
       return aPDUConfirmedRequest;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUError.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUError.java
index b8ea77a7929..283a1bef9dd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUError.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUError.java
@@ -46,22 +46,15 @@ public ApduType getApduType() {
   protected final short originalInvokeId;
   protected final BACnetConfirmedServiceChoice errorChoice;
   protected final BACnetError error;
-
-  // Arguments.
-  protected final Integer apduLength;
   // Reserved Fields
   private Byte reservedField0;
 
   public APDUError(
-      short originalInvokeId,
-      BACnetConfirmedServiceChoice errorChoice,
-      BACnetError error,
-      Integer apduLength) {
-    super(apduLength);
+      short originalInvokeId, BACnetConfirmedServiceChoice errorChoice, BACnetError error) {
+    super();
     this.originalInvokeId = originalInvokeId;
     this.errorChoice = errorChoice;
     this.error = error;
-    this.apduLength = apduLength;
   }
 
   public short getOriginalInvokeId() {
@@ -161,33 +154,28 @@ public static APDUBuilder staticParseAPDUBuilder(ReadBuffer readBuffer, Integer
 
     readBuffer.closeContext("APDUError");
     // Create the instance
-    return new APDUErrorBuilderImpl(
-        originalInvokeId, errorChoice, error, apduLength, reservedField0);
+    return new APDUErrorBuilderImpl(originalInvokeId, errorChoice, error, reservedField0);
   }
 
   public static class APDUErrorBuilderImpl implements APDU.APDUBuilder {
     private final short originalInvokeId;
     private final BACnetConfirmedServiceChoice errorChoice;
     private final BACnetError error;
-    private final Integer apduLength;
     private final Byte reservedField0;
 
     public APDUErrorBuilderImpl(
         short originalInvokeId,
         BACnetConfirmedServiceChoice errorChoice,
         BACnetError error,
-        Integer apduLength,
         Byte reservedField0) {
       this.originalInvokeId = originalInvokeId;
       this.errorChoice = errorChoice;
       this.error = error;
-      this.apduLength = apduLength;
       this.reservedField0 = reservedField0;
     }
 
-    public APDUError build(Integer apduLength) {
-
-      APDUError aPDUError = new APDUError(originalInvokeId, errorChoice, error, apduLength);
+    public APDUError build() {
+      APDUError aPDUError = new APDUError(originalInvokeId, errorChoice, error);
       aPDUError.reservedField0 = reservedField0;
       return aPDUError;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUReject.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUReject.java
index ba3e1aa1731..445d0d0b36d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUReject.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUReject.java
@@ -45,18 +45,13 @@ public ApduType getApduType() {
   // Properties.
   protected final short originalInvokeId;
   protected final BACnetRejectReasonTagged rejectReason;
-
-  // Arguments.
-  protected final Integer apduLength;
   // Reserved Fields
   private Byte reservedField0;
 
-  public APDUReject(
-      short originalInvokeId, BACnetRejectReasonTagged rejectReason, Integer apduLength) {
-    super(apduLength);
+  public APDUReject(short originalInvokeId, BACnetRejectReasonTagged rejectReason) {
+    super();
     this.originalInvokeId = originalInvokeId;
     this.rejectReason = rejectReason;
-    this.apduLength = apduLength;
   }
 
   public short getOriginalInvokeId() {
@@ -130,29 +125,23 @@ public static APDUBuilder staticParseAPDUBuilder(ReadBuffer readBuffer, Integer
 
     readBuffer.closeContext("APDUReject");
     // Create the instance
-    return new APDURejectBuilderImpl(originalInvokeId, rejectReason, apduLength, reservedField0);
+    return new APDURejectBuilderImpl(originalInvokeId, rejectReason, reservedField0);
   }
 
   public static class APDURejectBuilderImpl implements APDU.APDUBuilder {
     private final short originalInvokeId;
     private final BACnetRejectReasonTagged rejectReason;
-    private final Integer apduLength;
     private final Byte reservedField0;
 
     public APDURejectBuilderImpl(
-        short originalInvokeId,
-        BACnetRejectReasonTagged rejectReason,
-        Integer apduLength,
-        Byte reservedField0) {
+        short originalInvokeId, BACnetRejectReasonTagged rejectReason, Byte reservedField0) {
       this.originalInvokeId = originalInvokeId;
       this.rejectReason = rejectReason;
-      this.apduLength = apduLength;
       this.reservedField0 = reservedField0;
     }
 
-    public APDUReject build(Integer apduLength) {
-
-      APDUReject aPDUReject = new APDUReject(originalInvokeId, rejectReason, apduLength);
+    public APDUReject build() {
+      APDUReject aPDUReject = new APDUReject(originalInvokeId, rejectReason);
       aPDUReject.reservedField0 = reservedField0;
       return aPDUReject;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUSegmentAck.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUSegmentAck.java
index c8c17691ec3..81cb063080e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUSegmentAck.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUSegmentAck.java
@@ -48,9 +48,6 @@ public ApduType getApduType() {
   protected final short originalInvokeId;
   protected final short sequenceNumber;
   protected final short actualWindowSize;
-
-  // Arguments.
-  protected final Integer apduLength;
   // Reserved Fields
   private Byte reservedField0;
 
@@ -59,15 +56,13 @@ public APDUSegmentAck(
       boolean server,
       short originalInvokeId,
       short sequenceNumber,
-      short actualWindowSize,
-      Integer apduLength) {
-    super(apduLength);
+      short actualWindowSize) {
+    super();
     this.negativeAck = negativeAck;
     this.server = server;
     this.originalInvokeId = originalInvokeId;
     this.sequenceNumber = sequenceNumber;
     this.actualWindowSize = actualWindowSize;
-    this.apduLength = apduLength;
   }
 
   public boolean getNegativeAck() {
@@ -174,13 +169,7 @@ public static APDUBuilder staticParseAPDUBuilder(ReadBuffer readBuffer, Integer
     readBuffer.closeContext("APDUSegmentAck");
     // Create the instance
     return new APDUSegmentAckBuilderImpl(
-        negativeAck,
-        server,
-        originalInvokeId,
-        sequenceNumber,
-        actualWindowSize,
-        apduLength,
-        reservedField0);
+        negativeAck, server, originalInvokeId, sequenceNumber, actualWindowSize, reservedField0);
   }
 
   public static class APDUSegmentAckBuilderImpl implements APDU.APDUBuilder {
@@ -189,7 +178,6 @@ public static class APDUSegmentAckBuilderImpl implements APDU.APDUBuilder {
     private final short originalInvokeId;
     private final short sequenceNumber;
     private final short actualWindowSize;
-    private final Integer apduLength;
     private final Byte reservedField0;
 
     public APDUSegmentAckBuilderImpl(
@@ -198,22 +186,19 @@ public APDUSegmentAckBuilderImpl(
         short originalInvokeId,
         short sequenceNumber,
         short actualWindowSize,
-        Integer apduLength,
         Byte reservedField0) {
       this.negativeAck = negativeAck;
       this.server = server;
       this.originalInvokeId = originalInvokeId;
       this.sequenceNumber = sequenceNumber;
       this.actualWindowSize = actualWindowSize;
-      this.apduLength = apduLength;
       this.reservedField0 = reservedField0;
     }
 
-    public APDUSegmentAck build(Integer apduLength) {
-
+    public APDUSegmentAck build() {
       APDUSegmentAck aPDUSegmentAck =
           new APDUSegmentAck(
-              negativeAck, server, originalInvokeId, sequenceNumber, actualWindowSize, apduLength);
+              negativeAck, server, originalInvokeId, sequenceNumber, actualWindowSize);
       aPDUSegmentAck.reservedField0 = reservedField0;
       return aPDUSegmentAck;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUSimpleAck.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUSimpleAck.java
index e489bfb9c7b..92c16329a84 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUSimpleAck.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUSimpleAck.java
@@ -45,18 +45,13 @@ public ApduType getApduType() {
   // Properties.
   protected final short originalInvokeId;
   protected final BACnetConfirmedServiceChoice serviceChoice;
-
-  // Arguments.
-  protected final Integer apduLength;
   // Reserved Fields
   private Byte reservedField0;
 
-  public APDUSimpleAck(
-      short originalInvokeId, BACnetConfirmedServiceChoice serviceChoice, Integer apduLength) {
-    super(apduLength);
+  public APDUSimpleAck(short originalInvokeId, BACnetConfirmedServiceChoice serviceChoice) {
+    super();
     this.originalInvokeId = originalInvokeId;
     this.serviceChoice = serviceChoice;
-    this.apduLength = apduLength;
   }
 
   public short getOriginalInvokeId() {
@@ -136,30 +131,23 @@ public static APDUBuilder staticParseAPDUBuilder(ReadBuffer readBuffer, Integer
 
     readBuffer.closeContext("APDUSimpleAck");
     // Create the instance
-    return new APDUSimpleAckBuilderImpl(
-        originalInvokeId, serviceChoice, apduLength, reservedField0);
+    return new APDUSimpleAckBuilderImpl(originalInvokeId, serviceChoice, reservedField0);
   }
 
   public static class APDUSimpleAckBuilderImpl implements APDU.APDUBuilder {
     private final short originalInvokeId;
     private final BACnetConfirmedServiceChoice serviceChoice;
-    private final Integer apduLength;
     private final Byte reservedField0;
 
     public APDUSimpleAckBuilderImpl(
-        short originalInvokeId,
-        BACnetConfirmedServiceChoice serviceChoice,
-        Integer apduLength,
-        Byte reservedField0) {
+        short originalInvokeId, BACnetConfirmedServiceChoice serviceChoice, Byte reservedField0) {
       this.originalInvokeId = originalInvokeId;
       this.serviceChoice = serviceChoice;
-      this.apduLength = apduLength;
       this.reservedField0 = reservedField0;
     }
 
-    public APDUSimpleAck build(Integer apduLength) {
-
-      APDUSimpleAck aPDUSimpleAck = new APDUSimpleAck(originalInvokeId, serviceChoice, apduLength);
+    public APDUSimpleAck build() {
+      APDUSimpleAck aPDUSimpleAck = new APDUSimpleAck(originalInvokeId, serviceChoice);
       aPDUSimpleAck.reservedField0 = reservedField0;
       return aPDUSimpleAck;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUUnconfirmedRequest.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUUnconfirmedRequest.java
index b562f04691a..e8fd03ed70b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUUnconfirmedRequest.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUUnconfirmedRequest.java
@@ -44,17 +44,12 @@ public ApduType getApduType() {
 
   // Properties.
   protected final BACnetUnconfirmedServiceRequest serviceRequest;
-
-  // Arguments.
-  protected final Integer apduLength;
   // Reserved Fields
   private Byte reservedField0;
 
-  public APDUUnconfirmedRequest(
-      BACnetUnconfirmedServiceRequest serviceRequest, Integer apduLength) {
-    super(apduLength);
+  public APDUUnconfirmedRequest(BACnetUnconfirmedServiceRequest serviceRequest) {
+    super();
     this.serviceRequest = serviceRequest;
-    this.apduLength = apduLength;
   }
 
   public BACnetUnconfirmedServiceRequest getServiceRequest() {
@@ -118,25 +113,21 @@ public static APDUBuilder staticParseAPDUBuilder(ReadBuffer readBuffer, Integer
 
     readBuffer.closeContext("APDUUnconfirmedRequest");
     // Create the instance
-    return new APDUUnconfirmedRequestBuilderImpl(serviceRequest, apduLength, reservedField0);
+    return new APDUUnconfirmedRequestBuilderImpl(serviceRequest, reservedField0);
   }
 
   public static class APDUUnconfirmedRequestBuilderImpl implements APDU.APDUBuilder {
     private final BACnetUnconfirmedServiceRequest serviceRequest;
-    private final Integer apduLength;
     private final Byte reservedField0;
 
     public APDUUnconfirmedRequestBuilderImpl(
-        BACnetUnconfirmedServiceRequest serviceRequest, Integer apduLength, Byte reservedField0) {
+        BACnetUnconfirmedServiceRequest serviceRequest, Byte reservedField0) {
       this.serviceRequest = serviceRequest;
-      this.apduLength = apduLength;
       this.reservedField0 = reservedField0;
     }
 
-    public APDUUnconfirmedRequest build(Integer apduLength) {
-
-      APDUUnconfirmedRequest aPDUUnconfirmedRequest =
-          new APDUUnconfirmedRequest(serviceRequest, apduLength);
+    public APDUUnconfirmedRequest build() {
+      APDUUnconfirmedRequest aPDUUnconfirmedRequest = new APDUUnconfirmedRequest(serviceRequest);
       aPDUUnconfirmedRequest.reservedField0 = reservedField0;
       return aPDUUnconfirmedRequest;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUUnknown.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUUnknown.java
index 7593cb208a5..efc2894d6f3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUUnknown.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUUnknown.java
@@ -46,14 +46,10 @@ public ApduType getApduType() {
   protected final byte unknownTypeRest;
   protected final byte[] unknownBytes;
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public APDUUnknown(byte unknownTypeRest, byte[] unknownBytes, Integer apduLength) {
-    super(apduLength);
+  public APDUUnknown(byte unknownTypeRest, byte[] unknownBytes) {
+    super();
     this.unknownTypeRest = unknownTypeRest;
     this.unknownBytes = unknownBytes;
-    this.apduLength = apduLength;
   }
 
   public byte getUnknownTypeRest() {
@@ -115,23 +111,20 @@ public static APDUBuilder staticParseAPDUBuilder(ReadBuffer readBuffer, Integer
 
     readBuffer.closeContext("APDUUnknown");
     // Create the instance
-    return new APDUUnknownBuilderImpl(unknownTypeRest, unknownBytes, apduLength);
+    return new APDUUnknownBuilderImpl(unknownTypeRest, unknownBytes);
   }
 
   public static class APDUUnknownBuilderImpl implements APDU.APDUBuilder {
     private final byte unknownTypeRest;
     private final byte[] unknownBytes;
-    private final Integer apduLength;
 
-    public APDUUnknownBuilderImpl(byte unknownTypeRest, byte[] unknownBytes, Integer apduLength) {
+    public APDUUnknownBuilderImpl(byte unknownTypeRest, byte[] unknownBytes) {
       this.unknownTypeRest = unknownTypeRest;
       this.unknownBytes = unknownBytes;
-      this.apduLength = apduLength;
     }
 
-    public APDUUnknown build(Integer apduLength) {
-
-      APDUUnknown aPDUUnknown = new APDUUnknown(unknownTypeRest, unknownBytes, apduLength);
+    public APDUUnknown build() {
+      APDUUnknown aPDUUnknown = new APDUUnknown(unknownTypeRest, unknownBytes);
       return aPDUUnknown;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAbortReasonTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAbortReasonTagged.java
index a01472bc3a6..e64ab76bbdc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAbortReasonTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAbortReasonTagged.java
@@ -38,18 +38,20 @@
 public class BACnetAbortReasonTagged implements Message {
 
   // Properties.
+  protected final long actualLength;
   protected final BACnetAbortReason value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Long actualLength;
-
   public BACnetAbortReasonTagged(
-      BACnetAbortReason value, long proprietaryValue, Long actualLength) {
+      long actualLength, BACnetAbortReason value, long proprietaryValue) {
     super();
+    this.actualLength = actualLength;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.actualLength = actualLength;
+  }
+
+  public long getActualLength() {
+    return actualLength;
   }
 
   public BACnetAbortReason getValue() {
@@ -146,7 +148,7 @@ public static BACnetAbortReasonTagged staticParse(ReadBuffer readBuffer, Long ac
     readBuffer.closeContext("BACnetAbortReasonTagged");
     // Create the instance
     BACnetAbortReasonTagged _bACnetAbortReasonTagged;
-    _bACnetAbortReasonTagged = new BACnetAbortReasonTagged(value, proprietaryValue, actualLength);
+    _bACnetAbortReasonTagged = new BACnetAbortReasonTagged(actualLength, value, proprietaryValue);
     return _bACnetAbortReasonTagged;
   }
 
@@ -159,14 +161,15 @@ public boolean equals(Object o) {
       return false;
     }
     BACnetAbortReasonTagged that = (BACnetAbortReasonTagged) o;
-    return (getValue() == that.getValue())
+    return (getActualLength() == that.getActualLength())
+        && (getValue() == that.getValue())
         && (getProprietaryValue() == that.getProprietaryValue())
         && true;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(getValue(), getProprietaryValue());
+    return Objects.hash(getActualLength(), getValue(), getProprietaryValue());
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessAuthenticationFactorDisableTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessAuthenticationFactorDisableTagged.java
index 22d2dcc3250..addfc4417a4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessAuthenticationFactorDisableTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessAuthenticationFactorDisableTagged.java
@@ -42,22 +42,14 @@ public class BACnetAccessAuthenticationFactorDisableTagged implements Message {
   protected final BACnetAccessAuthenticationFactorDisable value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetAccessAuthenticationFactorDisableTagged(
       BACnetTagHeader header,
       BACnetAccessAuthenticationFactorDisable value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -182,8 +174,7 @@ public static BACnetAccessAuthenticationFactorDisableTagged staticParse(
     // Create the instance
     BACnetAccessAuthenticationFactorDisableTagged _bACnetAccessAuthenticationFactorDisableTagged;
     _bACnetAccessAuthenticationFactorDisableTagged =
-        new BACnetAccessAuthenticationFactorDisableTagged(
-            header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetAccessAuthenticationFactorDisableTagged(header, value, proprietaryValue);
     return _bACnetAccessAuthenticationFactorDisableTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessCredentialDisableReasonTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessCredentialDisableReasonTagged.java
index fb71e21d3b7..b093eb3224c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessCredentialDisableReasonTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessCredentialDisableReasonTagged.java
@@ -42,22 +42,12 @@ public class BACnetAccessCredentialDisableReasonTagged implements Message {
   protected final BACnetAccessCredentialDisableReason value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetAccessCredentialDisableReasonTagged(
-      BACnetTagHeader header,
-      BACnetAccessCredentialDisableReason value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetAccessCredentialDisableReason value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -182,8 +172,7 @@ public static BACnetAccessCredentialDisableReasonTagged staticParse(
     // Create the instance
     BACnetAccessCredentialDisableReasonTagged _bACnetAccessCredentialDisableReasonTagged;
     _bACnetAccessCredentialDisableReasonTagged =
-        new BACnetAccessCredentialDisableReasonTagged(
-            header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetAccessCredentialDisableReasonTagged(header, value, proprietaryValue);
     return _bACnetAccessCredentialDisableReasonTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessCredentialDisableTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessCredentialDisableTagged.java
index a9793538fb0..b5e3e1529d1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessCredentialDisableTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessCredentialDisableTagged.java
@@ -42,22 +42,12 @@ public class BACnetAccessCredentialDisableTagged implements Message {
   protected final BACnetAccessCredentialDisable value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetAccessCredentialDisableTagged(
-      BACnetTagHeader header,
-      BACnetAccessCredentialDisable value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetAccessCredentialDisable value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -181,8 +171,7 @@ public static BACnetAccessCredentialDisableTagged staticParse(
     // Create the instance
     BACnetAccessCredentialDisableTagged _bACnetAccessCredentialDisableTagged;
     _bACnetAccessCredentialDisableTagged =
-        new BACnetAccessCredentialDisableTagged(
-            header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetAccessCredentialDisableTagged(header, value, proprietaryValue);
     return _bACnetAccessCredentialDisableTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessEventTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessEventTagged.java
index 1da9cbe14b9..93bc0d1efec 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessEventTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessEventTagged.java
@@ -42,22 +42,12 @@ public class BACnetAccessEventTagged implements Message {
   protected final BACnetAccessEvent value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetAccessEventTagged(
-      BACnetTagHeader header,
-      BACnetAccessEvent value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetAccessEvent value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetAccessEventTagged staticParse(
     readBuffer.closeContext("BACnetAccessEventTagged");
     // Create the instance
     BACnetAccessEventTagged _bACnetAccessEventTagged;
-    _bACnetAccessEventTagged =
-        new BACnetAccessEventTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetAccessEventTagged = new BACnetAccessEventTagged(header, value, proprietaryValue);
     return _bACnetAccessEventTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessPassbackModeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessPassbackModeTagged.java
index c9e2db9d328..f9421d6c55b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessPassbackModeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessPassbackModeTagged.java
@@ -41,17 +41,10 @@ public class BACnetAccessPassbackModeTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetAccessPassbackMode value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetAccessPassbackModeTagged(
-      BACnetTagHeader header, BACnetAccessPassbackMode value, Short tagNumber, TagClass tagClass) {
+  public BACnetAccessPassbackModeTagged(BACnetTagHeader header, BACnetAccessPassbackMode value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -135,8 +128,7 @@ public static BACnetAccessPassbackModeTagged staticParse(
     readBuffer.closeContext("BACnetAccessPassbackModeTagged");
     // Create the instance
     BACnetAccessPassbackModeTagged _bACnetAccessPassbackModeTagged;
-    _bACnetAccessPassbackModeTagged =
-        new BACnetAccessPassbackModeTagged(header, value, tagNumber, tagClass);
+    _bACnetAccessPassbackModeTagged = new BACnetAccessPassbackModeTagged(header, value);
     return _bACnetAccessPassbackModeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessRule.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessRule.java
index b47c10e35d1..84e07089ed3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessRule.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessRule.java
@@ -87,15 +87,13 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     writeSimpleField("timeRangeSpecifier", timeRangeSpecifier, writeComplex(writeBuffer));
 
     // Optional Field (timeRange) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "timeRange", timeRange, writeComplex(writeBuffer), (getTimeRangeSpecifier()) != (null));
+    writeOptionalField("timeRange", timeRange, writeComplex(writeBuffer));
 
     // Simple Field (locationSpecifier)
     writeSimpleField("locationSpecifier", locationSpecifier, writeComplex(writeBuffer));
 
     // Optional Field (location) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "location", location, writeComplex(writeBuffer), (getLocationSpecifier()) != (null));
+    writeOptionalField("location", location, writeComplex(writeBuffer));
 
     // Simple Field (enable)
     writeSimpleField("enable", enable, writeComplex(writeBuffer));
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessRuleLocationSpecifierTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessRuleLocationSpecifierTagged.java
index 351e3da8e15..c85c9d4ff88 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessRuleLocationSpecifierTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessRuleLocationSpecifierTagged.java
@@ -41,20 +41,11 @@ public class BACnetAccessRuleLocationSpecifierTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetAccessRuleLocationSpecifier value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetAccessRuleLocationSpecifierTagged(
-      BACnetTagHeader header,
-      BACnetAccessRuleLocationSpecifier value,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetAccessRuleLocationSpecifier value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -139,7 +130,7 @@ public static BACnetAccessRuleLocationSpecifierTagged staticParse(
     // Create the instance
     BACnetAccessRuleLocationSpecifierTagged _bACnetAccessRuleLocationSpecifierTagged;
     _bACnetAccessRuleLocationSpecifierTagged =
-        new BACnetAccessRuleLocationSpecifierTagged(header, value, tagNumber, tagClass);
+        new BACnetAccessRuleLocationSpecifierTagged(header, value);
     return _bACnetAccessRuleLocationSpecifierTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessRuleTimeRangeSpecifierTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessRuleTimeRangeSpecifierTagged.java
index 0a1cc286f5e..ca55d7a6a1e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessRuleTimeRangeSpecifierTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessRuleTimeRangeSpecifierTagged.java
@@ -41,20 +41,11 @@ public class BACnetAccessRuleTimeRangeSpecifierTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetAccessRuleTimeRangeSpecifier value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetAccessRuleTimeRangeSpecifierTagged(
-      BACnetTagHeader header,
-      BACnetAccessRuleTimeRangeSpecifier value,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetAccessRuleTimeRangeSpecifier value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -139,7 +130,7 @@ public static BACnetAccessRuleTimeRangeSpecifierTagged staticParse(
     // Create the instance
     BACnetAccessRuleTimeRangeSpecifierTagged _bACnetAccessRuleTimeRangeSpecifierTagged;
     _bACnetAccessRuleTimeRangeSpecifierTagged =
-        new BACnetAccessRuleTimeRangeSpecifierTagged(header, value, tagNumber, tagClass);
+        new BACnetAccessRuleTimeRangeSpecifierTagged(header, value);
     return _bACnetAccessRuleTimeRangeSpecifierTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessUserTypeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessUserTypeTagged.java
index 94008cd8087..de085dc01a1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessUserTypeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessUserTypeTagged.java
@@ -42,22 +42,12 @@ public class BACnetAccessUserTypeTagged implements Message {
   protected final BACnetAccessUserType value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetAccessUserTypeTagged(
-      BACnetTagHeader header,
-      BACnetAccessUserType value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetAccessUserType value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetAccessUserTypeTagged staticParse(
     readBuffer.closeContext("BACnetAccessUserTypeTagged");
     // Create the instance
     BACnetAccessUserTypeTagged _bACnetAccessUserTypeTagged;
-    _bACnetAccessUserTypeTagged =
-        new BACnetAccessUserTypeTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetAccessUserTypeTagged = new BACnetAccessUserTypeTagged(header, value, proprietaryValue);
     return _bACnetAccessUserTypeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessZoneOccupancyStateTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessZoneOccupancyStateTagged.java
index 3e5013aaf54..295eefd52d1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessZoneOccupancyStateTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccessZoneOccupancyStateTagged.java
@@ -42,22 +42,12 @@ public class BACnetAccessZoneOccupancyStateTagged implements Message {
   protected final BACnetAccessZoneOccupancyState value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetAccessZoneOccupancyStateTagged(
-      BACnetTagHeader header,
-      BACnetAccessZoneOccupancyState value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetAccessZoneOccupancyState value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -181,8 +171,7 @@ public static BACnetAccessZoneOccupancyStateTagged staticParse(
     // Create the instance
     BACnetAccessZoneOccupancyStateTagged _bACnetAccessZoneOccupancyStateTagged;
     _bACnetAccessZoneOccupancyStateTagged =
-        new BACnetAccessZoneOccupancyStateTagged(
-            header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetAccessZoneOccupancyStateTagged(header, value, proprietaryValue);
     return _bACnetAccessZoneOccupancyStateTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccumulatorRecordAccumulatorStatusTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccumulatorRecordAccumulatorStatusTagged.java
index ae11c47ce01..61295ccbe43 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccumulatorRecordAccumulatorStatusTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAccumulatorRecordAccumulatorStatusTagged.java
@@ -41,20 +41,11 @@ public class BACnetAccumulatorRecordAccumulatorStatusTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetAccumulatorRecordAccumulatorStatus value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetAccumulatorRecordAccumulatorStatusTagged(
-      BACnetTagHeader header,
-      BACnetAccumulatorRecordAccumulatorStatus value,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetAccumulatorRecordAccumulatorStatus value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -139,7 +130,7 @@ public static BACnetAccumulatorRecordAccumulatorStatusTagged staticParse(
     // Create the instance
     BACnetAccumulatorRecordAccumulatorStatusTagged _bACnetAccumulatorRecordAccumulatorStatusTagged;
     _bACnetAccumulatorRecordAccumulatorStatusTagged =
-        new BACnetAccumulatorRecordAccumulatorStatusTagged(header, value, tagNumber, tagClass);
+        new BACnetAccumulatorRecordAccumulatorStatusTagged(header, value);
     return _bACnetAccumulatorRecordAccumulatorStatusTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetActionTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetActionTagged.java
index b27074428c5..fa86ad55162 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetActionTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetActionTagged.java
@@ -41,17 +41,10 @@ public class BACnetActionTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetAction value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetActionTagged(
-      BACnetTagHeader header, BACnetAction value, Short tagNumber, TagClass tagClass) {
+  public BACnetActionTagged(BACnetTagHeader header, BACnetAction value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetActionTagged staticParse(
     readBuffer.closeContext("BACnetActionTagged");
     // Create the instance
     BACnetActionTagged _bACnetActionTagged;
-    _bACnetActionTagged = new BACnetActionTagged(header, value, tagNumber, tagClass);
+    _bACnetActionTagged = new BACnetActionTagged(header, value);
     return _bACnetActionTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAddressEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAddressEnclosed.java
index d926a67addf..d66853e15e9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAddressEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAddressEnclosed.java
@@ -42,19 +42,12 @@ public class BACnetAddressEnclosed implements Message {
   protected final BACnetAddress address;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetAddressEnclosed(
-      BACnetOpeningTag openingTag,
-      BACnetAddress address,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetAddress address, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.address = address;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -134,7 +127,7 @@ public static BACnetAddressEnclosed staticParse(ReadBuffer readBuffer, Short tag
     readBuffer.closeContext("BACnetAddressEnclosed");
     // Create the instance
     BACnetAddressEnclosed _bACnetAddressEnclosed;
-    _bACnetAddressEnclosed = new BACnetAddressEnclosed(openingTag, address, closingTag, tagNumber);
+    _bACnetAddressEnclosed = new BACnetAddressEnclosed(openingTag, address, closingTag);
     return _bACnetAddressEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAssignedLandingCallsLandingCallsList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAssignedLandingCallsLandingCallsList.java
index abc67557f53..acdd7c4c33d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAssignedLandingCallsLandingCallsList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAssignedLandingCallsLandingCallsList.java
@@ -42,19 +42,14 @@ public class BACnetAssignedLandingCallsLandingCallsList implements Message {
   protected final List<BACnetAssignedLandingCallsLandingCallsListEntry> landingCalls;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetAssignedLandingCallsLandingCallsList(
       BACnetOpeningTag openingTag,
       List<BACnetAssignedLandingCallsLandingCallsListEntry> landingCalls,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.landingCalls = landingCalls;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -146,8 +141,7 @@ public static BACnetAssignedLandingCallsLandingCallsList staticParse(
     // Create the instance
     BACnetAssignedLandingCallsLandingCallsList _bACnetAssignedLandingCallsLandingCallsList;
     _bACnetAssignedLandingCallsLandingCallsList =
-        new BACnetAssignedLandingCallsLandingCallsList(
-            openingTag, landingCalls, closingTag, tagNumber);
+        new BACnetAssignedLandingCallsLandingCallsList(openingTag, landingCalls, closingTag);
     return _bACnetAssignedLandingCallsLandingCallsList;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationFactorEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationFactorEnclosed.java
index 6927a227058..6f246056b2d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationFactorEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationFactorEnclosed.java
@@ -42,19 +42,14 @@ public class BACnetAuthenticationFactorEnclosed implements Message {
   protected final BACnetAuthenticationFactor authenticationFactor;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetAuthenticationFactorEnclosed(
       BACnetOpeningTag openingTag,
       BACnetAuthenticationFactor authenticationFactor,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.authenticationFactor = authenticationFactor;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -136,8 +131,7 @@ public static BACnetAuthenticationFactorEnclosed staticParse(
     // Create the instance
     BACnetAuthenticationFactorEnclosed _bACnetAuthenticationFactorEnclosed;
     _bACnetAuthenticationFactorEnclosed =
-        new BACnetAuthenticationFactorEnclosed(
-            openingTag, authenticationFactor, closingTag, tagNumber);
+        new BACnetAuthenticationFactorEnclosed(openingTag, authenticationFactor, closingTag);
     return _bACnetAuthenticationFactorEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationFactorTypeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationFactorTypeTagged.java
index 4a0e12df1f4..b8e8d9ebd93 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationFactorTypeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationFactorTypeTagged.java
@@ -41,20 +41,11 @@ public class BACnetAuthenticationFactorTypeTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetAuthenticationFactorType value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetAuthenticationFactorTypeTagged(
-      BACnetTagHeader header,
-      BACnetAuthenticationFactorType value,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetAuthenticationFactorType value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -138,8 +129,7 @@ public static BACnetAuthenticationFactorTypeTagged staticParse(
     readBuffer.closeContext("BACnetAuthenticationFactorTypeTagged");
     // Create the instance
     BACnetAuthenticationFactorTypeTagged _bACnetAuthenticationFactorTypeTagged;
-    _bACnetAuthenticationFactorTypeTagged =
-        new BACnetAuthenticationFactorTypeTagged(header, value, tagNumber, tagClass);
+    _bACnetAuthenticationFactorTypeTagged = new BACnetAuthenticationFactorTypeTagged(header, value);
     return _bACnetAuthenticationFactorTypeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationPolicyList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationPolicyList.java
index 7f2a0c4c8d9..e5461b7a531 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationPolicyList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationPolicyList.java
@@ -42,19 +42,14 @@ public class BACnetAuthenticationPolicyList implements Message {
   protected final List<BACnetAuthenticationPolicyListEntry> entries;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetAuthenticationPolicyList(
       BACnetOpeningTag openingTag,
       List<BACnetAuthenticationPolicyListEntry> entries,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.entries = entries;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -145,7 +140,7 @@ public static BACnetAuthenticationPolicyList staticParse(ReadBuffer readBuffer,
     // Create the instance
     BACnetAuthenticationPolicyList _bACnetAuthenticationPolicyList;
     _bACnetAuthenticationPolicyList =
-        new BACnetAuthenticationPolicyList(openingTag, entries, closingTag, tagNumber);
+        new BACnetAuthenticationPolicyList(openingTag, entries, closingTag);
     return _bACnetAuthenticationPolicyList;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationStatusTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationStatusTagged.java
index 1993d65ae35..4656c275437 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationStatusTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthenticationStatusTagged.java
@@ -41,20 +41,11 @@ public class BACnetAuthenticationStatusTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetAuthenticationStatus value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetAuthenticationStatusTagged(
-      BACnetTagHeader header,
-      BACnetAuthenticationStatus value,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetAuthenticationStatus value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -138,8 +129,7 @@ public static BACnetAuthenticationStatusTagged staticParse(
     readBuffer.closeContext("BACnetAuthenticationStatusTagged");
     // Create the instance
     BACnetAuthenticationStatusTagged _bACnetAuthenticationStatusTagged;
-    _bACnetAuthenticationStatusTagged =
-        new BACnetAuthenticationStatusTagged(header, value, tagNumber, tagClass);
+    _bACnetAuthenticationStatusTagged = new BACnetAuthenticationStatusTagged(header, value);
     return _bACnetAuthenticationStatusTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthorizationExemptionTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthorizationExemptionTagged.java
index a63481eb89b..24b9f1e96e0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthorizationExemptionTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthorizationExemptionTagged.java
@@ -42,22 +42,12 @@ public class BACnetAuthorizationExemptionTagged implements Message {
   protected final BACnetAuthorizationExemption value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetAuthorizationExemptionTagged(
-      BACnetTagHeader header,
-      BACnetAuthorizationExemption value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetAuthorizationExemption value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -181,8 +171,7 @@ public static BACnetAuthorizationExemptionTagged staticParse(
     // Create the instance
     BACnetAuthorizationExemptionTagged _bACnetAuthorizationExemptionTagged;
     _bACnetAuthorizationExemptionTagged =
-        new BACnetAuthorizationExemptionTagged(
-            header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetAuthorizationExemptionTagged(header, value, proprietaryValue);
     return _bACnetAuthorizationExemptionTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthorizationModeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthorizationModeTagged.java
index 2119801db23..5437d6a767d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthorizationModeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetAuthorizationModeTagged.java
@@ -42,22 +42,12 @@ public class BACnetAuthorizationModeTagged implements Message {
   protected final BACnetAuthorizationMode value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetAuthorizationModeTagged(
-      BACnetTagHeader header,
-      BACnetAuthorizationMode value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetAuthorizationMode value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -181,7 +171,7 @@ public static BACnetAuthorizationModeTagged staticParse(
     // Create the instance
     BACnetAuthorizationModeTagged _bACnetAuthorizationModeTagged;
     _bACnetAuthorizationModeTagged =
-        new BACnetAuthorizationModeTagged(header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetAuthorizationModeTagged(header, value, proprietaryValue);
     return _bACnetAuthorizationModeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetBackupStateTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetBackupStateTagged.java
index aceebecc473..bd06446615b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetBackupStateTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetBackupStateTagged.java
@@ -41,17 +41,10 @@ public class BACnetBackupStateTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetBackupState value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetBackupStateTagged(
-      BACnetTagHeader header, BACnetBackupState value, Short tagNumber, TagClass tagClass) {
+  public BACnetBackupStateTagged(BACnetTagHeader header, BACnetBackupState value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetBackupStateTagged staticParse(
     readBuffer.closeContext("BACnetBackupStateTagged");
     // Create the instance
     BACnetBackupStateTagged _bACnetBackupStateTagged;
-    _bACnetBackupStateTagged = new BACnetBackupStateTagged(header, value, tagNumber, tagClass);
+    _bACnetBackupStateTagged = new BACnetBackupStateTagged(header, value);
     return _bACnetBackupStateTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetBinaryLightingPVTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetBinaryLightingPVTagged.java
index a0501be3d0a..58a510a896d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetBinaryLightingPVTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetBinaryLightingPVTagged.java
@@ -42,22 +42,12 @@ public class BACnetBinaryLightingPVTagged implements Message {
   protected final BACnetBinaryLightingPV value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetBinaryLightingPVTagged(
-      BACnetTagHeader header,
-      BACnetBinaryLightingPV value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetBinaryLightingPV value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -181,7 +171,7 @@ public static BACnetBinaryLightingPVTagged staticParse(
     // Create the instance
     BACnetBinaryLightingPVTagged _bACnetBinaryLightingPVTagged;
     _bACnetBinaryLightingPVTagged =
-        new BACnetBinaryLightingPVTagged(header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetBinaryLightingPVTagged(header, value, proprietaryValue);
     return _bACnetBinaryLightingPVTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetBinaryPVTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetBinaryPVTagged.java
index 538060640b7..d76a6a27384 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetBinaryPVTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetBinaryPVTagged.java
@@ -41,17 +41,10 @@ public class BACnetBinaryPVTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetBinaryPV value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetBinaryPVTagged(
-      BACnetTagHeader header, BACnetBinaryPV value, Short tagNumber, TagClass tagClass) {
+  public BACnetBinaryPVTagged(BACnetTagHeader header, BACnetBinaryPV value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetBinaryPVTagged staticParse(
     readBuffer.closeContext("BACnetBinaryPVTagged");
     // Create the instance
     BACnetBinaryPVTagged _bACnetBinaryPVTagged;
-    _bACnetBinaryPVTagged = new BACnetBinaryPVTagged(header, value, tagNumber, tagClass);
+    _bACnetBinaryPVTagged = new BACnetBinaryPVTagged(header, value);
     return _bACnetBinaryPVTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification.java
index e3abc7e229b..5c7daba34e7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification.java
@@ -43,20 +43,15 @@ public class BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification imp
       listOfCovSubscriptionSpecificationEntry;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification(
       BACnetOpeningTag openingTag,
       List<BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry>
           listOfCovSubscriptionSpecificationEntry,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listOfCovSubscriptionSpecificationEntry = listOfCovSubscriptionSpecificationEntry;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -157,7 +152,7 @@ public static BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification st
         _bACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification;
     _bACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification =
         new BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification(
-            openingTag, listOfCovSubscriptionSpecificationEntry, closingTag, tagNumber);
+            openingTag, listOfCovSubscriptionSpecificationEntry, closingTag);
     return _bACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences.java
index df0e337ccfb..6e7b5fcea90 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences.java
@@ -45,21 +45,16 @@ public class BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntr
       listOfCovReferences;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences(
       BACnetOpeningTag openingTag,
       List<
               BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry>
           listOfCovReferences,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listOfCovReferences = listOfCovReferences;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -165,7 +160,7 @@ public int getLengthInBits() {
         _bACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences;
     _bACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences =
         new BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences(
-            openingTag, listOfCovReferences, closingTag, tagNumber);
+            openingTag, listOfCovReferences, closingTag);
     return _bACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryEnclosed.java
index 84c0eb5294e..68d42d94c8e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryEnclosed.java
@@ -42,19 +42,12 @@ public class BACnetCalendarEntryEnclosed implements Message {
   protected final BACnetCalendarEntry calendarEntry;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetCalendarEntryEnclosed(
-      BACnetOpeningTag openingTag,
-      BACnetCalendarEntry calendarEntry,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetCalendarEntry calendarEntry, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.calendarEntry = calendarEntry;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -136,7 +129,7 @@ public static BACnetCalendarEntryEnclosed staticParse(ReadBuffer readBuffer, Sho
     // Create the instance
     BACnetCalendarEntryEnclosed _bACnetCalendarEntryEnclosed;
     _bACnetCalendarEntryEnclosed =
-        new BACnetCalendarEntryEnclosed(openingTag, calendarEntry, closingTag, tagNumber);
+        new BACnetCalendarEntryEnclosed(openingTag, calendarEntry, closingTag);
     return _bACnetCalendarEntryEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetClosingTag.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetClosingTag.java
index 7bbd3f2a3c2..8668cbdae41 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetClosingTag.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetClosingTag.java
@@ -40,13 +40,9 @@ public class BACnetClosingTag implements Message {
   // Properties.
   protected final BACnetTagHeader header;
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
-  public BACnetClosingTag(BACnetTagHeader header, Short tagNumberArgument) {
+  public BACnetClosingTag(BACnetTagHeader header) {
     super();
     this.header = header;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public BACnetTagHeader getHeader() {
@@ -106,7 +102,7 @@ public static BACnetClosingTag staticParse(ReadBuffer readBuffer, Short tagNumbe
     readBuffer.closeContext("BACnetClosingTag");
     // Create the instance
     BACnetClosingTag _bACnetClosingTag;
-    _bACnetClosingTag = new BACnetClosingTag(header, tagNumberArgument);
+    _bACnetClosingTag = new BACnetClosingTag(header);
     return _bACnetClosingTag;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequest.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequest.java
index b7340ac84bd..843de62178f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequest.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequest.java
@@ -40,14 +40,18 @@ public abstract class BACnetConfirmedServiceRequest implements Message {
   // Abstract accessors for discriminator values.
   public abstract BACnetConfirmedServiceChoice getServiceChoice();
 
-  // Arguments.
-  protected final Long serviceRequestLength;
+  // Properties.
+  protected final long serviceRequestLength;
 
-  public BACnetConfirmedServiceRequest(Long serviceRequestLength) {
+  public BACnetConfirmedServiceRequest(long serviceRequestLength) {
     super();
     this.serviceRequestLength = serviceRequestLength;
   }
 
+  public long getServiceRequestLength() {
+    return serviceRequestLength;
+  }
+
   public long getServiceRequestPayloadLength() {
     return (long) (((((serviceRequestLength) > (0))) ? ((serviceRequestLength) - (1L)) : 0L));
   }
@@ -285,12 +289,11 @@ public static BACnetConfirmedServiceRequest staticParse(
     // Create the instance
     BACnetConfirmedServiceRequest _bACnetConfirmedServiceRequest =
         builder.build(serviceRequestLength);
-
     return _bACnetConfirmedServiceRequest;
   }
 
   public interface BACnetConfirmedServiceRequestBuilder {
-    BACnetConfirmedServiceRequest build(Long serviceRequestLength);
+    BACnetConfirmedServiceRequest build(long serviceRequestLength);
   }
 
   @Override
@@ -302,12 +305,12 @@ public boolean equals(Object o) {
       return false;
     }
     BACnetConfirmedServiceRequest that = (BACnetConfirmedServiceRequest) o;
-    return true;
+    return (getServiceRequestLength() == that.getServiceRequestLength()) && true;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash();
+    return Objects.hash(getServiceRequestLength());
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAcknowledgeAlarm.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAcknowledgeAlarm.java
index 2dcf17a9954..5ce763fb6c9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAcknowledgeAlarm.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAcknowledgeAlarm.java
@@ -51,17 +51,14 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetContextTagCharacterString acknowledgmentSource;
   protected final BACnetTimeStampEnclosed timeOfAcknowledgment;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestAcknowledgeAlarm(
+      long serviceRequestLength,
       BACnetContextTagUnsignedInteger acknowledgingProcessIdentifier,
       BACnetContextTagObjectIdentifier eventObjectIdentifier,
       BACnetEventStateTagged eventStateAcknowledged,
       BACnetTimeStampEnclosed timestamp,
       BACnetContextTagCharacterString acknowledgmentSource,
-      BACnetTimeStampEnclosed timeOfAcknowledgment,
-      Long serviceRequestLength) {
+      BACnetTimeStampEnclosed timeOfAcknowledgment) {
     super(serviceRequestLength);
     this.acknowledgingProcessIdentifier = acknowledgingProcessIdentifier;
     this.eventObjectIdentifier = eventObjectIdentifier;
@@ -69,7 +66,6 @@ public BACnetConfirmedServiceRequestAcknowledgeAlarm(
     this.timestamp = timestamp;
     this.acknowledgmentSource = acknowledgmentSource;
     this.timeOfAcknowledgment = timeOfAcknowledgment;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagUnsignedInteger getAcknowledgingProcessIdentifier() {
@@ -231,8 +227,7 @@ public int getLengthInBits() {
         eventStateAcknowledged,
         timestamp,
         acknowledgmentSource,
-        timeOfAcknowledgment,
-        serviceRequestLength);
+        timeOfAcknowledgment);
   }
 
   public static class BACnetConfirmedServiceRequestAcknowledgeAlarmBuilderImpl
@@ -243,7 +238,6 @@ public static class BACnetConfirmedServiceRequestAcknowledgeAlarmBuilderImpl
     private final BACnetTimeStampEnclosed timestamp;
     private final BACnetContextTagCharacterString acknowledgmentSource;
     private final BACnetTimeStampEnclosed timeOfAcknowledgment;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestAcknowledgeAlarmBuilderImpl(
         BACnetContextTagUnsignedInteger acknowledgingProcessIdentifier,
@@ -251,28 +245,25 @@ public BACnetConfirmedServiceRequestAcknowledgeAlarmBuilderImpl(
         BACnetEventStateTagged eventStateAcknowledged,
         BACnetTimeStampEnclosed timestamp,
         BACnetContextTagCharacterString acknowledgmentSource,
-        BACnetTimeStampEnclosed timeOfAcknowledgment,
-        Long serviceRequestLength) {
+        BACnetTimeStampEnclosed timeOfAcknowledgment) {
       this.acknowledgingProcessIdentifier = acknowledgingProcessIdentifier;
       this.eventObjectIdentifier = eventObjectIdentifier;
       this.eventStateAcknowledged = eventStateAcknowledged;
       this.timestamp = timestamp;
       this.acknowledgmentSource = acknowledgmentSource;
       this.timeOfAcknowledgment = timeOfAcknowledgment;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestAcknowledgeAlarm build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestAcknowledgeAlarm build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestAcknowledgeAlarm bACnetConfirmedServiceRequestAcknowledgeAlarm =
           new BACnetConfirmedServiceRequestAcknowledgeAlarm(
+              serviceRequestLength,
               acknowledgingProcessIdentifier,
               eventObjectIdentifier,
               eventStateAcknowledged,
               timestamp,
               acknowledgmentSource,
-              timeOfAcknowledgment,
-              serviceRequestLength);
+              timeOfAcknowledgment);
       return bACnetConfirmedServiceRequestAcknowledgeAlarm;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAddListElement.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAddListElement.java
index a51dbe20d52..ba89f0f8467 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAddListElement.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAddListElement.java
@@ -49,21 +49,17 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetContextTagUnsignedInteger arrayIndex;
   protected final BACnetConstructedData listOfElements;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestAddListElement(
+      long serviceRequestLength,
       BACnetContextTagObjectIdentifier objectIdentifier,
       BACnetPropertyIdentifierTagged propertyIdentifier,
       BACnetContextTagUnsignedInteger arrayIndex,
-      BACnetConstructedData listOfElements,
-      Long serviceRequestLength) {
+      BACnetConstructedData listOfElements) {
     super(serviceRequestLength);
     this.objectIdentifier = objectIdentifier;
     this.propertyIdentifier = propertyIdentifier;
     this.arrayIndex = arrayIndex;
     this.listOfElements = listOfElements;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagObjectIdentifier getObjectIdentifier() {
@@ -191,7 +187,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestAddListElement");
     // Create the instance
     return new BACnetConfirmedServiceRequestAddListElementBuilderImpl(
-        objectIdentifier, propertyIdentifier, arrayIndex, listOfElements, serviceRequestLength);
+        objectIdentifier, propertyIdentifier, arrayIndex, listOfElements);
   }
 
   public static class BACnetConfirmedServiceRequestAddListElementBuilderImpl
@@ -200,30 +196,26 @@ public static class BACnetConfirmedServiceRequestAddListElementBuilderImpl
     private final BACnetPropertyIdentifierTagged propertyIdentifier;
     private final BACnetContextTagUnsignedInteger arrayIndex;
     private final BACnetConstructedData listOfElements;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestAddListElementBuilderImpl(
         BACnetContextTagObjectIdentifier objectIdentifier,
         BACnetPropertyIdentifierTagged propertyIdentifier,
         BACnetContextTagUnsignedInteger arrayIndex,
-        BACnetConstructedData listOfElements,
-        Long serviceRequestLength) {
+        BACnetConstructedData listOfElements) {
       this.objectIdentifier = objectIdentifier;
       this.propertyIdentifier = propertyIdentifier;
       this.arrayIndex = arrayIndex;
       this.listOfElements = listOfElements;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestAddListElement build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestAddListElement build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestAddListElement bACnetConfirmedServiceRequestAddListElement =
           new BACnetConfirmedServiceRequestAddListElement(
+              serviceRequestLength,
               objectIdentifier,
               propertyIdentifier,
               arrayIndex,
-              listOfElements,
-              serviceRequestLength);
+              listOfElements);
       return bACnetConfirmedServiceRequestAddListElement;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFile.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFile.java
index a1ca4884568..e15b548c30b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFile.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFile.java
@@ -47,17 +47,13 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetApplicationTagObjectIdentifier fileIdentifier;
   protected final BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord accessMethod;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestAtomicReadFile(
+      long serviceRequestLength,
       BACnetApplicationTagObjectIdentifier fileIdentifier,
-      BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord accessMethod,
-      Long serviceRequestLength) {
+      BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord accessMethod) {
     super(serviceRequestLength);
     this.fileIdentifier = fileIdentifier;
     this.accessMethod = accessMethod;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetApplicationTagObjectIdentifier getFileIdentifier() {
@@ -131,30 +127,25 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetConfirmedServiceRequestAtomicReadFile");
     // Create the instance
-    return new BACnetConfirmedServiceRequestAtomicReadFileBuilderImpl(
-        fileIdentifier, accessMethod, serviceRequestLength);
+    return new BACnetConfirmedServiceRequestAtomicReadFileBuilderImpl(fileIdentifier, accessMethod);
   }
 
   public static class BACnetConfirmedServiceRequestAtomicReadFileBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final BACnetApplicationTagObjectIdentifier fileIdentifier;
     private final BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord accessMethod;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestAtomicReadFileBuilderImpl(
         BACnetApplicationTagObjectIdentifier fileIdentifier,
-        BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord accessMethod,
-        Long serviceRequestLength) {
+        BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord accessMethod) {
       this.fileIdentifier = fileIdentifier;
       this.accessMethod = accessMethod;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestAtomicReadFile build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestAtomicReadFile build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestAtomicReadFile bACnetConfirmedServiceRequestAtomicReadFile =
           new BACnetConfirmedServiceRequestAtomicReadFile(
-              fileIdentifier, accessMethod, serviceRequestLength);
+              serviceRequestLength, fileIdentifier, accessMethod);
       return bACnetConfirmedServiceRequestAtomicReadFile;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicWriteFile.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicWriteFile.java
index 3ed791e3548..a49c3e75b82 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicWriteFile.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicWriteFile.java
@@ -50,23 +50,19 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetApplicationTagOctetString fileData;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestAtomicWriteFile(
+      long serviceRequestLength,
       BACnetApplicationTagObjectIdentifier deviceIdentifier,
       BACnetOpeningTag openingTag,
       BACnetApplicationTagSignedInteger fileStartPosition,
       BACnetApplicationTagOctetString fileData,
-      BACnetClosingTag closingTag,
-      Long serviceRequestLength) {
+      BACnetClosingTag closingTag) {
     super(serviceRequestLength);
     this.deviceIdentifier = deviceIdentifier;
     this.openingTag = openingTag;
     this.fileStartPosition = fileStartPosition;
     this.fileData = fileData;
     this.closingTag = closingTag;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetApplicationTagObjectIdentifier getDeviceIdentifier() {
@@ -193,12 +189,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestAtomicWriteFile");
     // Create the instance
     return new BACnetConfirmedServiceRequestAtomicWriteFileBuilderImpl(
-        deviceIdentifier,
-        openingTag,
-        fileStartPosition,
-        fileData,
-        closingTag,
-        serviceRequestLength);
+        deviceIdentifier, openingTag, fileStartPosition, fileData, closingTag);
   }
 
   public static class BACnetConfirmedServiceRequestAtomicWriteFileBuilderImpl
@@ -208,33 +199,29 @@ public static class BACnetConfirmedServiceRequestAtomicWriteFileBuilderImpl
     private final BACnetApplicationTagSignedInteger fileStartPosition;
     private final BACnetApplicationTagOctetString fileData;
     private final BACnetClosingTag closingTag;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestAtomicWriteFileBuilderImpl(
         BACnetApplicationTagObjectIdentifier deviceIdentifier,
         BACnetOpeningTag openingTag,
         BACnetApplicationTagSignedInteger fileStartPosition,
         BACnetApplicationTagOctetString fileData,
-        BACnetClosingTag closingTag,
-        Long serviceRequestLength) {
+        BACnetClosingTag closingTag) {
       this.deviceIdentifier = deviceIdentifier;
       this.openingTag = openingTag;
       this.fileStartPosition = fileStartPosition;
       this.fileData = fileData;
       this.closingTag = closingTag;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestAtomicWriteFile build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestAtomicWriteFile build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestAtomicWriteFile bACnetConfirmedServiceRequestAtomicWriteFile =
           new BACnetConfirmedServiceRequestAtomicWriteFile(
+              serviceRequestLength,
               deviceIdentifier,
               openingTag,
               fileStartPosition,
               fileData,
-              closingTag,
-              serviceRequestLength);
+              closingTag);
       return bACnetConfirmedServiceRequestAtomicWriteFile;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAuthenticate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAuthenticate.java
index 6eb1ebf3516..58f3c9877c4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAuthenticate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAuthenticate.java
@@ -46,16 +46,10 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final byte[] bytesOfRemovedService;
 
-  // Arguments.
-  protected final Long serviceRequestPayloadLength;
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestAuthenticate(
-      byte[] bytesOfRemovedService, Long serviceRequestPayloadLength, Long serviceRequestLength) {
+      long serviceRequestLength, byte[] bytesOfRemovedService) {
     super(serviceRequestLength);
     this.bytesOfRemovedService = bytesOfRemovedService;
-    this.serviceRequestPayloadLength = serviceRequestPayloadLength;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public byte[] getBytesOfRemovedService() {
@@ -109,28 +103,21 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetConfirmedServiceRequestAuthenticate");
     // Create the instance
-    return new BACnetConfirmedServiceRequestAuthenticateBuilderImpl(
-        bytesOfRemovedService, serviceRequestPayloadLength, serviceRequestLength);
+    return new BACnetConfirmedServiceRequestAuthenticateBuilderImpl(bytesOfRemovedService);
   }
 
   public static class BACnetConfirmedServiceRequestAuthenticateBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final byte[] bytesOfRemovedService;
-    private final Long serviceRequestPayloadLength;
-    private final Long serviceRequestLength;
 
-    public BACnetConfirmedServiceRequestAuthenticateBuilderImpl(
-        byte[] bytesOfRemovedService, Long serviceRequestPayloadLength, Long serviceRequestLength) {
+    public BACnetConfirmedServiceRequestAuthenticateBuilderImpl(byte[] bytesOfRemovedService) {
       this.bytesOfRemovedService = bytesOfRemovedService;
-      this.serviceRequestPayloadLength = serviceRequestPayloadLength;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestAuthenticate build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestAuthenticate build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestAuthenticate bACnetConfirmedServiceRequestAuthenticate =
           new BACnetConfirmedServiceRequestAuthenticate(
-              bytesOfRemovedService, serviceRequestPayloadLength, serviceRequestLength);
+              serviceRequestLength, bytesOfRemovedService);
       return bACnetConfirmedServiceRequestAuthenticate;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotification.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotification.java
index 74903f962de..08b091ebd8f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotification.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotification.java
@@ -50,23 +50,19 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetContextTagUnsignedInteger lifetimeInSeconds;
   protected final BACnetPropertyValues listOfValues;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestConfirmedCOVNotification(
+      long serviceRequestLength,
       BACnetContextTagUnsignedInteger subscriberProcessIdentifier,
       BACnetContextTagObjectIdentifier initiatingDeviceIdentifier,
       BACnetContextTagObjectIdentifier monitoredObjectIdentifier,
       BACnetContextTagUnsignedInteger lifetimeInSeconds,
-      BACnetPropertyValues listOfValues,
-      Long serviceRequestLength) {
+      BACnetPropertyValues listOfValues) {
     super(serviceRequestLength);
     this.subscriberProcessIdentifier = subscriberProcessIdentifier;
     this.initiatingDeviceIdentifier = initiatingDeviceIdentifier;
     this.monitoredObjectIdentifier = monitoredObjectIdentifier;
     this.lifetimeInSeconds = lifetimeInSeconds;
     this.listOfValues = listOfValues;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagUnsignedInteger getSubscriberProcessIdentifier() {
@@ -219,8 +215,7 @@ public int getLengthInBits() {
         initiatingDeviceIdentifier,
         monitoredObjectIdentifier,
         lifetimeInSeconds,
-        listOfValues,
-        serviceRequestLength);
+        listOfValues);
   }
 
   public static class BACnetConfirmedServiceRequestConfirmedCOVNotificationBuilderImpl
@@ -230,34 +225,30 @@ public static class BACnetConfirmedServiceRequestConfirmedCOVNotificationBuilder
     private final BACnetContextTagObjectIdentifier monitoredObjectIdentifier;
     private final BACnetContextTagUnsignedInteger lifetimeInSeconds;
     private final BACnetPropertyValues listOfValues;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestConfirmedCOVNotificationBuilderImpl(
         BACnetContextTagUnsignedInteger subscriberProcessIdentifier,
         BACnetContextTagObjectIdentifier initiatingDeviceIdentifier,
         BACnetContextTagObjectIdentifier monitoredObjectIdentifier,
         BACnetContextTagUnsignedInteger lifetimeInSeconds,
-        BACnetPropertyValues listOfValues,
-        Long serviceRequestLength) {
+        BACnetPropertyValues listOfValues) {
       this.subscriberProcessIdentifier = subscriberProcessIdentifier;
       this.initiatingDeviceIdentifier = initiatingDeviceIdentifier;
       this.monitoredObjectIdentifier = monitoredObjectIdentifier;
       this.lifetimeInSeconds = lifetimeInSeconds;
       this.listOfValues = listOfValues;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestConfirmedCOVNotification build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestConfirmedCOVNotification build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestConfirmedCOVNotification
           bACnetConfirmedServiceRequestConfirmedCOVNotification =
               new BACnetConfirmedServiceRequestConfirmedCOVNotification(
+                  serviceRequestLength,
                   subscriberProcessIdentifier,
                   initiatingDeviceIdentifier,
                   monitoredObjectIdentifier,
                   lifetimeInSeconds,
-                  listOfValues,
-                  serviceRequestLength);
+                  listOfValues);
       return bACnetConfirmedServiceRequestConfirmedCOVNotification;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.java
index 6a0a8eb5514..4432796a8b1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.java
@@ -50,23 +50,19 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetTimeStampEnclosed timestamp;
   protected final ListOfCovNotificationsList listOfCovNotifications;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple(
+      long serviceRequestLength,
       BACnetContextTagUnsignedInteger subscriberProcessIdentifier,
       BACnetContextTagObjectIdentifier initiatingDeviceIdentifier,
       BACnetContextTagUnsignedInteger timeRemaining,
       BACnetTimeStampEnclosed timestamp,
-      ListOfCovNotificationsList listOfCovNotifications,
-      Long serviceRequestLength) {
+      ListOfCovNotificationsList listOfCovNotifications) {
     super(serviceRequestLength);
     this.subscriberProcessIdentifier = subscriberProcessIdentifier;
     this.initiatingDeviceIdentifier = initiatingDeviceIdentifier;
     this.timeRemaining = timeRemaining;
     this.timestamp = timestamp;
     this.listOfCovNotifications = listOfCovNotifications;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagUnsignedInteger getSubscriberProcessIdentifier() {
@@ -209,8 +205,7 @@ public int getLengthInBits() {
         initiatingDeviceIdentifier,
         timeRemaining,
         timestamp,
-        listOfCovNotifications,
-        serviceRequestLength);
+        listOfCovNotifications);
   }
 
   public static class BACnetConfirmedServiceRequestConfirmedCOVNotificationMultipleBuilderImpl
@@ -220,34 +215,31 @@ public static class BACnetConfirmedServiceRequestConfirmedCOVNotificationMultipl
     private final BACnetContextTagUnsignedInteger timeRemaining;
     private final BACnetTimeStampEnclosed timestamp;
     private final ListOfCovNotificationsList listOfCovNotifications;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestConfirmedCOVNotificationMultipleBuilderImpl(
         BACnetContextTagUnsignedInteger subscriberProcessIdentifier,
         BACnetContextTagObjectIdentifier initiatingDeviceIdentifier,
         BACnetContextTagUnsignedInteger timeRemaining,
         BACnetTimeStampEnclosed timestamp,
-        ListOfCovNotificationsList listOfCovNotifications,
-        Long serviceRequestLength) {
+        ListOfCovNotificationsList listOfCovNotifications) {
       this.subscriberProcessIdentifier = subscriberProcessIdentifier;
       this.initiatingDeviceIdentifier = initiatingDeviceIdentifier;
       this.timeRemaining = timeRemaining;
       this.timestamp = timestamp;
       this.listOfCovNotifications = listOfCovNotifications;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
     public BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple build(
-        Long serviceRequestLength) {
+        long serviceRequestLength) {
       BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple
           bACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple =
               new BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple(
+                  serviceRequestLength,
                   subscriberProcessIdentifier,
                   initiatingDeviceIdentifier,
                   timeRemaining,
                   timestamp,
-                  listOfCovNotifications,
-                  serviceRequestLength);
+                  listOfCovNotifications);
       return bACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedEventNotification.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedEventNotification.java
index 53a17883aa9..0babdd75360 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedEventNotification.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedEventNotification.java
@@ -58,10 +58,8 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetEventStateTagged toState;
   protected final BACnetNotificationParameters eventValues;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestConfirmedEventNotification(
+      long serviceRequestLength,
       BACnetContextTagUnsignedInteger processIdentifier,
       BACnetContextTagObjectIdentifier initiatingDeviceIdentifier,
       BACnetContextTagObjectIdentifier eventObjectIdentifier,
@@ -74,8 +72,7 @@ public BACnetConfirmedServiceRequestConfirmedEventNotification(
       BACnetContextTagBoolean ackRequired,
       BACnetEventStateTagged fromState,
       BACnetEventStateTagged toState,
-      BACnetNotificationParameters eventValues,
-      Long serviceRequestLength) {
+      BACnetNotificationParameters eventValues) {
     super(serviceRequestLength);
     this.processIdentifier = processIdentifier;
     this.initiatingDeviceIdentifier = initiatingDeviceIdentifier;
@@ -90,7 +87,6 @@ public BACnetConfirmedServiceRequestConfirmedEventNotification(
     this.fromState = fromState;
     this.toState = toState;
     this.eventValues = eventValues;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagUnsignedInteger getProcessIdentifier() {
@@ -413,8 +409,7 @@ public int getLengthInBits() {
         ackRequired,
         fromState,
         toState,
-        eventValues,
-        serviceRequestLength);
+        eventValues);
   }
 
   public static class BACnetConfirmedServiceRequestConfirmedEventNotificationBuilderImpl
@@ -432,7 +427,6 @@ public static class BACnetConfirmedServiceRequestConfirmedEventNotificationBuild
     private final BACnetEventStateTagged fromState;
     private final BACnetEventStateTagged toState;
     private final BACnetNotificationParameters eventValues;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestConfirmedEventNotificationBuilderImpl(
         BACnetContextTagUnsignedInteger processIdentifier,
@@ -447,8 +441,7 @@ public BACnetConfirmedServiceRequestConfirmedEventNotificationBuilderImpl(
         BACnetContextTagBoolean ackRequired,
         BACnetEventStateTagged fromState,
         BACnetEventStateTagged toState,
-        BACnetNotificationParameters eventValues,
-        Long serviceRequestLength) {
+        BACnetNotificationParameters eventValues) {
       this.processIdentifier = processIdentifier;
       this.initiatingDeviceIdentifier = initiatingDeviceIdentifier;
       this.eventObjectIdentifier = eventObjectIdentifier;
@@ -462,14 +455,14 @@ public BACnetConfirmedServiceRequestConfirmedEventNotificationBuilderImpl(
       this.fromState = fromState;
       this.toState = toState;
       this.eventValues = eventValues;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
     public BACnetConfirmedServiceRequestConfirmedEventNotification build(
-        Long serviceRequestLength) {
+        long serviceRequestLength) {
       BACnetConfirmedServiceRequestConfirmedEventNotification
           bACnetConfirmedServiceRequestConfirmedEventNotification =
               new BACnetConfirmedServiceRequestConfirmedEventNotification(
+                  serviceRequestLength,
                   processIdentifier,
                   initiatingDeviceIdentifier,
                   eventObjectIdentifier,
@@ -482,8 +475,7 @@ public BACnetConfirmedServiceRequestConfirmedEventNotification build(
                   ackRequired,
                   fromState,
                   toState,
-                  eventValues,
-                  serviceRequestLength);
+                  eventValues);
       return bACnetConfirmedServiceRequestConfirmedEventNotification;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.java
index d4e2d83341d..db1032d5a55 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.java
@@ -48,19 +48,15 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetContextTagUnsignedInteger serviceNumber;
   protected final BACnetConstructedData serviceParameters;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestConfirmedPrivateTransfer(
+      long serviceRequestLength,
       BACnetVendorIdTagged vendorId,
       BACnetContextTagUnsignedInteger serviceNumber,
-      BACnetConstructedData serviceParameters,
-      Long serviceRequestLength) {
+      BACnetConstructedData serviceParameters) {
     super(serviceRequestLength);
     this.vendorId = vendorId;
     this.serviceNumber = serviceNumber;
     this.serviceParameters = serviceParameters;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetVendorIdTagged getVendorId() {
@@ -164,7 +160,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestConfirmedPrivateTransfer");
     // Create the instance
     return new BACnetConfirmedServiceRequestConfirmedPrivateTransferBuilderImpl(
-        vendorId, serviceNumber, serviceParameters, serviceRequestLength);
+        vendorId, serviceNumber, serviceParameters);
   }
 
   public static class BACnetConfirmedServiceRequestConfirmedPrivateTransferBuilderImpl
@@ -172,25 +168,21 @@ public static class BACnetConfirmedServiceRequestConfirmedPrivateTransferBuilder
     private final BACnetVendorIdTagged vendorId;
     private final BACnetContextTagUnsignedInteger serviceNumber;
     private final BACnetConstructedData serviceParameters;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestConfirmedPrivateTransferBuilderImpl(
         BACnetVendorIdTagged vendorId,
         BACnetContextTagUnsignedInteger serviceNumber,
-        BACnetConstructedData serviceParameters,
-        Long serviceRequestLength) {
+        BACnetConstructedData serviceParameters) {
       this.vendorId = vendorId;
       this.serviceNumber = serviceNumber;
       this.serviceParameters = serviceParameters;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestConfirmedPrivateTransfer build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestConfirmedPrivateTransfer build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestConfirmedPrivateTransfer
           bACnetConfirmedServiceRequestConfirmedPrivateTransfer =
               new BACnetConfirmedServiceRequestConfirmedPrivateTransfer(
-                  vendorId, serviceNumber, serviceParameters, serviceRequestLength);
+                  serviceRequestLength, vendorId, serviceNumber, serviceParameters);
       return bACnetConfirmedServiceRequestConfirmedPrivateTransfer;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessage.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessage.java
index 23913106351..9cd23aca688 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessage.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessage.java
@@ -50,21 +50,17 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
       messagePriority;
   protected final BACnetContextTagCharacterString message;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestConfirmedTextMessage(
+      long serviceRequestLength,
       BACnetContextTagObjectIdentifier textMessageSourceDevice,
       BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass messageClass,
       BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged messagePriority,
-      BACnetContextTagCharacterString message,
-      Long serviceRequestLength) {
+      BACnetContextTagCharacterString message) {
     super(serviceRequestLength);
     this.textMessageSourceDevice = textMessageSourceDevice;
     this.messageClass = messageClass;
     this.messagePriority = messagePriority;
     this.message = message;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagObjectIdentifier getTextMessageSourceDevice() {
@@ -187,7 +183,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestConfirmedTextMessage");
     // Create the instance
     return new BACnetConfirmedServiceRequestConfirmedTextMessageBuilderImpl(
-        textMessageSourceDevice, messageClass, messagePriority, message, serviceRequestLength);
+        textMessageSourceDevice, messageClass, messagePriority, message);
   }
 
   public static class BACnetConfirmedServiceRequestConfirmedTextMessageBuilderImpl
@@ -197,31 +193,27 @@ public static class BACnetConfirmedServiceRequestConfirmedTextMessageBuilderImpl
     private final BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged
         messagePriority;
     private final BACnetContextTagCharacterString message;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestConfirmedTextMessageBuilderImpl(
         BACnetContextTagObjectIdentifier textMessageSourceDevice,
         BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass messageClass,
         BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged messagePriority,
-        BACnetContextTagCharacterString message,
-        Long serviceRequestLength) {
+        BACnetContextTagCharacterString message) {
       this.textMessageSourceDevice = textMessageSourceDevice;
       this.messageClass = messageClass;
       this.messagePriority = messagePriority;
       this.message = message;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestConfirmedTextMessage build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestConfirmedTextMessage build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestConfirmedTextMessage
           bACnetConfirmedServiceRequestConfirmedTextMessage =
               new BACnetConfirmedServiceRequestConfirmedTextMessage(
+                  serviceRequestLength,
                   textMessageSourceDevice,
                   messageClass,
                   messagePriority,
-                  message,
-                  serviceRequestLength);
+                  message);
       return bACnetConfirmedServiceRequestConfirmedTextMessage;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.java
index d0362faf4ba..5c6a65ad17c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.java
@@ -45,19 +45,12 @@ public abstract class BACnetConfirmedServiceRequestConfirmedTextMessageMessageCl
   protected final BACnetTagHeader peekedTagHeader;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.peekedTagHeader = peekedTagHeader;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -176,16 +169,13 @@ public static BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass stat
     // Create the instance
     BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass
         _bACnetConfirmedServiceRequestConfirmedTextMessageMessageClass =
-            builder.build(openingTag, peekedTagHeader, closingTag, tagNumber);
+            builder.build(openingTag, peekedTagHeader, closingTag);
     return _bACnetConfirmedServiceRequestConfirmedTextMessageMessageClass;
   }
 
   public interface BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder {
     BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber);
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag);
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.java
index 77e5cfad989..f634dcc46a4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.java
@@ -43,18 +43,13 @@ public class BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharac
   // Properties.
   protected final BACnetContextTagCharacterString characterValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagCharacterString characterValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagCharacterString characterValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.characterValue = characterValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagCharacterString getCharacterValue() {
@@ -117,7 +112,7 @@ public int getLengthInBits() {
         "BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter");
     // Create the instance
     return new BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacterBuilderImpl(
-        characterValue, tagNumber);
+        characterValue);
   }
 
   public static
@@ -125,23 +120,18 @@ class BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacterBuil
       implements BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass
           .BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder {
     private final BACnetContextTagCharacterString characterValue;
-    private final Short tagNumber;
 
     public BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacterBuilderImpl(
-        BACnetContextTagCharacterString characterValue, Short tagNumber) {
+        BACnetContextTagCharacterString characterValue) {
       this.characterValue = characterValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter
           bACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter =
               new BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter(
-                  openingTag, peekedTagHeader, closingTag, characterValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, characterValue);
       return bACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.java
index 310d1575748..88ffce976af 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.java
@@ -43,18 +43,13 @@ public class BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeri
   // Properties.
   protected final BACnetContextTagUnsignedInteger numericValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagUnsignedInteger numericValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagUnsignedInteger numericValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numericValue = numericValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagUnsignedInteger getNumericValue() {
@@ -113,7 +108,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric");
     // Create the instance
     return new BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumericBuilderImpl(
-        numericValue, tagNumber);
+        numericValue);
   }
 
   public static
@@ -121,23 +116,18 @@ class BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumericBuilde
       implements BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass
           .BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder {
     private final BACnetContextTagUnsignedInteger numericValue;
-    private final Short tagNumber;
 
     public BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumericBuilderImpl(
-        BACnetContextTagUnsignedInteger numericValue, Short tagNumber) {
+        BACnetContextTagUnsignedInteger numericValue) {
       this.numericValue = numericValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric
           bACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric =
               new BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric(
-                  openingTag, peekedTagHeader, closingTag, numericValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, numericValue);
       return bACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged.java
index 544a412fbdd..67d5565b0e9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged.java
@@ -42,20 +42,12 @@ public class BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTag
   protected final BACnetTagHeader header;
   protected final BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged(
       BACnetTagHeader header,
-      BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority value,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -146,8 +138,7 @@ public static BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTa
     BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged
         _bACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged;
     _bACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged =
-        new BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged(
-            header, value, tagNumber, tagClass);
+        new BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged(header, value);
     return _bACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestCreateObject.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestCreateObject.java
index b9a05572707..352f73665db 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestCreateObject.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestCreateObject.java
@@ -47,17 +47,13 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetConfirmedServiceRequestCreateObjectObjectSpecifier objectSpecifier;
   protected final BACnetPropertyValues listOfValues;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestCreateObject(
+      long serviceRequestLength,
       BACnetConfirmedServiceRequestCreateObjectObjectSpecifier objectSpecifier,
-      BACnetPropertyValues listOfValues,
-      Long serviceRequestLength) {
+      BACnetPropertyValues listOfValues) {
     super(serviceRequestLength);
     this.objectSpecifier = objectSpecifier;
     this.listOfValues = listOfValues;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetConfirmedServiceRequestCreateObjectObjectSpecifier getObjectSpecifier() {
@@ -138,30 +134,25 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetConfirmedServiceRequestCreateObject");
     // Create the instance
-    return new BACnetConfirmedServiceRequestCreateObjectBuilderImpl(
-        objectSpecifier, listOfValues, serviceRequestLength);
+    return new BACnetConfirmedServiceRequestCreateObjectBuilderImpl(objectSpecifier, listOfValues);
   }
 
   public static class BACnetConfirmedServiceRequestCreateObjectBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final BACnetConfirmedServiceRequestCreateObjectObjectSpecifier objectSpecifier;
     private final BACnetPropertyValues listOfValues;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestCreateObjectBuilderImpl(
         BACnetConfirmedServiceRequestCreateObjectObjectSpecifier objectSpecifier,
-        BACnetPropertyValues listOfValues,
-        Long serviceRequestLength) {
+        BACnetPropertyValues listOfValues) {
       this.objectSpecifier = objectSpecifier;
       this.listOfValues = listOfValues;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestCreateObject build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestCreateObject build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestCreateObject bACnetConfirmedServiceRequestCreateObject =
           new BACnetConfirmedServiceRequestCreateObject(
-              objectSpecifier, listOfValues, serviceRequestLength);
+              serviceRequestLength, objectSpecifier, listOfValues);
       return bACnetConfirmedServiceRequestCreateObject;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.java
index 3ffe54fdcc9..d45b8958ef1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.java
@@ -43,21 +43,16 @@ public class BACnetConfirmedServiceRequestCreateObjectObjectSpecifier implements
   protected final BACnetContextTagObjectIdentifier objectIdentifier;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetConfirmedServiceRequestCreateObjectObjectSpecifier(
       BACnetOpeningTag openingTag,
       BACnetContextTagEnumerated rawObjectType,
       BACnetContextTagObjectIdentifier objectIdentifier,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.rawObjectType = rawObjectType;
     this.objectIdentifier = objectIdentifier;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -218,7 +213,7 @@ public static BACnetConfirmedServiceRequestCreateObjectObjectSpecifier staticPar
         _bACnetConfirmedServiceRequestCreateObjectObjectSpecifier;
     _bACnetConfirmedServiceRequestCreateObjectObjectSpecifier =
         new BACnetConfirmedServiceRequestCreateObjectObjectSpecifier(
-            openingTag, rawObjectType, objectIdentifier, closingTag, tagNumber);
+            openingTag, rawObjectType, objectIdentifier, closingTag);
     return _bACnetConfirmedServiceRequestCreateObjectObjectSpecifier;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeleteObject.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeleteObject.java
index 0729138a7e0..5267be24720 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeleteObject.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeleteObject.java
@@ -46,14 +46,10 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final BACnetApplicationTagObjectIdentifier objectIdentifier;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestDeleteObject(
-      BACnetApplicationTagObjectIdentifier objectIdentifier, Long serviceRequestLength) {
+      long serviceRequestLength, BACnetApplicationTagObjectIdentifier objectIdentifier) {
     super(serviceRequestLength);
     this.objectIdentifier = objectIdentifier;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetApplicationTagObjectIdentifier getObjectIdentifier() {
@@ -108,25 +104,21 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetConfirmedServiceRequestDeleteObject");
     // Create the instance
-    return new BACnetConfirmedServiceRequestDeleteObjectBuilderImpl(
-        objectIdentifier, serviceRequestLength);
+    return new BACnetConfirmedServiceRequestDeleteObjectBuilderImpl(objectIdentifier);
   }
 
   public static class BACnetConfirmedServiceRequestDeleteObjectBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final BACnetApplicationTagObjectIdentifier objectIdentifier;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestDeleteObjectBuilderImpl(
-        BACnetApplicationTagObjectIdentifier objectIdentifier, Long serviceRequestLength) {
+        BACnetApplicationTagObjectIdentifier objectIdentifier) {
       this.objectIdentifier = objectIdentifier;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestDeleteObject build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestDeleteObject build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestDeleteObject bACnetConfirmedServiceRequestDeleteObject =
-          new BACnetConfirmedServiceRequestDeleteObject(objectIdentifier, serviceRequestLength);
+          new BACnetConfirmedServiceRequestDeleteObject(serviceRequestLength, objectIdentifier);
       return bACnetConfirmedServiceRequestDeleteObject;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeviceCommunicationControl.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeviceCommunicationControl.java
index a2aaf36bdcc..7936a1964e7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeviceCommunicationControl.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeviceCommunicationControl.java
@@ -49,19 +49,15 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
       enableDisable;
   protected final BACnetContextTagCharacterString password;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestDeviceCommunicationControl(
+      long serviceRequestLength,
       BACnetContextTagUnsignedInteger timeDuration,
       BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged enableDisable,
-      BACnetContextTagCharacterString password,
-      Long serviceRequestLength) {
+      BACnetContextTagCharacterString password) {
     super(serviceRequestLength);
     this.timeDuration = timeDuration;
     this.enableDisable = enableDisable;
     this.password = password;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagUnsignedInteger getTimeDuration() {
@@ -167,7 +163,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestDeviceCommunicationControl");
     // Create the instance
     return new BACnetConfirmedServiceRequestDeviceCommunicationControlBuilderImpl(
-        timeDuration, enableDisable, password, serviceRequestLength);
+        timeDuration, enableDisable, password);
   }
 
   public static class BACnetConfirmedServiceRequestDeviceCommunicationControlBuilderImpl
@@ -176,25 +172,22 @@ public static class BACnetConfirmedServiceRequestDeviceCommunicationControlBuild
     private final BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged
         enableDisable;
     private final BACnetContextTagCharacterString password;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestDeviceCommunicationControlBuilderImpl(
         BACnetContextTagUnsignedInteger timeDuration,
         BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged enableDisable,
-        BACnetContextTagCharacterString password,
-        Long serviceRequestLength) {
+        BACnetContextTagCharacterString password) {
       this.timeDuration = timeDuration;
       this.enableDisable = enableDisable;
       this.password = password;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
     public BACnetConfirmedServiceRequestDeviceCommunicationControl build(
-        Long serviceRequestLength) {
+        long serviceRequestLength) {
       BACnetConfirmedServiceRequestDeviceCommunicationControl
           bACnetConfirmedServiceRequestDeviceCommunicationControl =
               new BACnetConfirmedServiceRequestDeviceCommunicationControl(
-                  timeDuration, enableDisable, password, serviceRequestLength);
+                  serviceRequestLength, timeDuration, enableDisable, password);
       return bACnetConfirmedServiceRequestDeviceCommunicationControl;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged.java
index 767e1bed900..aad2254f7af 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged.java
@@ -42,20 +42,12 @@ public class BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisabl
   protected final BACnetTagHeader header;
   protected final BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged(
       BACnetTagHeader header,
-      BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable value,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -147,7 +139,7 @@ public int getLengthInBits() {
         _bACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged;
     _bACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged =
         new BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged(
-            header, value, tagNumber, tagClass);
+            header, value);
     return _bACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummary.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummary.java
index b56b70f5522..7fc41054d31 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummary.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummary.java
@@ -53,18 +53,15 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter priorityFilter;
   protected final BACnetContextTagUnsignedInteger notificationClassFilter;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestGetEnrollmentSummary(
+      long serviceRequestLength,
       BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged
           acknowledgmentFilter,
       BACnetRecipientProcessEnclosed enrollmentFilter,
       BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged eventStateFilter,
       BACnetEventTypeTagged eventTypeFilter,
       BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter priorityFilter,
-      BACnetContextTagUnsignedInteger notificationClassFilter,
-      Long serviceRequestLength) {
+      BACnetContextTagUnsignedInteger notificationClassFilter) {
     super(serviceRequestLength);
     this.acknowledgmentFilter = acknowledgmentFilter;
     this.enrollmentFilter = enrollmentFilter;
@@ -72,7 +69,6 @@ public BACnetConfirmedServiceRequestGetEnrollmentSummary(
     this.eventTypeFilter = eventTypeFilter;
     this.priorityFilter = priorityFilter;
     this.notificationClassFilter = notificationClassFilter;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged
@@ -247,8 +243,7 @@ public int getLengthInBits() {
         eventStateFilter,
         eventTypeFilter,
         priorityFilter,
-        notificationClassFilter,
-        serviceRequestLength);
+        notificationClassFilter);
   }
 
   public static class BACnetConfirmedServiceRequestGetEnrollmentSummaryBuilderImpl
@@ -261,7 +256,6 @@ public static class BACnetConfirmedServiceRequestGetEnrollmentSummaryBuilderImpl
     private final BACnetEventTypeTagged eventTypeFilter;
     private final BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter priorityFilter;
     private final BACnetContextTagUnsignedInteger notificationClassFilter;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestGetEnrollmentSummaryBuilderImpl(
         BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged
@@ -270,29 +264,26 @@ public BACnetConfirmedServiceRequestGetEnrollmentSummaryBuilderImpl(
         BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged eventStateFilter,
         BACnetEventTypeTagged eventTypeFilter,
         BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter priorityFilter,
-        BACnetContextTagUnsignedInteger notificationClassFilter,
-        Long serviceRequestLength) {
+        BACnetContextTagUnsignedInteger notificationClassFilter) {
       this.acknowledgmentFilter = acknowledgmentFilter;
       this.enrollmentFilter = enrollmentFilter;
       this.eventStateFilter = eventStateFilter;
       this.eventTypeFilter = eventTypeFilter;
       this.priorityFilter = priorityFilter;
       this.notificationClassFilter = notificationClassFilter;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestGetEnrollmentSummary build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestGetEnrollmentSummary build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestGetEnrollmentSummary
           bACnetConfirmedServiceRequestGetEnrollmentSummary =
               new BACnetConfirmedServiceRequestGetEnrollmentSummary(
+                  serviceRequestLength,
                   acknowledgmentFilter,
                   enrollmentFilter,
                   eventStateFilter,
                   eventTypeFilter,
                   priorityFilter,
-                  notificationClassFilter,
-                  serviceRequestLength);
+                  notificationClassFilter);
       return bACnetConfirmedServiceRequestGetEnrollmentSummary;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged.java
index f29aabd616b..c511684f5d7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged.java
@@ -42,20 +42,12 @@ public class BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFil
   protected final BACnetTagHeader header;
   protected final BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged(
       BACnetTagHeader header,
-      BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter value,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -147,7 +139,7 @@ public int getLengthInBits() {
         _bACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged;
     _bACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged =
         new BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged(
-            header, value, tagNumber, tagClass);
+            header, value);
     return _bACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged.java
index 90772366b1a..a91fc7a52e8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged.java
@@ -42,20 +42,12 @@ public class BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTa
   protected final BACnetTagHeader header;
   protected final BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged(
       BACnetTagHeader header,
-      BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter value,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -146,8 +138,7 @@ public static BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterT
     BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged
         _bACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged;
     _bACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged =
-        new BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged(
-            header, value, tagNumber, tagClass);
+        new BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged(header, value);
     return _bACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter.java
index c1b8125807d..c3ff04b9dd2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter.java
@@ -43,21 +43,16 @@ public class BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter imp
   protected final BACnetContextTagUnsignedInteger maxPriority;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter(
       BACnetOpeningTag openingTag,
       BACnetContextTagUnsignedInteger minPriority,
       BACnetContextTagUnsignedInteger maxPriority,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.minPriority = minPriority;
     this.maxPriority = maxPriority;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -170,7 +165,7 @@ public static BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter st
         _bACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter;
     _bACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter =
         new BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter(
-            openingTag, minPriority, maxPriority, closingTag, tagNumber);
+            openingTag, minPriority, maxPriority, closingTag);
     return _bACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEventInformation.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEventInformation.java
index b51cb45eeaa..8de9c000d2f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEventInformation.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEventInformation.java
@@ -46,14 +46,10 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final BACnetContextTagObjectIdentifier lastReceivedObjectIdentifier;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestGetEventInformation(
-      BACnetContextTagObjectIdentifier lastReceivedObjectIdentifier, Long serviceRequestLength) {
+      long serviceRequestLength, BACnetContextTagObjectIdentifier lastReceivedObjectIdentifier) {
     super(serviceRequestLength);
     this.lastReceivedObjectIdentifier = lastReceivedObjectIdentifier;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagObjectIdentifier getLastReceivedObjectIdentifier() {
@@ -115,26 +111,23 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestGetEventInformation");
     // Create the instance
     return new BACnetConfirmedServiceRequestGetEventInformationBuilderImpl(
-        lastReceivedObjectIdentifier, serviceRequestLength);
+        lastReceivedObjectIdentifier);
   }
 
   public static class BACnetConfirmedServiceRequestGetEventInformationBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final BACnetContextTagObjectIdentifier lastReceivedObjectIdentifier;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestGetEventInformationBuilderImpl(
-        BACnetContextTagObjectIdentifier lastReceivedObjectIdentifier, Long serviceRequestLength) {
+        BACnetContextTagObjectIdentifier lastReceivedObjectIdentifier) {
       this.lastReceivedObjectIdentifier = lastReceivedObjectIdentifier;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestGetEventInformation build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestGetEventInformation build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestGetEventInformation
           bACnetConfirmedServiceRequestGetEventInformation =
               new BACnetConfirmedServiceRequestGetEventInformation(
-                  lastReceivedObjectIdentifier, serviceRequestLength);
+                  serviceRequestLength, lastReceivedObjectIdentifier);
       return bACnetConfirmedServiceRequestGetEventInformation;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestLifeSafetyOperation.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestLifeSafetyOperation.java
index c82111585cc..54309f3aaf2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestLifeSafetyOperation.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestLifeSafetyOperation.java
@@ -49,21 +49,17 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetLifeSafetyOperationTagged request;
   protected final BACnetContextTagObjectIdentifier objectIdentifier;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestLifeSafetyOperation(
+      long serviceRequestLength,
       BACnetContextTagUnsignedInteger requestingProcessIdentifier,
       BACnetContextTagCharacterString requestingSource,
       BACnetLifeSafetyOperationTagged request,
-      BACnetContextTagObjectIdentifier objectIdentifier,
-      Long serviceRequestLength) {
+      BACnetContextTagObjectIdentifier objectIdentifier) {
     super(serviceRequestLength);
     this.requestingProcessIdentifier = requestingProcessIdentifier;
     this.requestingSource = requestingSource;
     this.request = request;
     this.objectIdentifier = objectIdentifier;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagUnsignedInteger getRequestingProcessIdentifier() {
@@ -188,11 +184,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestLifeSafetyOperation");
     // Create the instance
     return new BACnetConfirmedServiceRequestLifeSafetyOperationBuilderImpl(
-        requestingProcessIdentifier,
-        requestingSource,
-        request,
-        objectIdentifier,
-        serviceRequestLength);
+        requestingProcessIdentifier, requestingSource, request, objectIdentifier);
   }
 
   public static class BACnetConfirmedServiceRequestLifeSafetyOperationBuilderImpl
@@ -201,31 +193,27 @@ public static class BACnetConfirmedServiceRequestLifeSafetyOperationBuilderImpl
     private final BACnetContextTagCharacterString requestingSource;
     private final BACnetLifeSafetyOperationTagged request;
     private final BACnetContextTagObjectIdentifier objectIdentifier;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestLifeSafetyOperationBuilderImpl(
         BACnetContextTagUnsignedInteger requestingProcessIdentifier,
         BACnetContextTagCharacterString requestingSource,
         BACnetLifeSafetyOperationTagged request,
-        BACnetContextTagObjectIdentifier objectIdentifier,
-        Long serviceRequestLength) {
+        BACnetContextTagObjectIdentifier objectIdentifier) {
       this.requestingProcessIdentifier = requestingProcessIdentifier;
       this.requestingSource = requestingSource;
       this.request = request;
       this.objectIdentifier = objectIdentifier;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestLifeSafetyOperation build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestLifeSafetyOperation build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestLifeSafetyOperation
           bACnetConfirmedServiceRequestLifeSafetyOperation =
               new BACnetConfirmedServiceRequestLifeSafetyOperation(
+                  serviceRequestLength,
                   requestingProcessIdentifier,
                   requestingSource,
                   request,
-                  objectIdentifier,
-                  serviceRequestLength);
+                  objectIdentifier);
       return bACnetConfirmedServiceRequestLifeSafetyOperation;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadProperty.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadProperty.java
index 325c92183e2..8e4e7aaf6c7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadProperty.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadProperty.java
@@ -48,19 +48,15 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetPropertyIdentifierTagged propertyIdentifier;
   protected final BACnetContextTagUnsignedInteger arrayIndex;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestReadProperty(
+      long serviceRequestLength,
       BACnetContextTagObjectIdentifier objectIdentifier,
       BACnetPropertyIdentifierTagged propertyIdentifier,
-      BACnetContextTagUnsignedInteger arrayIndex,
-      Long serviceRequestLength) {
+      BACnetContextTagUnsignedInteger arrayIndex) {
     super(serviceRequestLength);
     this.objectIdentifier = objectIdentifier;
     this.propertyIdentifier = propertyIdentifier;
     this.arrayIndex = arrayIndex;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagObjectIdentifier getObjectIdentifier() {
@@ -162,7 +158,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestReadProperty");
     // Create the instance
     return new BACnetConfirmedServiceRequestReadPropertyBuilderImpl(
-        objectIdentifier, propertyIdentifier, arrayIndex, serviceRequestLength);
+        objectIdentifier, propertyIdentifier, arrayIndex);
   }
 
   public static class BACnetConfirmedServiceRequestReadPropertyBuilderImpl
@@ -170,24 +166,20 @@ public static class BACnetConfirmedServiceRequestReadPropertyBuilderImpl
     private final BACnetContextTagObjectIdentifier objectIdentifier;
     private final BACnetPropertyIdentifierTagged propertyIdentifier;
     private final BACnetContextTagUnsignedInteger arrayIndex;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestReadPropertyBuilderImpl(
         BACnetContextTagObjectIdentifier objectIdentifier,
         BACnetPropertyIdentifierTagged propertyIdentifier,
-        BACnetContextTagUnsignedInteger arrayIndex,
-        Long serviceRequestLength) {
+        BACnetContextTagUnsignedInteger arrayIndex) {
       this.objectIdentifier = objectIdentifier;
       this.propertyIdentifier = propertyIdentifier;
       this.arrayIndex = arrayIndex;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestReadProperty build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestReadProperty build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestReadProperty bACnetConfirmedServiceRequestReadProperty =
           new BACnetConfirmedServiceRequestReadProperty(
-              objectIdentifier, propertyIdentifier, arrayIndex, serviceRequestLength);
+              serviceRequestLength, objectIdentifier, propertyIdentifier, arrayIndex);
       return bACnetConfirmedServiceRequestReadProperty;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyConditional.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyConditional.java
index 8c9d7445026..9fa49a9cc4d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyConditional.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyConditional.java
@@ -46,16 +46,10 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final byte[] bytesOfRemovedService;
 
-  // Arguments.
-  protected final Long serviceRequestPayloadLength;
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestReadPropertyConditional(
-      byte[] bytesOfRemovedService, Long serviceRequestPayloadLength, Long serviceRequestLength) {
+      long serviceRequestLength, byte[] bytesOfRemovedService) {
     super(serviceRequestLength);
     this.bytesOfRemovedService = bytesOfRemovedService;
-    this.serviceRequestPayloadLength = serviceRequestPayloadLength;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public byte[] getBytesOfRemovedService() {
@@ -110,28 +104,23 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestReadPropertyConditional");
     // Create the instance
     return new BACnetConfirmedServiceRequestReadPropertyConditionalBuilderImpl(
-        bytesOfRemovedService, serviceRequestPayloadLength, serviceRequestLength);
+        bytesOfRemovedService);
   }
 
   public static class BACnetConfirmedServiceRequestReadPropertyConditionalBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final byte[] bytesOfRemovedService;
-    private final Long serviceRequestPayloadLength;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestReadPropertyConditionalBuilderImpl(
-        byte[] bytesOfRemovedService, Long serviceRequestPayloadLength, Long serviceRequestLength) {
+        byte[] bytesOfRemovedService) {
       this.bytesOfRemovedService = bytesOfRemovedService;
-      this.serviceRequestPayloadLength = serviceRequestPayloadLength;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestReadPropertyConditional build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestReadPropertyConditional build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestReadPropertyConditional
           bACnetConfirmedServiceRequestReadPropertyConditional =
               new BACnetConfirmedServiceRequestReadPropertyConditional(
-                  bytesOfRemovedService, serviceRequestPayloadLength, serviceRequestLength);
+                  serviceRequestLength, bytesOfRemovedService);
       return bACnetConfirmedServiceRequestReadPropertyConditional;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyMultiple.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyMultiple.java
index 5e9cb8f9cc1..c7ac6b7b16c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyMultiple.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyMultiple.java
@@ -46,18 +46,10 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final List<BACnetReadAccessSpecification> data;
 
-  // Arguments.
-  protected final Long serviceRequestPayloadLength;
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestReadPropertyMultiple(
-      List<BACnetReadAccessSpecification> data,
-      Long serviceRequestPayloadLength,
-      Long serviceRequestLength) {
+      long serviceRequestLength, List<BACnetReadAccessSpecification> data) {
     super(serviceRequestLength);
     this.data = data;
-    this.serviceRequestPayloadLength = serviceRequestPayloadLength;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public List<BACnetReadAccessSpecification> getData() {
@@ -114,31 +106,22 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetConfirmedServiceRequestReadPropertyMultiple");
     // Create the instance
-    return new BACnetConfirmedServiceRequestReadPropertyMultipleBuilderImpl(
-        data, serviceRequestPayloadLength, serviceRequestLength);
+    return new BACnetConfirmedServiceRequestReadPropertyMultipleBuilderImpl(data);
   }
 
   public static class BACnetConfirmedServiceRequestReadPropertyMultipleBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final List<BACnetReadAccessSpecification> data;
-    private final Long serviceRequestPayloadLength;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestReadPropertyMultipleBuilderImpl(
-        List<BACnetReadAccessSpecification> data,
-        Long serviceRequestPayloadLength,
-        Long serviceRequestLength) {
+        List<BACnetReadAccessSpecification> data) {
       this.data = data;
-      this.serviceRequestPayloadLength = serviceRequestPayloadLength;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestReadPropertyMultiple build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestReadPropertyMultiple build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestReadPropertyMultiple
           bACnetConfirmedServiceRequestReadPropertyMultiple =
-              new BACnetConfirmedServiceRequestReadPropertyMultiple(
-                  data, serviceRequestPayloadLength, serviceRequestLength);
+              new BACnetConfirmedServiceRequestReadPropertyMultiple(serviceRequestLength, data);
       return bACnetConfirmedServiceRequestReadPropertyMultiple;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRange.java
index a0fc55b55bc..d0bebe400cd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRange.java
@@ -49,21 +49,17 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetContextTagUnsignedInteger propertyArrayIndex;
   protected final BACnetConfirmedServiceRequestReadRangeRange readRange;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestReadRange(
+      long serviceRequestLength,
       BACnetContextTagObjectIdentifier objectIdentifier,
       BACnetPropertyIdentifierTagged propertyIdentifier,
       BACnetContextTagUnsignedInteger propertyArrayIndex,
-      BACnetConfirmedServiceRequestReadRangeRange readRange,
-      Long serviceRequestLength) {
+      BACnetConfirmedServiceRequestReadRangeRange readRange) {
     super(serviceRequestLength);
     this.objectIdentifier = objectIdentifier;
     this.propertyIdentifier = propertyIdentifier;
     this.propertyArrayIndex = propertyArrayIndex;
     this.readRange = readRange;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagObjectIdentifier getObjectIdentifier() {
@@ -184,7 +180,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestReadRange");
     // Create the instance
     return new BACnetConfirmedServiceRequestReadRangeBuilderImpl(
-        objectIdentifier, propertyIdentifier, propertyArrayIndex, readRange, serviceRequestLength);
+        objectIdentifier, propertyIdentifier, propertyArrayIndex, readRange);
   }
 
   public static class BACnetConfirmedServiceRequestReadRangeBuilderImpl
@@ -193,30 +189,26 @@ public static class BACnetConfirmedServiceRequestReadRangeBuilderImpl
     private final BACnetPropertyIdentifierTagged propertyIdentifier;
     private final BACnetContextTagUnsignedInteger propertyArrayIndex;
     private final BACnetConfirmedServiceRequestReadRangeRange readRange;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestReadRangeBuilderImpl(
         BACnetContextTagObjectIdentifier objectIdentifier,
         BACnetPropertyIdentifierTagged propertyIdentifier,
         BACnetContextTagUnsignedInteger propertyArrayIndex,
-        BACnetConfirmedServiceRequestReadRangeRange readRange,
-        Long serviceRequestLength) {
+        BACnetConfirmedServiceRequestReadRangeRange readRange) {
       this.objectIdentifier = objectIdentifier;
       this.propertyIdentifier = propertyIdentifier;
       this.propertyArrayIndex = propertyArrayIndex;
       this.readRange = readRange;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestReadRange build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestReadRange build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestReadRange bACnetConfirmedServiceRequestReadRange =
           new BACnetConfirmedServiceRequestReadRange(
+              serviceRequestLength,
               objectIdentifier,
               propertyIdentifier,
               propertyArrayIndex,
-              readRange,
-              serviceRequestLength);
+              readRange);
       return bACnetConfirmedServiceRequestReadRange;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReinitializeDevice.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReinitializeDevice.java
index 2adbe082e79..449cf30df40 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReinitializeDevice.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReinitializeDevice.java
@@ -48,18 +48,14 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
       reinitializedStateOfDevice;
   protected final BACnetContextTagCharacterString password;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestReinitializeDevice(
+      long serviceRequestLength,
       BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged
           reinitializedStateOfDevice,
-      BACnetContextTagCharacterString password,
-      Long serviceRequestLength) {
+      BACnetContextTagCharacterString password) {
     super(serviceRequestLength);
     this.reinitializedStateOfDevice = reinitializedStateOfDevice;
     this.password = password;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged
@@ -145,7 +141,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestReinitializeDevice");
     // Create the instance
     return new BACnetConfirmedServiceRequestReinitializeDeviceBuilderImpl(
-        reinitializedStateOfDevice, password, serviceRequestLength);
+        reinitializedStateOfDevice, password);
   }
 
   public static class BACnetConfirmedServiceRequestReinitializeDeviceBuilderImpl
@@ -153,24 +149,20 @@ public static class BACnetConfirmedServiceRequestReinitializeDeviceBuilderImpl
     private final BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged
         reinitializedStateOfDevice;
     private final BACnetContextTagCharacterString password;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestReinitializeDeviceBuilderImpl(
         BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged
             reinitializedStateOfDevice,
-        BACnetContextTagCharacterString password,
-        Long serviceRequestLength) {
+        BACnetContextTagCharacterString password) {
       this.reinitializedStateOfDevice = reinitializedStateOfDevice;
       this.password = password;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestReinitializeDevice build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestReinitializeDevice build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestReinitializeDevice
           bACnetConfirmedServiceRequestReinitializeDevice =
               new BACnetConfirmedServiceRequestReinitializeDevice(
-                  reinitializedStateOfDevice, password, serviceRequestLength);
+                  serviceRequestLength, reinitializedStateOfDevice, password);
       return bACnetConfirmedServiceRequestReinitializeDevice;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged.java
index 669bc40d87b..abdbec18516 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged.java
@@ -42,20 +42,12 @@ public class BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOf
   protected final BACnetTagHeader header;
   protected final BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged(
       BACnetTagHeader header,
-      BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice value,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -147,7 +139,7 @@ public int getLengthInBits() {
         _bACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged;
     _bACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged =
         new BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged(
-            header, value, tagNumber, tagClass);
+            header, value);
     return _bACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRemoveListElement.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRemoveListElement.java
index 4b7acbc27b1..7292040291c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRemoveListElement.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRemoveListElement.java
@@ -49,21 +49,17 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetContextTagUnsignedInteger arrayIndex;
   protected final BACnetConstructedData listOfElements;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestRemoveListElement(
+      long serviceRequestLength,
       BACnetContextTagObjectIdentifier objectIdentifier,
       BACnetPropertyIdentifierTagged propertyIdentifier,
       BACnetContextTagUnsignedInteger arrayIndex,
-      BACnetConstructedData listOfElements,
-      Long serviceRequestLength) {
+      BACnetConstructedData listOfElements) {
     super(serviceRequestLength);
     this.objectIdentifier = objectIdentifier;
     this.propertyIdentifier = propertyIdentifier;
     this.arrayIndex = arrayIndex;
     this.listOfElements = listOfElements;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagObjectIdentifier getObjectIdentifier() {
@@ -191,7 +187,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestRemoveListElement");
     // Create the instance
     return new BACnetConfirmedServiceRequestRemoveListElementBuilderImpl(
-        objectIdentifier, propertyIdentifier, arrayIndex, listOfElements, serviceRequestLength);
+        objectIdentifier, propertyIdentifier, arrayIndex, listOfElements);
   }
 
   public static class BACnetConfirmedServiceRequestRemoveListElementBuilderImpl
@@ -200,31 +196,27 @@ public static class BACnetConfirmedServiceRequestRemoveListElementBuilderImpl
     private final BACnetPropertyIdentifierTagged propertyIdentifier;
     private final BACnetContextTagUnsignedInteger arrayIndex;
     private final BACnetConstructedData listOfElements;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestRemoveListElementBuilderImpl(
         BACnetContextTagObjectIdentifier objectIdentifier,
         BACnetPropertyIdentifierTagged propertyIdentifier,
         BACnetContextTagUnsignedInteger arrayIndex,
-        BACnetConstructedData listOfElements,
-        Long serviceRequestLength) {
+        BACnetConstructedData listOfElements) {
       this.objectIdentifier = objectIdentifier;
       this.propertyIdentifier = propertyIdentifier;
       this.arrayIndex = arrayIndex;
       this.listOfElements = listOfElements;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestRemoveListElement build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestRemoveListElement build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestRemoveListElement
           bACnetConfirmedServiceRequestRemoveListElement =
               new BACnetConfirmedServiceRequestRemoveListElement(
+                  serviceRequestLength,
                   objectIdentifier,
                   propertyIdentifier,
                   arrayIndex,
-                  listOfElements,
-                  serviceRequestLength);
+                  listOfElements);
       return bACnetConfirmedServiceRequestRemoveListElement;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRequestKey.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRequestKey.java
index 6b458b7217e..0e8ecdd567d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRequestKey.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRequestKey.java
@@ -46,16 +46,10 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final byte[] bytesOfRemovedService;
 
-  // Arguments.
-  protected final Long serviceRequestPayloadLength;
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestRequestKey(
-      byte[] bytesOfRemovedService, Long serviceRequestPayloadLength, Long serviceRequestLength) {
+      long serviceRequestLength, byte[] bytesOfRemovedService) {
     super(serviceRequestLength);
     this.bytesOfRemovedService = bytesOfRemovedService;
-    this.serviceRequestPayloadLength = serviceRequestPayloadLength;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public byte[] getBytesOfRemovedService() {
@@ -109,28 +103,20 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetConfirmedServiceRequestRequestKey");
     // Create the instance
-    return new BACnetConfirmedServiceRequestRequestKeyBuilderImpl(
-        bytesOfRemovedService, serviceRequestPayloadLength, serviceRequestLength);
+    return new BACnetConfirmedServiceRequestRequestKeyBuilderImpl(bytesOfRemovedService);
   }
 
   public static class BACnetConfirmedServiceRequestRequestKeyBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final byte[] bytesOfRemovedService;
-    private final Long serviceRequestPayloadLength;
-    private final Long serviceRequestLength;
 
-    public BACnetConfirmedServiceRequestRequestKeyBuilderImpl(
-        byte[] bytesOfRemovedService, Long serviceRequestPayloadLength, Long serviceRequestLength) {
+    public BACnetConfirmedServiceRequestRequestKeyBuilderImpl(byte[] bytesOfRemovedService) {
       this.bytesOfRemovedService = bytesOfRemovedService;
-      this.serviceRequestPayloadLength = serviceRequestPayloadLength;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestRequestKey build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestRequestKey build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestRequestKey bACnetConfirmedServiceRequestRequestKey =
-          new BACnetConfirmedServiceRequestRequestKey(
-              bytesOfRemovedService, serviceRequestPayloadLength, serviceRequestLength);
+          new BACnetConfirmedServiceRequestRequestKey(serviceRequestLength, bytesOfRemovedService);
       return bACnetConfirmedServiceRequestRequestKey;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOV.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOV.java
index 7630020a506..c7136da9b83 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOV.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOV.java
@@ -49,21 +49,17 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetContextTagBoolean issueConfirmed;
   protected final BACnetContextTagUnsignedInteger lifetimeInSeconds;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestSubscribeCOV(
+      long serviceRequestLength,
       BACnetContextTagUnsignedInteger subscriberProcessIdentifier,
       BACnetContextTagObjectIdentifier monitoredObjectIdentifier,
       BACnetContextTagBoolean issueConfirmed,
-      BACnetContextTagUnsignedInteger lifetimeInSeconds,
-      Long serviceRequestLength) {
+      BACnetContextTagUnsignedInteger lifetimeInSeconds) {
     super(serviceRequestLength);
     this.subscriberProcessIdentifier = subscriberProcessIdentifier;
     this.monitoredObjectIdentifier = monitoredObjectIdentifier;
     this.issueConfirmed = issueConfirmed;
     this.lifetimeInSeconds = lifetimeInSeconds;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagUnsignedInteger getSubscriberProcessIdentifier() {
@@ -192,11 +188,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestSubscribeCOV");
     // Create the instance
     return new BACnetConfirmedServiceRequestSubscribeCOVBuilderImpl(
-        subscriberProcessIdentifier,
-        monitoredObjectIdentifier,
-        issueConfirmed,
-        lifetimeInSeconds,
-        serviceRequestLength);
+        subscriberProcessIdentifier, monitoredObjectIdentifier, issueConfirmed, lifetimeInSeconds);
   }
 
   public static class BACnetConfirmedServiceRequestSubscribeCOVBuilderImpl
@@ -205,30 +197,26 @@ public static class BACnetConfirmedServiceRequestSubscribeCOVBuilderImpl
     private final BACnetContextTagObjectIdentifier monitoredObjectIdentifier;
     private final BACnetContextTagBoolean issueConfirmed;
     private final BACnetContextTagUnsignedInteger lifetimeInSeconds;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestSubscribeCOVBuilderImpl(
         BACnetContextTagUnsignedInteger subscriberProcessIdentifier,
         BACnetContextTagObjectIdentifier monitoredObjectIdentifier,
         BACnetContextTagBoolean issueConfirmed,
-        BACnetContextTagUnsignedInteger lifetimeInSeconds,
-        Long serviceRequestLength) {
+        BACnetContextTagUnsignedInteger lifetimeInSeconds) {
       this.subscriberProcessIdentifier = subscriberProcessIdentifier;
       this.monitoredObjectIdentifier = monitoredObjectIdentifier;
       this.issueConfirmed = issueConfirmed;
       this.lifetimeInSeconds = lifetimeInSeconds;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestSubscribeCOV build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestSubscribeCOV build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestSubscribeCOV bACnetConfirmedServiceRequestSubscribeCOV =
           new BACnetConfirmedServiceRequestSubscribeCOV(
+              serviceRequestLength,
               subscriberProcessIdentifier,
               monitoredObjectIdentifier,
               issueConfirmed,
-              lifetimeInSeconds,
-              serviceRequestLength);
+              lifetimeInSeconds);
       return bACnetConfirmedServiceRequestSubscribeCOV;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVProperty.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVProperty.java
index 42de0f29e1d..928294fd2a1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVProperty.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVProperty.java
@@ -51,17 +51,14 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetPropertyReferenceEnclosed monitoredPropertyIdentifier;
   protected final BACnetContextTagReal covIncrement;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestSubscribeCOVProperty(
+      long serviceRequestLength,
       BACnetContextTagUnsignedInteger subscriberProcessIdentifier,
       BACnetContextTagObjectIdentifier monitoredObjectIdentifier,
       BACnetContextTagBoolean issueConfirmedNotifications,
       BACnetContextTagUnsignedInteger lifetime,
       BACnetPropertyReferenceEnclosed monitoredPropertyIdentifier,
-      BACnetContextTagReal covIncrement,
-      Long serviceRequestLength) {
+      BACnetContextTagReal covIncrement) {
     super(serviceRequestLength);
     this.subscriberProcessIdentifier = subscriberProcessIdentifier;
     this.monitoredObjectIdentifier = monitoredObjectIdentifier;
@@ -69,7 +66,6 @@ public BACnetConfirmedServiceRequestSubscribeCOVProperty(
     this.lifetime = lifetime;
     this.monitoredPropertyIdentifier = monitoredPropertyIdentifier;
     this.covIncrement = covIncrement;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagUnsignedInteger getSubscriberProcessIdentifier() {
@@ -244,8 +240,7 @@ public int getLengthInBits() {
         issueConfirmedNotifications,
         lifetime,
         monitoredPropertyIdentifier,
-        covIncrement,
-        serviceRequestLength);
+        covIncrement);
   }
 
   public static class BACnetConfirmedServiceRequestSubscribeCOVPropertyBuilderImpl
@@ -256,7 +251,6 @@ public static class BACnetConfirmedServiceRequestSubscribeCOVPropertyBuilderImpl
     private final BACnetContextTagUnsignedInteger lifetime;
     private final BACnetPropertyReferenceEnclosed monitoredPropertyIdentifier;
     private final BACnetContextTagReal covIncrement;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestSubscribeCOVPropertyBuilderImpl(
         BACnetContextTagUnsignedInteger subscriberProcessIdentifier,
@@ -264,29 +258,26 @@ public BACnetConfirmedServiceRequestSubscribeCOVPropertyBuilderImpl(
         BACnetContextTagBoolean issueConfirmedNotifications,
         BACnetContextTagUnsignedInteger lifetime,
         BACnetPropertyReferenceEnclosed monitoredPropertyIdentifier,
-        BACnetContextTagReal covIncrement,
-        Long serviceRequestLength) {
+        BACnetContextTagReal covIncrement) {
       this.subscriberProcessIdentifier = subscriberProcessIdentifier;
       this.monitoredObjectIdentifier = monitoredObjectIdentifier;
       this.issueConfirmedNotifications = issueConfirmedNotifications;
       this.lifetime = lifetime;
       this.monitoredPropertyIdentifier = monitoredPropertyIdentifier;
       this.covIncrement = covIncrement;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestSubscribeCOVProperty build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestSubscribeCOVProperty build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestSubscribeCOVProperty
           bACnetConfirmedServiceRequestSubscribeCOVProperty =
               new BACnetConfirmedServiceRequestSubscribeCOVProperty(
+                  serviceRequestLength,
                   subscriberProcessIdentifier,
                   monitoredObjectIdentifier,
                   issueConfirmedNotifications,
                   lifetime,
                   monitoredPropertyIdentifier,
-                  covIncrement,
-                  serviceRequestLength);
+                  covIncrement);
       return bACnetConfirmedServiceRequestSubscribeCOVProperty;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.java
index ef20cac2f22..96a96edec1b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.java
@@ -52,24 +52,20 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList
       listOfCovSubscriptionSpecifications;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple(
+      long serviceRequestLength,
       BACnetContextTagUnsignedInteger subscriberProcessIdentifier,
       BACnetContextTagBoolean issueConfirmedNotifications,
       BACnetContextTagUnsignedInteger lifetime,
       BACnetContextTagUnsignedInteger maxNotificationDelay,
       BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList
-          listOfCovSubscriptionSpecifications,
-      Long serviceRequestLength) {
+          listOfCovSubscriptionSpecifications) {
     super(serviceRequestLength);
     this.subscriberProcessIdentifier = subscriberProcessIdentifier;
     this.issueConfirmedNotifications = issueConfirmedNotifications;
     this.lifetime = lifetime;
     this.maxNotificationDelay = maxNotificationDelay;
     this.listOfCovSubscriptionSpecifications = listOfCovSubscriptionSpecifications;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagUnsignedInteger getSubscriberProcessIdentifier() {
@@ -229,8 +225,7 @@ public int getLengthInBits() {
         issueConfirmedNotifications,
         lifetime,
         maxNotificationDelay,
-        listOfCovSubscriptionSpecifications,
-        serviceRequestLength);
+        listOfCovSubscriptionSpecifications);
   }
 
   public static class BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleBuilderImpl
@@ -242,7 +237,6 @@ public static class BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleBui
     private final
     BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList
         listOfCovSubscriptionSpecifications;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleBuilderImpl(
         BACnetContextTagUnsignedInteger subscriberProcessIdentifier,
@@ -250,27 +244,25 @@ public BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleBuilderImpl(
         BACnetContextTagUnsignedInteger lifetime,
         BACnetContextTagUnsignedInteger maxNotificationDelay,
         BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList
-            listOfCovSubscriptionSpecifications,
-        Long serviceRequestLength) {
+            listOfCovSubscriptionSpecifications) {
       this.subscriberProcessIdentifier = subscriberProcessIdentifier;
       this.issueConfirmedNotifications = issueConfirmedNotifications;
       this.lifetime = lifetime;
       this.maxNotificationDelay = maxNotificationDelay;
       this.listOfCovSubscriptionSpecifications = listOfCovSubscriptionSpecifications;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
     public BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple build(
-        Long serviceRequestLength) {
+        long serviceRequestLength) {
       BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple
           bACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple =
               new BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple(
+                  serviceRequestLength,
                   subscriberProcessIdentifier,
                   issueConfirmedNotifications,
                   lifetime,
                   maxNotificationDelay,
-                  listOfCovSubscriptionSpecifications,
-                  serviceRequestLength);
+                  listOfCovSubscriptionSpecifications);
       return bACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList.java
index 938b350be97..44e1ded2d98 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList.java
@@ -46,22 +46,17 @@ class BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscrip
       specifications;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public
   BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList(
       BACnetOpeningTag openingTag,
       List<
               BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications>
           specifications,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.specifications = specifications;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -167,7 +162,7 @@ public int getLengthInBits() {
         _bACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList;
     _bACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList =
         new BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList(
-            openingTag, specifications, closingTag, tagNumber);
+            openingTag, specifications, closingTag);
     return _bACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestUnknown.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestUnknown.java
index ce10daa1de7..dbf4f608b1d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestUnknown.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestUnknown.java
@@ -46,16 +46,9 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final byte[] unknownBytes;
 
-  // Arguments.
-  protected final Long serviceRequestPayloadLength;
-  protected final Long serviceRequestLength;
-
-  public BACnetConfirmedServiceRequestUnknown(
-      byte[] unknownBytes, Long serviceRequestPayloadLength, Long serviceRequestLength) {
+  public BACnetConfirmedServiceRequestUnknown(long serviceRequestLength, byte[] unknownBytes) {
     super(serviceRequestLength);
     this.unknownBytes = unknownBytes;
-    this.serviceRequestPayloadLength = serviceRequestPayloadLength;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public byte[] getUnknownBytes() {
@@ -107,28 +100,20 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetConfirmedServiceRequestUnknown");
     // Create the instance
-    return new BACnetConfirmedServiceRequestUnknownBuilderImpl(
-        unknownBytes, serviceRequestPayloadLength, serviceRequestLength);
+    return new BACnetConfirmedServiceRequestUnknownBuilderImpl(unknownBytes);
   }
 
   public static class BACnetConfirmedServiceRequestUnknownBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final byte[] unknownBytes;
-    private final Long serviceRequestPayloadLength;
-    private final Long serviceRequestLength;
 
-    public BACnetConfirmedServiceRequestUnknownBuilderImpl(
-        byte[] unknownBytes, Long serviceRequestPayloadLength, Long serviceRequestLength) {
+    public BACnetConfirmedServiceRequestUnknownBuilderImpl(byte[] unknownBytes) {
       this.unknownBytes = unknownBytes;
-      this.serviceRequestPayloadLength = serviceRequestPayloadLength;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestUnknown build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestUnknown build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestUnknown bACnetConfirmedServiceRequestUnknown =
-          new BACnetConfirmedServiceRequestUnknown(
-              unknownBytes, serviceRequestPayloadLength, serviceRequestLength);
+          new BACnetConfirmedServiceRequestUnknown(serviceRequestLength, unknownBytes);
       return bACnetConfirmedServiceRequestUnknown;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTClose.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTClose.java
index bbeecf86a61..a135491d10a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTClose.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTClose.java
@@ -46,18 +46,11 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final List<BACnetApplicationTagUnsignedInteger> listOfRemoteVtSessionIdentifiers;
 
-  // Arguments.
-  protected final Long serviceRequestPayloadLength;
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestVTClose(
-      List<BACnetApplicationTagUnsignedInteger> listOfRemoteVtSessionIdentifiers,
-      Long serviceRequestPayloadLength,
-      Long serviceRequestLength) {
+      long serviceRequestLength,
+      List<BACnetApplicationTagUnsignedInteger> listOfRemoteVtSessionIdentifiers) {
     super(serviceRequestLength);
     this.listOfRemoteVtSessionIdentifiers = listOfRemoteVtSessionIdentifiers;
-    this.serviceRequestPayloadLength = serviceRequestPayloadLength;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public List<BACnetApplicationTagUnsignedInteger> getListOfRemoteVtSessionIdentifiers() {
@@ -119,30 +112,22 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetConfirmedServiceRequestVTClose");
     // Create the instance
-    return new BACnetConfirmedServiceRequestVTCloseBuilderImpl(
-        listOfRemoteVtSessionIdentifiers, serviceRequestPayloadLength, serviceRequestLength);
+    return new BACnetConfirmedServiceRequestVTCloseBuilderImpl(listOfRemoteVtSessionIdentifiers);
   }
 
   public static class BACnetConfirmedServiceRequestVTCloseBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final List<BACnetApplicationTagUnsignedInteger> listOfRemoteVtSessionIdentifiers;
-    private final Long serviceRequestPayloadLength;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestVTCloseBuilderImpl(
-        List<BACnetApplicationTagUnsignedInteger> listOfRemoteVtSessionIdentifiers,
-        Long serviceRequestPayloadLength,
-        Long serviceRequestLength) {
+        List<BACnetApplicationTagUnsignedInteger> listOfRemoteVtSessionIdentifiers) {
       this.listOfRemoteVtSessionIdentifiers = listOfRemoteVtSessionIdentifiers;
-      this.serviceRequestPayloadLength = serviceRequestPayloadLength;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestVTClose build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestVTClose build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestVTClose bACnetConfirmedServiceRequestVTClose =
           new BACnetConfirmedServiceRequestVTClose(
-              listOfRemoteVtSessionIdentifiers, serviceRequestPayloadLength, serviceRequestLength);
+              serviceRequestLength, listOfRemoteVtSessionIdentifiers);
       return bACnetConfirmedServiceRequestVTClose;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTData.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTData.java
index f929a797fea..eb509265b82 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTData.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTData.java
@@ -48,19 +48,15 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetApplicationTagOctetString vtNewData;
   protected final BACnetApplicationTagUnsignedInteger vtDataFlag;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestVTData(
+      long serviceRequestLength,
       BACnetApplicationTagUnsignedInteger vtSessionIdentifier,
       BACnetApplicationTagOctetString vtNewData,
-      BACnetApplicationTagUnsignedInteger vtDataFlag,
-      Long serviceRequestLength) {
+      BACnetApplicationTagUnsignedInteger vtDataFlag) {
     super(serviceRequestLength);
     this.vtSessionIdentifier = vtSessionIdentifier;
     this.vtNewData = vtNewData;
     this.vtDataFlag = vtDataFlag;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetApplicationTagUnsignedInteger getVtSessionIdentifier() {
@@ -153,7 +149,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestVTData");
     // Create the instance
     return new BACnetConfirmedServiceRequestVTDataBuilderImpl(
-        vtSessionIdentifier, vtNewData, vtDataFlag, serviceRequestLength);
+        vtSessionIdentifier, vtNewData, vtDataFlag);
   }
 
   public static class BACnetConfirmedServiceRequestVTDataBuilderImpl
@@ -161,24 +157,20 @@ public static class BACnetConfirmedServiceRequestVTDataBuilderImpl
     private final BACnetApplicationTagUnsignedInteger vtSessionIdentifier;
     private final BACnetApplicationTagOctetString vtNewData;
     private final BACnetApplicationTagUnsignedInteger vtDataFlag;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestVTDataBuilderImpl(
         BACnetApplicationTagUnsignedInteger vtSessionIdentifier,
         BACnetApplicationTagOctetString vtNewData,
-        BACnetApplicationTagUnsignedInteger vtDataFlag,
-        Long serviceRequestLength) {
+        BACnetApplicationTagUnsignedInteger vtDataFlag) {
       this.vtSessionIdentifier = vtSessionIdentifier;
       this.vtNewData = vtNewData;
       this.vtDataFlag = vtDataFlag;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestVTData build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestVTData build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestVTData bACnetConfirmedServiceRequestVTData =
           new BACnetConfirmedServiceRequestVTData(
-              vtSessionIdentifier, vtNewData, vtDataFlag, serviceRequestLength);
+              serviceRequestLength, vtSessionIdentifier, vtNewData, vtDataFlag);
       return bACnetConfirmedServiceRequestVTData;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTOpen.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTOpen.java
index 3ee71f2a8a2..d094ba5955b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTOpen.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTOpen.java
@@ -47,17 +47,13 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetVTClassTagged vtClass;
   protected final BACnetApplicationTagUnsignedInteger localVtSessionIdentifier;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestVTOpen(
+      long serviceRequestLength,
       BACnetVTClassTagged vtClass,
-      BACnetApplicationTagUnsignedInteger localVtSessionIdentifier,
-      Long serviceRequestLength) {
+      BACnetApplicationTagUnsignedInteger localVtSessionIdentifier) {
     super(serviceRequestLength);
     this.vtClass = vtClass;
     this.localVtSessionIdentifier = localVtSessionIdentifier;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetVTClassTagged getVtClass() {
@@ -132,30 +128,24 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetConfirmedServiceRequestVTOpen");
     // Create the instance
-    return new BACnetConfirmedServiceRequestVTOpenBuilderImpl(
-        vtClass, localVtSessionIdentifier, serviceRequestLength);
+    return new BACnetConfirmedServiceRequestVTOpenBuilderImpl(vtClass, localVtSessionIdentifier);
   }
 
   public static class BACnetConfirmedServiceRequestVTOpenBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final BACnetVTClassTagged vtClass;
     private final BACnetApplicationTagUnsignedInteger localVtSessionIdentifier;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestVTOpenBuilderImpl(
-        BACnetVTClassTagged vtClass,
-        BACnetApplicationTagUnsignedInteger localVtSessionIdentifier,
-        Long serviceRequestLength) {
+        BACnetVTClassTagged vtClass, BACnetApplicationTagUnsignedInteger localVtSessionIdentifier) {
       this.vtClass = vtClass;
       this.localVtSessionIdentifier = localVtSessionIdentifier;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestVTOpen build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestVTOpen build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestVTOpen bACnetConfirmedServiceRequestVTOpen =
           new BACnetConfirmedServiceRequestVTOpen(
-              vtClass, localVtSessionIdentifier, serviceRequestLength);
+              serviceRequestLength, vtClass, localVtSessionIdentifier);
       return bACnetConfirmedServiceRequestVTOpen;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWriteProperty.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWriteProperty.java
index d60888be947..655feae2095 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWriteProperty.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWriteProperty.java
@@ -50,23 +50,19 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetConstructedData propertyValue;
   protected final BACnetContextTagUnsignedInteger priority;
 
-  // Arguments.
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestWriteProperty(
+      long serviceRequestLength,
       BACnetContextTagObjectIdentifier objectIdentifier,
       BACnetPropertyIdentifierTagged propertyIdentifier,
       BACnetContextTagUnsignedInteger arrayIndex,
       BACnetConstructedData propertyValue,
-      BACnetContextTagUnsignedInteger priority,
-      Long serviceRequestLength) {
+      BACnetContextTagUnsignedInteger priority) {
     super(serviceRequestLength);
     this.objectIdentifier = objectIdentifier;
     this.propertyIdentifier = propertyIdentifier;
     this.arrayIndex = arrayIndex;
     this.propertyValue = propertyValue;
     this.priority = priority;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagObjectIdentifier getObjectIdentifier() {
@@ -216,12 +212,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetConfirmedServiceRequestWriteProperty");
     // Create the instance
     return new BACnetConfirmedServiceRequestWritePropertyBuilderImpl(
-        objectIdentifier,
-        propertyIdentifier,
-        arrayIndex,
-        propertyValue,
-        priority,
-        serviceRequestLength);
+        objectIdentifier, propertyIdentifier, arrayIndex, propertyValue, priority);
   }
 
   public static class BACnetConfirmedServiceRequestWritePropertyBuilderImpl
@@ -231,33 +222,29 @@ public static class BACnetConfirmedServiceRequestWritePropertyBuilderImpl
     private final BACnetContextTagUnsignedInteger arrayIndex;
     private final BACnetConstructedData propertyValue;
     private final BACnetContextTagUnsignedInteger priority;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestWritePropertyBuilderImpl(
         BACnetContextTagObjectIdentifier objectIdentifier,
         BACnetPropertyIdentifierTagged propertyIdentifier,
         BACnetContextTagUnsignedInteger arrayIndex,
         BACnetConstructedData propertyValue,
-        BACnetContextTagUnsignedInteger priority,
-        Long serviceRequestLength) {
+        BACnetContextTagUnsignedInteger priority) {
       this.objectIdentifier = objectIdentifier;
       this.propertyIdentifier = propertyIdentifier;
       this.arrayIndex = arrayIndex;
       this.propertyValue = propertyValue;
       this.priority = priority;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestWriteProperty build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestWriteProperty build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestWriteProperty bACnetConfirmedServiceRequestWriteProperty =
           new BACnetConfirmedServiceRequestWriteProperty(
+              serviceRequestLength,
               objectIdentifier,
               propertyIdentifier,
               arrayIndex,
               propertyValue,
-              priority,
-              serviceRequestLength);
+              priority);
       return bACnetConfirmedServiceRequestWriteProperty;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWritePropertyMultiple.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWritePropertyMultiple.java
index 7d1403f0a4b..a59200b5202 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWritePropertyMultiple.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWritePropertyMultiple.java
@@ -46,18 +46,10 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final List<BACnetWriteAccessSpecification> data;
 
-  // Arguments.
-  protected final Long serviceRequestPayloadLength;
-  protected final Long serviceRequestLength;
-
   public BACnetConfirmedServiceRequestWritePropertyMultiple(
-      List<BACnetWriteAccessSpecification> data,
-      Long serviceRequestPayloadLength,
-      Long serviceRequestLength) {
+      long serviceRequestLength, List<BACnetWriteAccessSpecification> data) {
     super(serviceRequestLength);
     this.data = data;
-    this.serviceRequestPayloadLength = serviceRequestPayloadLength;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public List<BACnetWriteAccessSpecification> getData() {
@@ -114,31 +106,22 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetConfirmedServiceRequestWritePropertyMultiple");
     // Create the instance
-    return new BACnetConfirmedServiceRequestWritePropertyMultipleBuilderImpl(
-        data, serviceRequestPayloadLength, serviceRequestLength);
+    return new BACnetConfirmedServiceRequestWritePropertyMultipleBuilderImpl(data);
   }
 
   public static class BACnetConfirmedServiceRequestWritePropertyMultipleBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final List<BACnetWriteAccessSpecification> data;
-    private final Long serviceRequestPayloadLength;
-    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestWritePropertyMultipleBuilderImpl(
-        List<BACnetWriteAccessSpecification> data,
-        Long serviceRequestPayloadLength,
-        Long serviceRequestLength) {
+        List<BACnetWriteAccessSpecification> data) {
       this.data = data;
-      this.serviceRequestPayloadLength = serviceRequestPayloadLength;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetConfirmedServiceRequestWritePropertyMultiple build(Long serviceRequestLength) {
-
+    public BACnetConfirmedServiceRequestWritePropertyMultiple build(long serviceRequestLength) {
       BACnetConfirmedServiceRequestWritePropertyMultiple
           bACnetConfirmedServiceRequestWritePropertyMultiple =
-              new BACnetConfirmedServiceRequestWritePropertyMultiple(
-                  data, serviceRequestPayloadLength, serviceRequestLength);
+              new BACnetConfirmedServiceRequestWritePropertyMultiple(serviceRequestLength, data);
       return bACnetConfirmedServiceRequestWritePropertyMultiple;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedData.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedData.java
index d9dc0a40fb7..739e9fc4ae9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedData.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedData.java
@@ -47,22 +47,12 @@ public abstract class BACnetConstructedData implements Message {
   protected final BACnetTagHeader peekedTagHeader;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedData(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.peekedTagHeader = peekedTagHeader;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -7069,17 +7059,13 @@ public static BACnetConstructedData staticParse(
     readBuffer.closeContext("BACnetConstructedData");
     // Create the instance
     BACnetConstructedData _bACnetConstructedData =
-        builder.build(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+        builder.build(openingTag, peekedTagHeader, closingTag);
     return _bACnetConstructedData;
   }
 
   public interface BACnetConstructedDataBuilder {
     BACnetConstructedData build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument);
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag);
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDULength.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDULength.java
index b02bfafa833..c35fcf00bad 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDULength.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDULength.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger apduLength;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAPDULength(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger apduLength,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger apduLength) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.apduLength = apduLength;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getApduLength() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAPDULength");
     // Create the instance
-    return new BACnetConstructedDataAPDULengthBuilderImpl(
-        apduLength, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAPDULengthBuilderImpl(apduLength);
   }
 
   public static class BACnetConstructedDataAPDULengthBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger apduLength;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAPDULengthBuilderImpl(
-        BACnetApplicationTagUnsignedInteger apduLength,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger apduLength) {
       this.apduLength = apduLength;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAPDULength build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAPDULength bACnetConstructedDataAPDULength =
-          new BACnetConstructedDataAPDULength(
-              openingTag, peekedTagHeader, closingTag, apduLength, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataAPDULength(openingTag, peekedTagHeader, closingTag, apduLength);
       return bACnetConstructedDataAPDULength;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUSegmentTimeout.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUSegmentTimeout.java
index 0d6ba86352f..46a35023fc8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUSegmentTimeout.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUSegmentTimeout.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger apduSegmentTimeout;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAPDUSegmentTimeout(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger apduSegmentTimeout,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger apduSegmentTimeout) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.apduSegmentTimeout = apduSegmentTimeout;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getApduSegmentTimeout() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAPDUSegmentTimeout");
     // Create the instance
-    return new BACnetConstructedDataAPDUSegmentTimeoutBuilderImpl(
-        apduSegmentTimeout, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAPDUSegmentTimeoutBuilderImpl(apduSegmentTimeout);
   }
 
   public static class BACnetConstructedDataAPDUSegmentTimeoutBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger apduSegmentTimeout;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAPDUSegmentTimeoutBuilderImpl(
-        BACnetApplicationTagUnsignedInteger apduSegmentTimeout,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger apduSegmentTimeout) {
       this.apduSegmentTimeout = apduSegmentTimeout;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAPDUSegmentTimeout build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAPDUSegmentTimeout bACnetConstructedDataAPDUSegmentTimeout =
           new BACnetConstructedDataAPDUSegmentTimeout(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              apduSegmentTimeout,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, apduSegmentTimeout);
       return bACnetConstructedDataAPDUSegmentTimeout;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUTimeout.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUTimeout.java
index e045fbaad46..e0d2692f97d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUTimeout.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUTimeout.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger apduTimeout;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAPDUTimeout(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger apduTimeout,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger apduTimeout) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.apduTimeout = apduTimeout;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getApduTimeout() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAPDUTimeout");
     // Create the instance
-    return new BACnetConstructedDataAPDUTimeoutBuilderImpl(
-        apduTimeout, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAPDUTimeoutBuilderImpl(apduTimeout);
   }
 
   public static class BACnetConstructedDataAPDUTimeoutBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger apduTimeout;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAPDUTimeoutBuilderImpl(
-        BACnetApplicationTagUnsignedInteger apduTimeout,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger apduTimeout) {
       this.apduTimeout = apduTimeout;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAPDUTimeout build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAPDUTimeout bACnetConstructedDataAPDUTimeout =
           new BACnetConstructedDataAPDUTimeout(
-              openingTag, peekedTagHeader, closingTag, apduTimeout, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, apduTimeout);
       return bACnetConstructedDataAPDUTimeout;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAbsenteeLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAbsenteeLimit.java
index 79e18b3bf2e..5ba2a89821c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAbsenteeLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAbsenteeLimit.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger absenteeLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAbsenteeLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger absenteeLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger absenteeLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.absenteeLimit = absenteeLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getAbsenteeLimit() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAbsenteeLimit");
     // Create the instance
-    return new BACnetConstructedDataAbsenteeLimitBuilderImpl(
-        absenteeLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAbsenteeLimitBuilderImpl(absenteeLimit);
   }
 
   public static class BACnetConstructedDataAbsenteeLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger absenteeLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAbsenteeLimitBuilderImpl(
-        BACnetApplicationTagUnsignedInteger absenteeLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger absenteeLimit) {
       this.absenteeLimit = absenteeLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAbsenteeLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAbsenteeLimit bACnetConstructedDataAbsenteeLimit =
           new BACnetConstructedDataAbsenteeLimit(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              absenteeLimit,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, absenteeLimit);
       return bACnetConstructedDataAbsenteeLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAcceptedModes.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAcceptedModes.java
index d59b9cf4d59..2d123338f05 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAcceptedModes.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAcceptedModes.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetLifeSafetyModeTagged> acceptedModes;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAcceptedModes(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetLifeSafetyModeTagged> acceptedModes,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLifeSafetyModeTagged> acceptedModes) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.acceptedModes = acceptedModes;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetLifeSafetyModeTagged> getAcceptedModes() {
@@ -130,39 +122,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAcceptedModes");
     // Create the instance
-    return new BACnetConstructedDataAcceptedModesBuilderImpl(
-        acceptedModes, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAcceptedModesBuilderImpl(acceptedModes);
   }
 
   public static class BACnetConstructedDataAcceptedModesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetLifeSafetyModeTagged> acceptedModes;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAcceptedModesBuilderImpl(
-        List<BACnetLifeSafetyModeTagged> acceptedModes,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetLifeSafetyModeTagged> acceptedModes) {
       this.acceptedModes = acceptedModes;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAcceptedModes build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAcceptedModes bACnetConstructedDataAcceptedModes =
           new BACnetConstructedDataAcceptedModes(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              acceptedModes,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, acceptedModes);
       return bACnetConstructedDataAcceptedModes;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessAlarmEvents.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessAlarmEvents.java
index 7a4b1dd506e..fce3b0bed2f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessAlarmEvents.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessAlarmEvents.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetAccessEventTagged> accessAlarmEvents;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessAlarmEvents(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetAccessEventTagged> accessAlarmEvents,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetAccessEventTagged> accessAlarmEvents) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.accessAlarmEvents = accessAlarmEvents;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetAccessEventTagged> getAccessAlarmEvents() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessAlarmEvents");
     // Create the instance
-    return new BACnetConstructedDataAccessAlarmEventsBuilderImpl(
-        accessAlarmEvents, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessAlarmEventsBuilderImpl(accessAlarmEvents);
   }
 
   public static class BACnetConstructedDataAccessAlarmEventsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetAccessEventTagged> accessAlarmEvents;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccessAlarmEventsBuilderImpl(
-        List<BACnetAccessEventTagged> accessAlarmEvents,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetAccessEventTagged> accessAlarmEvents) {
       this.accessAlarmEvents = accessAlarmEvents;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccessAlarmEvents build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessAlarmEvents bACnetConstructedDataAccessAlarmEvents =
           new BACnetConstructedDataAccessAlarmEvents(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              accessAlarmEvents,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, accessAlarmEvents);
       return bACnetConstructedDataAccessAlarmEvents;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessCredentialAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessCredentialAll.java
index f9fe3fa4406..f274ce486f6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessCredentialAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessCredentialAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessCredentialAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessCredentialAll");
     // Create the instance
-    return new BACnetConstructedDataAccessCredentialAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessCredentialAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataAccessCredentialAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAccessCredentialAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataAccessCredentialAllBuilderImpl() {}
 
     public BACnetConstructedDataAccessCredentialAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessCredentialAll bACnetConstructedDataAccessCredentialAll =
-          new BACnetConstructedDataAccessCredentialAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataAccessCredentialAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataAccessCredentialAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAlarmValues.java
index 51eeeb530c4..72816564c23 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAlarmValues.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetDoorAlarmStateTagged> alarmValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessDoorAlarmValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetDoorAlarmStateTagged> alarmValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDoorAlarmStateTagged> alarmValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.alarmValues = alarmValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetDoorAlarmStateTagged> getAlarmValues() {
@@ -131,34 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessDoorAlarmValues");
     // Create the instance
-    return new BACnetConstructedDataAccessDoorAlarmValuesBuilderImpl(
-        alarmValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessDoorAlarmValuesBuilderImpl(alarmValues);
   }
 
   public static class BACnetConstructedDataAccessDoorAlarmValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetDoorAlarmStateTagged> alarmValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccessDoorAlarmValuesBuilderImpl(
-        List<BACnetDoorAlarmStateTagged> alarmValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDoorAlarmStateTagged> alarmValues) {
       this.alarmValues = alarmValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccessDoorAlarmValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessDoorAlarmValues bACnetConstructedDataAccessDoorAlarmValues =
           new BACnetConstructedDataAccessDoorAlarmValues(
-              openingTag, peekedTagHeader, closingTag, alarmValues, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, alarmValues);
       return bACnetConstructedDataAccessDoorAlarmValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAll.java
index 91d1aec5db9..ab466afa7da 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessDoorAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessDoorAll");
     // Create the instance
-    return new BACnetConstructedDataAccessDoorAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessDoorAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataAccessDoorAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAccessDoorAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataAccessDoorAllBuilderImpl() {}
 
     public BACnetConstructedDataAccessDoorAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessDoorAll bACnetConstructedDataAccessDoorAll =
-          new BACnetConstructedDataAccessDoorAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataAccessDoorAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataAccessDoorAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorFaultValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorFaultValues.java
index 630f621263f..d6c26c59694 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorFaultValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorFaultValues.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetDoorAlarmStateTagged> faultValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessDoorFaultValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetDoorAlarmStateTagged> faultValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDoorAlarmStateTagged> faultValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultValues = faultValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetDoorAlarmStateTagged> getFaultValues() {
@@ -131,34 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessDoorFaultValues");
     // Create the instance
-    return new BACnetConstructedDataAccessDoorFaultValuesBuilderImpl(
-        faultValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessDoorFaultValuesBuilderImpl(faultValues);
   }
 
   public static class BACnetConstructedDataAccessDoorFaultValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetDoorAlarmStateTagged> faultValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccessDoorFaultValuesBuilderImpl(
-        List<BACnetDoorAlarmStateTagged> faultValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDoorAlarmStateTagged> faultValues) {
       this.faultValues = faultValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccessDoorFaultValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessDoorFaultValues bACnetConstructedDataAccessDoorFaultValues =
           new BACnetConstructedDataAccessDoorFaultValues(
-              openingTag, peekedTagHeader, closingTag, faultValues, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, faultValues);
       return bACnetConstructedDataAccessDoorFaultValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorPresentValue.java
index f17c172220c..f4ccd5e9fe4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDoorValueTagged presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessDoorPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDoorValueTagged presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDoorValueTagged presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDoorValueTagged getPresentValue() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessDoorPresentValue");
     // Create the instance
-    return new BACnetConstructedDataAccessDoorPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessDoorPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataAccessDoorPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDoorValueTagged presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccessDoorPresentValueBuilderImpl(
-        BACnetDoorValueTagged presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDoorValueTagged presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccessDoorPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessDoorPresentValue bACnetConstructedDataAccessDoorPresentValue =
           new BACnetConstructedDataAccessDoorPresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataAccessDoorPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorRelinquishDefault.java
index ee8aee67df9..87e06d0c8a1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDoorValueTagged relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessDoorRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDoorValueTagged relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDoorValueTagged relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDoorValueTagged getRelinquishDefault() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessDoorRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataAccessDoorRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessDoorRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataAccessDoorRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDoorValueTagged relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccessDoorRelinquishDefaultBuilderImpl(
-        BACnetDoorValueTagged relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDoorValueTagged relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccessDoorRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessDoorRelinquishDefault
           bACnetConstructedDataAccessDoorRelinquishDefault =
               new BACnetConstructedDataAccessDoorRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataAccessDoorRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoors.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoors.java
index c3448298e43..3b153e408b0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoors.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoors.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetDeviceObjectReference> accessDoors;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessDoors(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetDeviceObjectReference> accessDoors,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDeviceObjectReference> accessDoors) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.accessDoors = accessDoors;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (accessDoors)
     writeComplexTypeArrayField("accessDoors", accessDoors, writeBuffer);
@@ -169,43 +157,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessDoors");
     // Create the instance
-    return new BACnetConstructedDataAccessDoorsBuilderImpl(
-        numberOfDataElements, accessDoors, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessDoorsBuilderImpl(numberOfDataElements, accessDoors);
   }
 
   public static class BACnetConstructedDataAccessDoorsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetDeviceObjectReference> accessDoors;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccessDoorsBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetDeviceObjectReference> accessDoors,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDeviceObjectReference> accessDoors) {
       this.numberOfDataElements = numberOfDataElements;
       this.accessDoors = accessDoors;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccessDoors build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessDoors bACnetConstructedDataAccessDoors =
           new BACnetConstructedDataAccessDoors(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              accessDoors,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, accessDoors);
       return bACnetConstructedDataAccessDoors;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEvent.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEvent.java
index 22509f735ff..3f5982e7d82 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEvent.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEvent.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetAccessEventTagged accessEvent;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessEvent(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetAccessEventTagged accessEvent,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetAccessEventTagged accessEvent) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.accessEvent = accessEvent;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetAccessEventTagged getAccessEvent() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessEvent");
     // Create the instance
-    return new BACnetConstructedDataAccessEventBuilderImpl(
-        accessEvent, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessEventBuilderImpl(accessEvent);
   }
 
   public static class BACnetConstructedDataAccessEventBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetAccessEventTagged accessEvent;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAccessEventBuilderImpl(
-        BACnetAccessEventTagged accessEvent,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataAccessEventBuilderImpl(BACnetAccessEventTagged accessEvent) {
       this.accessEvent = accessEvent;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccessEvent build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessEvent bACnetConstructedDataAccessEvent =
           new BACnetConstructedDataAccessEvent(
-              openingTag, peekedTagHeader, closingTag, accessEvent, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, accessEvent);
       return bACnetConstructedDataAccessEvent;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventAuthenticationFactor.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventAuthenticationFactor.java
index c61d8296a9e..a4cfc1f1d21 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventAuthenticationFactor.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventAuthenticationFactor.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetAuthenticationFactor accessEventAuthenticationFactor;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessEventAuthenticationFactor(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetAuthenticationFactor accessEventAuthenticationFactor,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetAuthenticationFactor accessEventAuthenticationFactor) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.accessEventAuthenticationFactor = accessEventAuthenticationFactor;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetAuthenticationFactor getAccessEventAuthenticationFactor() {
@@ -136,39 +128,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataAccessEventAuthenticationFactor");
     // Create the instance
     return new BACnetConstructedDataAccessEventAuthenticationFactorBuilderImpl(
-        accessEventAuthenticationFactor, tagNumber, arrayIndexArgument);
+        accessEventAuthenticationFactor);
   }
 
   public static class BACnetConstructedDataAccessEventAuthenticationFactorBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetAuthenticationFactor accessEventAuthenticationFactor;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccessEventAuthenticationFactorBuilderImpl(
-        BACnetAuthenticationFactor accessEventAuthenticationFactor,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetAuthenticationFactor accessEventAuthenticationFactor) {
       this.accessEventAuthenticationFactor = accessEventAuthenticationFactor;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccessEventAuthenticationFactor build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessEventAuthenticationFactor
           bACnetConstructedDataAccessEventAuthenticationFactor =
               new BACnetConstructedDataAccessEventAuthenticationFactor(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  accessEventAuthenticationFactor,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, accessEventAuthenticationFactor);
       return bACnetConstructedDataAccessEventAuthenticationFactor;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventCredential.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventCredential.java
index 24beb9b8059..523d8ce239b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventCredential.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventCredential.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDeviceObjectReference accessEventCredential;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessEventCredential(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDeviceObjectReference accessEventCredential,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDeviceObjectReference accessEventCredential) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.accessEventCredential = accessEventCredential;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDeviceObjectReference getAccessEventCredential() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessEventCredential");
     // Create the instance
-    return new BACnetConstructedDataAccessEventCredentialBuilderImpl(
-        accessEventCredential, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessEventCredentialBuilderImpl(accessEventCredential);
   }
 
   public static class BACnetConstructedDataAccessEventCredentialBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDeviceObjectReference accessEventCredential;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccessEventCredentialBuilderImpl(
-        BACnetDeviceObjectReference accessEventCredential,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDeviceObjectReference accessEventCredential) {
       this.accessEventCredential = accessEventCredential;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccessEventCredential build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessEventCredential bACnetConstructedDataAccessEventCredential =
           new BACnetConstructedDataAccessEventCredential(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              accessEventCredential,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, accessEventCredential);
       return bACnetConstructedDataAccessEventCredential;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTag.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTag.java
index 99597e4922a..cb5bdc1f72a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTag.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTag.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger accessEventTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessEventTag(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger accessEventTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger accessEventTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.accessEventTag = accessEventTag;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getAccessEventTag() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessEventTag");
     // Create the instance
-    return new BACnetConstructedDataAccessEventTagBuilderImpl(
-        accessEventTag, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessEventTagBuilderImpl(accessEventTag);
   }
 
   public static class BACnetConstructedDataAccessEventTagBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger accessEventTag;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccessEventTagBuilderImpl(
-        BACnetApplicationTagUnsignedInteger accessEventTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger accessEventTag) {
       this.accessEventTag = accessEventTag;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccessEventTag build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessEventTag bACnetConstructedDataAccessEventTag =
           new BACnetConstructedDataAccessEventTag(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              accessEventTag,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, accessEventTag);
       return bACnetConstructedDataAccessEventTag;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTime.java
index 41ddc2a158e..8c2a0a0317a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetTimeStamp accessEventTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessEventTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetTimeStamp accessEventTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetTimeStamp accessEventTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.accessEventTime = accessEventTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetTimeStamp getAccessEventTime() {
@@ -130,39 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessEventTime");
     // Create the instance
-    return new BACnetConstructedDataAccessEventTimeBuilderImpl(
-        accessEventTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessEventTimeBuilderImpl(accessEventTime);
   }
 
   public static class BACnetConstructedDataAccessEventTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetTimeStamp accessEventTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAccessEventTimeBuilderImpl(
-        BACnetTimeStamp accessEventTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataAccessEventTimeBuilderImpl(BACnetTimeStamp accessEventTime) {
       this.accessEventTime = accessEventTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccessEventTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessEventTime bACnetConstructedDataAccessEventTime =
           new BACnetConstructedDataAccessEventTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              accessEventTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, accessEventTime);
       return bACnetConstructedDataAccessEventTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessPointAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessPointAll.java
index a712a871a67..c274b85e200 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessPointAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessPointAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessPointAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessPointAll");
     // Create the instance
-    return new BACnetConstructedDataAccessPointAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessPointAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataAccessPointAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAccessPointAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataAccessPointAllBuilderImpl() {}
 
     public BACnetConstructedDataAccessPointAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessPointAll bACnetConstructedDataAccessPointAll =
-          new BACnetConstructedDataAccessPointAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataAccessPointAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataAccessPointAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessRightsAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessRightsAll.java
index ad87939646b..f3b4c8712ac 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessRightsAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessRightsAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessRightsAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessRightsAll");
     // Create the instance
-    return new BACnetConstructedDataAccessRightsAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessRightsAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataAccessRightsAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAccessRightsAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataAccessRightsAllBuilderImpl() {}
 
     public BACnetConstructedDataAccessRightsAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessRightsAll bACnetConstructedDataAccessRightsAll =
-          new BACnetConstructedDataAccessRightsAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataAccessRightsAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataAccessRightsAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessTransactionEvents.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessTransactionEvents.java
index 6f8f71712ed..947ea6d90ec 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessTransactionEvents.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessTransactionEvents.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetAccessEventTagged> accessTransactionEvents;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessTransactionEvents(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetAccessEventTagged> accessTransactionEvents,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetAccessEventTagged> accessTransactionEvents) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.accessTransactionEvents = accessTransactionEvents;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetAccessEventTagged> getAccessTransactionEvents() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessTransactionEvents");
     // Create the instance
-    return new BACnetConstructedDataAccessTransactionEventsBuilderImpl(
-        accessTransactionEvents, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessTransactionEventsBuilderImpl(accessTransactionEvents);
   }
 
   public static class BACnetConstructedDataAccessTransactionEventsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetAccessEventTagged> accessTransactionEvents;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccessTransactionEventsBuilderImpl(
-        List<BACnetAccessEventTagged> accessTransactionEvents,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetAccessEventTagged> accessTransactionEvents) {
       this.accessTransactionEvents = accessTransactionEvents;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccessTransactionEvents build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessTransactionEvents bACnetConstructedDataAccessTransactionEvents =
           new BACnetConstructedDataAccessTransactionEvents(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              accessTransactionEvents,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, accessTransactionEvents);
       return bACnetConstructedDataAccessTransactionEvents;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessUserAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessUserAll.java
index 85988955382..0f1b60de51f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessUserAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessUserAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessUserAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessUserAll");
     // Create the instance
-    return new BACnetConstructedDataAccessUserAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessUserAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataAccessUserAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAccessUserAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataAccessUserAllBuilderImpl() {}
 
     public BACnetConstructedDataAccessUserAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessUserAll bACnetConstructedDataAccessUserAll =
-          new BACnetConstructedDataAccessUserAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataAccessUserAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataAccessUserAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAdjustValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAdjustValue.java
index 626912d2759..702c5751deb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAdjustValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAdjustValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger adjustValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessZoneAdjustValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger adjustValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger adjustValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.adjustValue = adjustValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getAdjustValue() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessZoneAdjustValue");
     // Create the instance
-    return new BACnetConstructedDataAccessZoneAdjustValueBuilderImpl(
-        adjustValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessZoneAdjustValueBuilderImpl(adjustValue);
   }
 
   public static class BACnetConstructedDataAccessZoneAdjustValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger adjustValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccessZoneAdjustValueBuilderImpl(
-        BACnetApplicationTagSignedInteger adjustValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagSignedInteger adjustValue) {
       this.adjustValue = adjustValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccessZoneAdjustValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessZoneAdjustValue bACnetConstructedDataAccessZoneAdjustValue =
           new BACnetConstructedDataAccessZoneAdjustValue(
-              openingTag, peekedTagHeader, closingTag, adjustValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, adjustValue);
       return bACnetConstructedDataAccessZoneAdjustValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAlarmValues.java
index f2ad2269a07..8263c360115 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAlarmValues.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetAccessZoneOccupancyStateTagged> alarmValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessZoneAlarmValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetAccessZoneOccupancyStateTagged> alarmValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetAccessZoneOccupancyStateTagged> alarmValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.alarmValues = alarmValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetAccessZoneOccupancyStateTagged> getAlarmValues() {
@@ -131,34 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessZoneAlarmValues");
     // Create the instance
-    return new BACnetConstructedDataAccessZoneAlarmValuesBuilderImpl(
-        alarmValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessZoneAlarmValuesBuilderImpl(alarmValues);
   }
 
   public static class BACnetConstructedDataAccessZoneAlarmValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetAccessZoneOccupancyStateTagged> alarmValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccessZoneAlarmValuesBuilderImpl(
-        List<BACnetAccessZoneOccupancyStateTagged> alarmValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetAccessZoneOccupancyStateTagged> alarmValues) {
       this.alarmValues = alarmValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccessZoneAlarmValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessZoneAlarmValues bACnetConstructedDataAccessZoneAlarmValues =
           new BACnetConstructedDataAccessZoneAlarmValues(
-              openingTag, peekedTagHeader, closingTag, alarmValues, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, alarmValues);
       return bACnetConstructedDataAccessZoneAlarmValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAll.java
index acc47ff31b1..c96ded70274 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccessZoneAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccessZoneAll");
     // Create the instance
-    return new BACnetConstructedDataAccessZoneAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccessZoneAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataAccessZoneAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAccessZoneAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataAccessZoneAllBuilderImpl() {}
 
     public BACnetConstructedDataAccessZoneAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccessZoneAll bACnetConstructedDataAccessZoneAll =
-          new BACnetConstructedDataAccessZoneAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataAccessZoneAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataAccessZoneAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompaniment.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompaniment.java
index 8115ba04fd0..3a689dd1c08 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompaniment.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompaniment.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDeviceObjectReference accompaniment;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccompaniment(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDeviceObjectReference accompaniment,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDeviceObjectReference accompaniment) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.accompaniment = accompaniment;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDeviceObjectReference getAccompaniment() {
@@ -130,39 +122,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccompaniment");
     // Create the instance
-    return new BACnetConstructedDataAccompanimentBuilderImpl(
-        accompaniment, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccompanimentBuilderImpl(accompaniment);
   }
 
   public static class BACnetConstructedDataAccompanimentBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDeviceObjectReference accompaniment;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccompanimentBuilderImpl(
-        BACnetDeviceObjectReference accompaniment,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDeviceObjectReference accompaniment) {
       this.accompaniment = accompaniment;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccompaniment build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccompaniment bACnetConstructedDataAccompaniment =
           new BACnetConstructedDataAccompaniment(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              accompaniment,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, accompaniment);
       return bACnetConstructedDataAccompaniment;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompanimentTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompanimentTime.java
index 0edb62096ce..1080f010c76 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompanimentTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompanimentTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger accompanimentTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccompanimentTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger accompanimentTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger accompanimentTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.accompanimentTime = accompanimentTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getAccompanimentTime() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccompanimentTime");
     // Create the instance
-    return new BACnetConstructedDataAccompanimentTimeBuilderImpl(
-        accompanimentTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccompanimentTimeBuilderImpl(accompanimentTime);
   }
 
   public static class BACnetConstructedDataAccompanimentTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger accompanimentTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccompanimentTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger accompanimentTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger accompanimentTime) {
       this.accompanimentTime = accompanimentTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccompanimentTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccompanimentTime bACnetConstructedDataAccompanimentTime =
           new BACnetConstructedDataAccompanimentTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              accompanimentTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, accompanimentTime);
       return bACnetConstructedDataAccompanimentTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorAll.java
index 0c7f4d64b33..f0ea39734b5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccumulatorAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccumulatorAll");
     // Create the instance
-    return new BACnetConstructedDataAccumulatorAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccumulatorAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataAccumulatorAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAccumulatorAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataAccumulatorAllBuilderImpl() {}
 
     public BACnetConstructedDataAccumulatorAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccumulatorAll bACnetConstructedDataAccumulatorAll =
-          new BACnetConstructedDataAccumulatorAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataAccumulatorAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataAccumulatorAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultHighLimit.java
index 6daea6dadb7..ed17b6855ad 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultHighLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger faultHighLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccumulatorFaultHighLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger faultHighLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger faultHighLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultHighLimit = faultHighLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getFaultHighLimit() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccumulatorFaultHighLimit");
     // Create the instance
-    return new BACnetConstructedDataAccumulatorFaultHighLimitBuilderImpl(
-        faultHighLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccumulatorFaultHighLimitBuilderImpl(faultHighLimit);
   }
 
   public static class BACnetConstructedDataAccumulatorFaultHighLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger faultHighLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccumulatorFaultHighLimitBuilderImpl(
-        BACnetApplicationTagUnsignedInteger faultHighLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger faultHighLimit) {
       this.faultHighLimit = faultHighLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccumulatorFaultHighLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccumulatorFaultHighLimit
           bACnetConstructedDataAccumulatorFaultHighLimit =
               new BACnetConstructedDataAccumulatorFaultHighLimit(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  faultHighLimit,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, faultHighLimit);
       return bACnetConstructedDataAccumulatorFaultHighLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultLowLimit.java
index 36aadbc7be3..09a84aeb3d9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultLowLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger faultLowLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccumulatorFaultLowLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger faultLowLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger faultLowLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultLowLimit = faultLowLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getFaultLowLimit() {
@@ -135,39 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccumulatorFaultLowLimit");
     // Create the instance
-    return new BACnetConstructedDataAccumulatorFaultLowLimitBuilderImpl(
-        faultLowLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccumulatorFaultLowLimitBuilderImpl(faultLowLimit);
   }
 
   public static class BACnetConstructedDataAccumulatorFaultLowLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger faultLowLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccumulatorFaultLowLimitBuilderImpl(
-        BACnetApplicationTagUnsignedInteger faultLowLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger faultLowLimit) {
       this.faultLowLimit = faultLowLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccumulatorFaultLowLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccumulatorFaultLowLimit bACnetConstructedDataAccumulatorFaultLowLimit =
           new BACnetConstructedDataAccumulatorFaultLowLimit(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              faultLowLimit,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, faultLowLimit);
       return bACnetConstructedDataAccumulatorFaultLowLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorHighLimit.java
index aa62b227ee3..8b4aef4fad9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorHighLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger highLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccumulatorHighLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger highLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger highLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.highLimit = highLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getHighLimit() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccumulatorHighLimit");
     // Create the instance
-    return new BACnetConstructedDataAccumulatorHighLimitBuilderImpl(
-        highLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccumulatorHighLimitBuilderImpl(highLimit);
   }
 
   public static class BACnetConstructedDataAccumulatorHighLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger highLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccumulatorHighLimitBuilderImpl(
-        BACnetApplicationTagUnsignedInteger highLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger highLimit) {
       this.highLimit = highLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccumulatorHighLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccumulatorHighLimit bACnetConstructedDataAccumulatorHighLimit =
           new BACnetConstructedDataAccumulatorHighLimit(
-              openingTag, peekedTagHeader, closingTag, highLimit, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, highLimit);
       return bACnetConstructedDataAccumulatorHighLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorLowLimit.java
index 8d06273a8bc..1687eafea6a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorLowLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger lowLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccumulatorLowLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger lowLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger lowLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lowLimit = lowLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getLowLimit() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccumulatorLowLimit");
     // Create the instance
-    return new BACnetConstructedDataAccumulatorLowLimitBuilderImpl(
-        lowLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccumulatorLowLimitBuilderImpl(lowLimit);
   }
 
   public static class BACnetConstructedDataAccumulatorLowLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger lowLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccumulatorLowLimitBuilderImpl(
-        BACnetApplicationTagUnsignedInteger lowLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger lowLimit) {
       this.lowLimit = lowLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccumulatorLowLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccumulatorLowLimit bACnetConstructedDataAccumulatorLowLimit =
           new BACnetConstructedDataAccumulatorLowLimit(
-              openingTag, peekedTagHeader, closingTag, lowLimit, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lowLimit);
       return bACnetConstructedDataAccumulatorLowLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMaxPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMaxPresValue.java
index 17f85050638..ea0dea95b11 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMaxPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMaxPresValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger maxPresValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccumulatorMaxPresValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger maxPresValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger maxPresValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxPresValue = maxPresValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMaxPresValue() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccumulatorMaxPresValue");
     // Create the instance
-    return new BACnetConstructedDataAccumulatorMaxPresValueBuilderImpl(
-        maxPresValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccumulatorMaxPresValueBuilderImpl(maxPresValue);
   }
 
   public static class BACnetConstructedDataAccumulatorMaxPresValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger maxPresValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccumulatorMaxPresValueBuilderImpl(
-        BACnetApplicationTagUnsignedInteger maxPresValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger maxPresValue) {
       this.maxPresValue = maxPresValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccumulatorMaxPresValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccumulatorMaxPresValue bACnetConstructedDataAccumulatorMaxPresValue =
           new BACnetConstructedDataAccumulatorMaxPresValue(
-              openingTag, peekedTagHeader, closingTag, maxPresValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxPresValue);
       return bACnetConstructedDataAccumulatorMaxPresValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMinPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMinPresValue.java
index 17f8774a4da..6eb301dd708 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMinPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMinPresValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger minPresValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAccumulatorMinPresValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger minPresValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger minPresValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.minPresValue = minPresValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMinPresValue() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAccumulatorMinPresValue");
     // Create the instance
-    return new BACnetConstructedDataAccumulatorMinPresValueBuilderImpl(
-        minPresValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAccumulatorMinPresValueBuilderImpl(minPresValue);
   }
 
   public static class BACnetConstructedDataAccumulatorMinPresValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger minPresValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAccumulatorMinPresValueBuilderImpl(
-        BACnetApplicationTagUnsignedInteger minPresValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger minPresValue) {
       this.minPresValue = minPresValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAccumulatorMinPresValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAccumulatorMinPresValue bACnetConstructedDataAccumulatorMinPresValue =
           new BACnetConstructedDataAccumulatorMinPresValue(
-              openingTag, peekedTagHeader, closingTag, minPresValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, minPresValue);
       return bACnetConstructedDataAccumulatorMinPresValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckRequired.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckRequired.java
index d30acdb08e7..330834d59b0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckRequired.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckRequired.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetEventTransitionBitsTagged ackRequired;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAckRequired(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetEventTransitionBitsTagged ackRequired,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetEventTransitionBitsTagged ackRequired) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ackRequired = ackRequired;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetEventTransitionBitsTagged getAckRequired() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAckRequired");
     // Create the instance
-    return new BACnetConstructedDataAckRequiredBuilderImpl(
-        ackRequired, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAckRequiredBuilderImpl(ackRequired);
   }
 
   public static class BACnetConstructedDataAckRequiredBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetEventTransitionBitsTagged ackRequired;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAckRequiredBuilderImpl(
-        BACnetEventTransitionBitsTagged ackRequired,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetEventTransitionBitsTagged ackRequired) {
       this.ackRequired = ackRequired;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAckRequired build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAckRequired bACnetConstructedDataAckRequired =
           new BACnetConstructedDataAckRequired(
-              openingTag, peekedTagHeader, closingTag, ackRequired, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, ackRequired);
       return bACnetConstructedDataAckRequired;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckedTransitions.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckedTransitions.java
index ce9388961d9..764c7bdf971 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckedTransitions.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckedTransitions.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetEventTransitionBitsTagged ackedTransitions;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAckedTransitions(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetEventTransitionBitsTagged ackedTransitions,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetEventTransitionBitsTagged ackedTransitions) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ackedTransitions = ackedTransitions;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetEventTransitionBitsTagged getAckedTransitions() {
@@ -135,39 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAckedTransitions");
     // Create the instance
-    return new BACnetConstructedDataAckedTransitionsBuilderImpl(
-        ackedTransitions, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAckedTransitionsBuilderImpl(ackedTransitions);
   }
 
   public static class BACnetConstructedDataAckedTransitionsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetEventTransitionBitsTagged ackedTransitions;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAckedTransitionsBuilderImpl(
-        BACnetEventTransitionBitsTagged ackedTransitions,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetEventTransitionBitsTagged ackedTransitions) {
       this.ackedTransitions = ackedTransitions;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAckedTransitions build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAckedTransitions bACnetConstructedDataAckedTransitions =
           new BACnetConstructedDataAckedTransitions(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              ackedTransitions,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, ackedTransitions);
       return bACnetConstructedDataAckedTransitions;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAction.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAction.java
index 32af65beaac..d54acac49d0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAction.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAction.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetActionList> actionLists;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAction(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetActionList> actionLists,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetActionList> actionLists) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.actionLists = actionLists;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (actionLists)
     writeComplexTypeArrayField("actionLists", actionLists, writeBuffer);
@@ -169,43 +157,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAction");
     // Create the instance
-    return new BACnetConstructedDataActionBuilderImpl(
-        numberOfDataElements, actionLists, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataActionBuilderImpl(numberOfDataElements, actionLists);
   }
 
   public static class BACnetConstructedDataActionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetActionList> actionLists;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataActionBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetActionList> actionLists,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetActionList> actionLists) {
       this.numberOfDataElements = numberOfDataElements;
       this.actionLists = actionLists;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAction build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAction bACnetConstructedDataAction =
           new BACnetConstructedDataAction(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              actionLists,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, actionLists);
       return bACnetConstructedDataAction;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActionText.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActionText.java
index 584e3597824..2e7a8703757 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActionText.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActionText.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagCharacterString> actionText;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataActionText(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagCharacterString> actionText,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagCharacterString> actionText) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.actionText = actionText;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (actionText)
     writeComplexTypeArrayField("actionText", actionText, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataActionText");
     // Create the instance
-    return new BACnetConstructedDataActionTextBuilderImpl(
-        numberOfDataElements, actionText, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataActionTextBuilderImpl(numberOfDataElements, actionText);
   }
 
   public static class BACnetConstructedDataActionTextBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagCharacterString> actionText;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataActionTextBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagCharacterString> actionText,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagCharacterString> actionText) {
       this.numberOfDataElements = numberOfDataElements;
       this.actionText = actionText;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataActionText build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataActionText bACnetConstructedDataActionText =
           new BACnetConstructedDataActionText(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              actionText,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, actionText);
       return bACnetConstructedDataActionText;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActivationTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActivationTime.java
index 0f24d0fb42f..7669ca315b0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActivationTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActivationTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime activationTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataActivationTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime activationTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime activationTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.activationTime = activationTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getActivationTime() {
@@ -130,39 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataActivationTime");
     // Create the instance
-    return new BACnetConstructedDataActivationTimeBuilderImpl(
-        activationTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataActivationTimeBuilderImpl(activationTime);
   }
 
   public static class BACnetConstructedDataActivationTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime activationTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataActivationTimeBuilderImpl(
-        BACnetDateTime activationTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataActivationTimeBuilderImpl(BACnetDateTime activationTime) {
       this.activationTime = activationTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataActivationTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataActivationTime bACnetConstructedDataActivationTime =
           new BACnetConstructedDataActivationTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              activationTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, activationTime);
       return bACnetConstructedDataActivationTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveAuthenticationPolicy.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveAuthenticationPolicy.java
index 3356b4432aa..ebb31a700c1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveAuthenticationPolicy.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveAuthenticationPolicy.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger activeAuthenticationPolicy;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataActiveAuthenticationPolicy(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger activeAuthenticationPolicy,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger activeAuthenticationPolicy) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.activeAuthenticationPolicy = activeAuthenticationPolicy;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getActiveAuthenticationPolicy() {
@@ -138,39 +130,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataActiveAuthenticationPolicy");
     // Create the instance
     return new BACnetConstructedDataActiveAuthenticationPolicyBuilderImpl(
-        activeAuthenticationPolicy, tagNumber, arrayIndexArgument);
+        activeAuthenticationPolicy);
   }
 
   public static class BACnetConstructedDataActiveAuthenticationPolicyBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger activeAuthenticationPolicy;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataActiveAuthenticationPolicyBuilderImpl(
-        BACnetApplicationTagUnsignedInteger activeAuthenticationPolicy,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger activeAuthenticationPolicy) {
       this.activeAuthenticationPolicy = activeAuthenticationPolicy;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataActiveAuthenticationPolicy build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataActiveAuthenticationPolicy
           bACnetConstructedDataActiveAuthenticationPolicy =
               new BACnetConstructedDataActiveAuthenticationPolicy(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  activeAuthenticationPolicy,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, activeAuthenticationPolicy);
       return bACnetConstructedDataActiveAuthenticationPolicy;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVMultipleSubscriptions.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVMultipleSubscriptions.java
index 5bd0c2282d6..ca8c0cdc276 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVMultipleSubscriptions.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVMultipleSubscriptions.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetCOVMultipleSubscription> activeCOVMultipleSubscriptions;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataActiveCOVMultipleSubscriptions(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetCOVMultipleSubscription> activeCOVMultipleSubscriptions,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetCOVMultipleSubscription> activeCOVMultipleSubscriptions) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.activeCOVMultipleSubscriptions = activeCOVMultipleSubscriptions;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetCOVMultipleSubscription> getActiveCOVMultipleSubscriptions() {
@@ -129,39 +121,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataActiveCOVMultipleSubscriptions");
     // Create the instance
     return new BACnetConstructedDataActiveCOVMultipleSubscriptionsBuilderImpl(
-        activeCOVMultipleSubscriptions, tagNumber, arrayIndexArgument);
+        activeCOVMultipleSubscriptions);
   }
 
   public static class BACnetConstructedDataActiveCOVMultipleSubscriptionsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetCOVMultipleSubscription> activeCOVMultipleSubscriptions;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataActiveCOVMultipleSubscriptionsBuilderImpl(
-        List<BACnetCOVMultipleSubscription> activeCOVMultipleSubscriptions,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetCOVMultipleSubscription> activeCOVMultipleSubscriptions) {
       this.activeCOVMultipleSubscriptions = activeCOVMultipleSubscriptions;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataActiveCOVMultipleSubscriptions build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataActiveCOVMultipleSubscriptions
           bACnetConstructedDataActiveCOVMultipleSubscriptions =
               new BACnetConstructedDataActiveCOVMultipleSubscriptions(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  activeCOVMultipleSubscriptions,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, activeCOVMultipleSubscriptions);
       return bACnetConstructedDataActiveCOVMultipleSubscriptions;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVSubscriptions.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVSubscriptions.java
index c968c7f5f3b..9c8a3f05f7e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVSubscriptions.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVSubscriptions.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetCOVSubscription> activeCOVSubscriptions;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataActiveCOVSubscriptions(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetCOVSubscription> activeCOVSubscriptions,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetCOVSubscription> activeCOVSubscriptions) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.activeCOVSubscriptions = activeCOVSubscriptions;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetCOVSubscription> getActiveCOVSubscriptions() {
@@ -127,39 +119,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataActiveCOVSubscriptions");
     // Create the instance
-    return new BACnetConstructedDataActiveCOVSubscriptionsBuilderImpl(
-        activeCOVSubscriptions, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataActiveCOVSubscriptionsBuilderImpl(activeCOVSubscriptions);
   }
 
   public static class BACnetConstructedDataActiveCOVSubscriptionsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetCOVSubscription> activeCOVSubscriptions;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataActiveCOVSubscriptionsBuilderImpl(
-        List<BACnetCOVSubscription> activeCOVSubscriptions,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetCOVSubscription> activeCOVSubscriptions) {
       this.activeCOVSubscriptions = activeCOVSubscriptions;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataActiveCOVSubscriptions build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataActiveCOVSubscriptions bACnetConstructedDataActiveCOVSubscriptions =
           new BACnetConstructedDataActiveCOVSubscriptions(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              activeCOVSubscriptions,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, activeCOVSubscriptions);
       return bACnetConstructedDataActiveCOVSubscriptions;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveText.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveText.java
index 3eb6e65f81c..e06757fba43 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveText.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveText.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString activeText;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataActiveText(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString activeText,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString activeText) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.activeText = activeText;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getActiveText() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataActiveText");
     // Create the instance
-    return new BACnetConstructedDataActiveTextBuilderImpl(
-        activeText, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataActiveTextBuilderImpl(activeText);
   }
 
   public static class BACnetConstructedDataActiveTextBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString activeText;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataActiveTextBuilderImpl(
-        BACnetApplicationTagCharacterString activeText,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString activeText) {
       this.activeText = activeText;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataActiveText build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataActiveText bACnetConstructedDataActiveText =
-          new BACnetConstructedDataActiveText(
-              openingTag, peekedTagHeader, closingTag, activeText, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataActiveText(openingTag, peekedTagHeader, closingTag, activeText);
       return bACnetConstructedDataActiveText;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveVTSessions.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveVTSessions.java
index f1ddb0c2368..8ed8a72ba2b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveVTSessions.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveVTSessions.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetVTSession> activeVTSession;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataActiveVTSessions(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetVTSession> activeVTSession,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetVTSession> activeVTSession) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.activeVTSession = activeVTSession;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetVTSession> getActiveVTSession() {
@@ -127,39 +119,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataActiveVTSessions");
     // Create the instance
-    return new BACnetConstructedDataActiveVTSessionsBuilderImpl(
-        activeVTSession, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataActiveVTSessionsBuilderImpl(activeVTSession);
   }
 
   public static class BACnetConstructedDataActiveVTSessionsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetVTSession> activeVTSession;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataActiveVTSessionsBuilderImpl(
-        List<BACnetVTSession> activeVTSession,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataActiveVTSessionsBuilderImpl(List<BACnetVTSession> activeVTSession) {
       this.activeVTSession = activeVTSession;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataActiveVTSessions build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataActiveVTSessions bACnetConstructedDataActiveVTSessions =
           new BACnetConstructedDataActiveVTSessions(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              activeVTSession,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, activeVTSession);
       return bACnetConstructedDataActiveVTSessions;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActualShedLevel.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActualShedLevel.java
index 49db804ab64..528f7f417e7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActualShedLevel.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActualShedLevel.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetShedLevel actualShedLevel;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataActualShedLevel(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetShedLevel actualShedLevel,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetShedLevel actualShedLevel) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.actualShedLevel = actualShedLevel;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetShedLevel getActualShedLevel() {
@@ -130,39 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataActualShedLevel");
     // Create the instance
-    return new BACnetConstructedDataActualShedLevelBuilderImpl(
-        actualShedLevel, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataActualShedLevelBuilderImpl(actualShedLevel);
   }
 
   public static class BACnetConstructedDataActualShedLevelBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetShedLevel actualShedLevel;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataActualShedLevelBuilderImpl(
-        BACnetShedLevel actualShedLevel,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataActualShedLevelBuilderImpl(BACnetShedLevel actualShedLevel) {
       this.actualShedLevel = actualShedLevel;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataActualShedLevel build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataActualShedLevel bACnetConstructedDataActualShedLevel =
           new BACnetConstructedDataActualShedLevel(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              actualShedLevel,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, actualShedLevel);
       return bACnetConstructedDataActualShedLevel;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAdjustValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAdjustValue.java
index 95bf7af9713..b76945eeb39 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAdjustValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAdjustValue.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger adjustValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAdjustValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger adjustValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger adjustValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.adjustValue = adjustValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getAdjustValue() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAdjustValue");
     // Create the instance
-    return new BACnetConstructedDataAdjustValueBuilderImpl(
-        adjustValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAdjustValueBuilderImpl(adjustValue);
   }
 
   public static class BACnetConstructedDataAdjustValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger adjustValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAdjustValueBuilderImpl(
-        BACnetApplicationTagSignedInteger adjustValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagSignedInteger adjustValue) {
       this.adjustValue = adjustValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAdjustValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAdjustValue bACnetConstructedDataAdjustValue =
           new BACnetConstructedDataAdjustValue(
-              openingTag, peekedTagHeader, closingTag, adjustValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, adjustValue);
       return bACnetConstructedDataAdjustValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValue.java
index 99c12b33446..fc268b8681d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValue.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetBinaryPVTagged binaryPv;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAlarmValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetBinaryPVTagged binaryPv,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetBinaryPVTagged binaryPv) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.binaryPv = binaryPv;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetBinaryPVTagged getBinaryPv() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAlarmValue");
     // Create the instance
-    return new BACnetConstructedDataAlarmValueBuilderImpl(binaryPv, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAlarmValueBuilderImpl(binaryPv);
   }
 
   public static class BACnetConstructedDataAlarmValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetBinaryPVTagged binaryPv;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAlarmValueBuilderImpl(
-        BACnetBinaryPVTagged binaryPv,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataAlarmValueBuilderImpl(BACnetBinaryPVTagged binaryPv) {
       this.binaryPv = binaryPv;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAlarmValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAlarmValue bACnetConstructedDataAlarmValue =
-          new BACnetConstructedDataAlarmValue(
-              openingTag, peekedTagHeader, closingTag, binaryPv, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataAlarmValue(openingTag, peekedTagHeader, closingTag, binaryPv);
       return bACnetConstructedDataAlarmValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValues.java
index ba50825e029..226e5d6a463 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValues.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetLifeSafetyStateTagged> alarmValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAlarmValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetLifeSafetyStateTagged> alarmValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLifeSafetyStateTagged> alarmValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.alarmValues = alarmValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (alarmValues)
     writeComplexTypeArrayField("alarmValues", alarmValues, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAlarmValues");
     // Create the instance
-    return new BACnetConstructedDataAlarmValuesBuilderImpl(
-        numberOfDataElements, alarmValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAlarmValuesBuilderImpl(numberOfDataElements, alarmValues);
   }
 
   public static class BACnetConstructedDataAlarmValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetLifeSafetyStateTagged> alarmValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAlarmValuesBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetLifeSafetyStateTagged> alarmValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetLifeSafetyStateTagged> alarmValues) {
       this.numberOfDataElements = numberOfDataElements;
       this.alarmValues = alarmValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAlarmValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAlarmValues bACnetConstructedDataAlarmValues =
           new BACnetConstructedDataAlarmValues(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              alarmValues,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, alarmValues);
       return bACnetConstructedDataAlarmValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentAll.java
index 486a58b9f88..accd5563436 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAlertEnrollmentAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAlertEnrollmentAll");
     // Create the instance
-    return new BACnetConstructedDataAlertEnrollmentAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAlertEnrollmentAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataAlertEnrollmentAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAlertEnrollmentAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataAlertEnrollmentAllBuilderImpl() {}
 
     public BACnetConstructedDataAlertEnrollmentAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAlertEnrollmentAll bACnetConstructedDataAlertEnrollmentAll =
-          new BACnetConstructedDataAlertEnrollmentAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataAlertEnrollmentAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataAlertEnrollmentAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentPresentValue.java
index ae918ec42c7..ef50a3c5dcd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagObjectIdentifier presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAlertEnrollmentPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagObjectIdentifier presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagObjectIdentifier presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagObjectIdentifier getPresentValue() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAlertEnrollmentPresentValue");
     // Create the instance
-    return new BACnetConstructedDataAlertEnrollmentPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAlertEnrollmentPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataAlertEnrollmentPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagObjectIdentifier presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAlertEnrollmentPresentValueBuilderImpl(
-        BACnetApplicationTagObjectIdentifier presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagObjectIdentifier presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAlertEnrollmentPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAlertEnrollmentPresentValue
           bACnetConstructedDataAlertEnrollmentPresentValue =
               new BACnetConstructedDataAlertEnrollmentPresentValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  presentValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataAlertEnrollmentPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlignIntervals.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlignIntervals.java
index 0a04db298df..920c7f55746 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlignIntervals.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlignIntervals.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean alignIntervals;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAlignIntervals(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean alignIntervals,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean alignIntervals) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.alignIntervals = alignIntervals;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getAlignIntervals() {
@@ -132,39 +124,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAlignIntervals");
     // Create the instance
-    return new BACnetConstructedDataAlignIntervalsBuilderImpl(
-        alignIntervals, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAlignIntervalsBuilderImpl(alignIntervals);
   }
 
   public static class BACnetConstructedDataAlignIntervalsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean alignIntervals;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAlignIntervalsBuilderImpl(
-        BACnetApplicationTagBoolean alignIntervals,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean alignIntervals) {
       this.alignIntervals = alignIntervals;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAlignIntervals build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAlignIntervals bACnetConstructedDataAlignIntervals =
           new BACnetConstructedDataAlignIntervals(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              alignIntervals,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, alignIntervals);
       return bACnetConstructedDataAlignIntervals;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllWritesSuccessful.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllWritesSuccessful.java
index 886b0ffee59..78cfd22bb74 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllWritesSuccessful.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllWritesSuccessful.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean allWritesSuccessful;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAllWritesSuccessful(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean allWritesSuccessful,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean allWritesSuccessful) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.allWritesSuccessful = allWritesSuccessful;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getAllWritesSuccessful() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAllWritesSuccessful");
     // Create the instance
-    return new BACnetConstructedDataAllWritesSuccessfulBuilderImpl(
-        allWritesSuccessful, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAllWritesSuccessfulBuilderImpl(allWritesSuccessful);
   }
 
   public static class BACnetConstructedDataAllWritesSuccessfulBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean allWritesSuccessful;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAllWritesSuccessfulBuilderImpl(
-        BACnetApplicationTagBoolean allWritesSuccessful,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean allWritesSuccessful) {
       this.allWritesSuccessful = allWritesSuccessful;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAllWritesSuccessful build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAllWritesSuccessful bACnetConstructedDataAllWritesSuccessful =
           new BACnetConstructedDataAllWritesSuccessful(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              allWritesSuccessful,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, allWritesSuccessful);
       return bACnetConstructedDataAllWritesSuccessful;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllowGroupDelayInhibit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllowGroupDelayInhibit.java
index 01289bcca00..2ba33d894dc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllowGroupDelayInhibit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllowGroupDelayInhibit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean allowGroupDelayInhibit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAllowGroupDelayInhibit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean allowGroupDelayInhibit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean allowGroupDelayInhibit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.allowGroupDelayInhibit = allowGroupDelayInhibit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getAllowGroupDelayInhibit() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAllowGroupDelayInhibit");
     // Create the instance
-    return new BACnetConstructedDataAllowGroupDelayInhibitBuilderImpl(
-        allowGroupDelayInhibit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAllowGroupDelayInhibitBuilderImpl(allowGroupDelayInhibit);
   }
 
   public static class BACnetConstructedDataAllowGroupDelayInhibitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean allowGroupDelayInhibit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAllowGroupDelayInhibitBuilderImpl(
-        BACnetApplicationTagBoolean allowGroupDelayInhibit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean allowGroupDelayInhibit) {
       this.allowGroupDelayInhibit = allowGroupDelayInhibit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAllowGroupDelayInhibit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAllowGroupDelayInhibit bACnetConstructedDataAllowGroupDelayInhibit =
           new BACnetConstructedDataAllowGroupDelayInhibit(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              allowGroupDelayInhibit,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, allowGroupDelayInhibit);
       return bACnetConstructedDataAllowGroupDelayInhibit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputAll.java
index 7e68981da7d..a928978001c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogInputAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogInputAll");
     // Create the instance
-    return new BACnetConstructedDataAnalogInputAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogInputAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataAnalogInputAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAnalogInputAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataAnalogInputAllBuilderImpl() {}
 
     public BACnetConstructedDataAnalogInputAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogInputAll bACnetConstructedDataAnalogInputAll =
-          new BACnetConstructedDataAnalogInputAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataAnalogInputAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataAnalogInputAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultHighLimit.java
index 8c5fd00b7b6..2d88b2b3df3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultHighLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal faultHighLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogInputFaultHighLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal faultHighLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal faultHighLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultHighLimit = faultHighLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getFaultHighLimit() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogInputFaultHighLimit");
     // Create the instance
-    return new BACnetConstructedDataAnalogInputFaultHighLimitBuilderImpl(
-        faultHighLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogInputFaultHighLimitBuilderImpl(faultHighLimit);
   }
 
   public static class BACnetConstructedDataAnalogInputFaultHighLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal faultHighLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAnalogInputFaultHighLimitBuilderImpl(
-        BACnetApplicationTagReal faultHighLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal faultHighLimit) {
       this.faultHighLimit = faultHighLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAnalogInputFaultHighLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogInputFaultHighLimit
           bACnetConstructedDataAnalogInputFaultHighLimit =
               new BACnetConstructedDataAnalogInputFaultHighLimit(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  faultHighLimit,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, faultHighLimit);
       return bACnetConstructedDataAnalogInputFaultHighLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultLowLimit.java
index 96bdcc2a46a..610d75d241f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultLowLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal faultLowLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogInputFaultLowLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal faultLowLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal faultLowLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultLowLimit = faultLowLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getFaultLowLimit() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogInputFaultLowLimit");
     // Create the instance
-    return new BACnetConstructedDataAnalogInputFaultLowLimitBuilderImpl(
-        faultLowLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogInputFaultLowLimitBuilderImpl(faultLowLimit);
   }
 
   public static class BACnetConstructedDataAnalogInputFaultLowLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal faultLowLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAnalogInputFaultLowLimitBuilderImpl(
-        BACnetApplicationTagReal faultLowLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal faultLowLimit) {
       this.faultLowLimit = faultLowLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAnalogInputFaultLowLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogInputFaultLowLimit bACnetConstructedDataAnalogInputFaultLowLimit =
           new BACnetConstructedDataAnalogInputFaultLowLimit(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              faultLowLimit,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, faultLowLimit);
       return bACnetConstructedDataAnalogInputFaultLowLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputInterfaceValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputInterfaceValue.java
index 15a9d57d055..0433beb258e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputInterfaceValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputInterfaceValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetOptionalREAL interfaceValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogInputInterfaceValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetOptionalREAL interfaceValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetOptionalREAL interfaceValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.interfaceValue = interfaceValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetOptionalREAL getInterfaceValue() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogInputInterfaceValue");
     // Create the instance
-    return new BACnetConstructedDataAnalogInputInterfaceValueBuilderImpl(
-        interfaceValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogInputInterfaceValueBuilderImpl(interfaceValue);
   }
 
   public static class BACnetConstructedDataAnalogInputInterfaceValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetOptionalREAL interfaceValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAnalogInputInterfaceValueBuilderImpl(
-        BACnetOptionalREAL interfaceValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOptionalREAL interfaceValue) {
       this.interfaceValue = interfaceValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAnalogInputInterfaceValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogInputInterfaceValue
           bACnetConstructedDataAnalogInputInterfaceValue =
               new BACnetConstructedDataAnalogInputInterfaceValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  interfaceValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, interfaceValue);
       return bACnetConstructedDataAnalogInputInterfaceValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputMaxPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputMaxPresValue.java
index a443ee65b85..ccdb8365ad8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputMaxPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputMaxPresValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal maxPresValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogInputMaxPresValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal maxPresValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal maxPresValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxPresValue = maxPresValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getMaxPresValue() {
@@ -133,34 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogInputMaxPresValue");
     // Create the instance
-    return new BACnetConstructedDataAnalogInputMaxPresValueBuilderImpl(
-        maxPresValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogInputMaxPresValueBuilderImpl(maxPresValue);
   }
 
   public static class BACnetConstructedDataAnalogInputMaxPresValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal maxPresValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAnalogInputMaxPresValueBuilderImpl(
-        BACnetApplicationTagReal maxPresValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal maxPresValue) {
       this.maxPresValue = maxPresValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAnalogInputMaxPresValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogInputMaxPresValue bACnetConstructedDataAnalogInputMaxPresValue =
           new BACnetConstructedDataAnalogInputMaxPresValue(
-              openingTag, peekedTagHeader, closingTag, maxPresValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxPresValue);
       return bACnetConstructedDataAnalogInputMaxPresValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputPresentValue.java
index ec6942a4375..97e152706bb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogInputPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getPresentValue() {
@@ -133,34 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogInputPresentValue");
     // Create the instance
-    return new BACnetConstructedDataAnalogInputPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogInputPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataAnalogInputPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAnalogInputPresentValueBuilderImpl(
-        BACnetApplicationTagReal presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAnalogInputPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogInputPresentValue bACnetConstructedDataAnalogInputPresentValue =
           new BACnetConstructedDataAnalogInputPresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataAnalogInputPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputAll.java
index c3f52f5bb82..a4e68b78998 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogOutputAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogOutputAll");
     // Create the instance
-    return new BACnetConstructedDataAnalogOutputAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogOutputAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataAnalogOutputAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAnalogOutputAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataAnalogOutputAllBuilderImpl() {}
 
     public BACnetConstructedDataAnalogOutputAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogOutputAll bACnetConstructedDataAnalogOutputAll =
-          new BACnetConstructedDataAnalogOutputAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataAnalogOutputAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataAnalogOutputAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputInterfaceValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputInterfaceValue.java
index e43ab56772f..bc28c7cc573 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputInterfaceValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputInterfaceValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetOptionalREAL interfaceValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogOutputInterfaceValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetOptionalREAL interfaceValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetOptionalREAL interfaceValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.interfaceValue = interfaceValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetOptionalREAL getInterfaceValue() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogOutputInterfaceValue");
     // Create the instance
-    return new BACnetConstructedDataAnalogOutputInterfaceValueBuilderImpl(
-        interfaceValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogOutputInterfaceValueBuilderImpl(interfaceValue);
   }
 
   public static class BACnetConstructedDataAnalogOutputInterfaceValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetOptionalREAL interfaceValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAnalogOutputInterfaceValueBuilderImpl(
-        BACnetOptionalREAL interfaceValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOptionalREAL interfaceValue) {
       this.interfaceValue = interfaceValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAnalogOutputInterfaceValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogOutputInterfaceValue
           bACnetConstructedDataAnalogOutputInterfaceValue =
               new BACnetConstructedDataAnalogOutputInterfaceValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  interfaceValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, interfaceValue);
       return bACnetConstructedDataAnalogOutputInterfaceValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputMaxPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputMaxPresValue.java
index a9aa6a80dec..ab6ba398122 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputMaxPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputMaxPresValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal maxPresValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogOutputMaxPresValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal maxPresValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal maxPresValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxPresValue = maxPresValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getMaxPresValue() {
@@ -133,34 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogOutputMaxPresValue");
     // Create the instance
-    return new BACnetConstructedDataAnalogOutputMaxPresValueBuilderImpl(
-        maxPresValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogOutputMaxPresValueBuilderImpl(maxPresValue);
   }
 
   public static class BACnetConstructedDataAnalogOutputMaxPresValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal maxPresValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAnalogOutputMaxPresValueBuilderImpl(
-        BACnetApplicationTagReal maxPresValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal maxPresValue) {
       this.maxPresValue = maxPresValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAnalogOutputMaxPresValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogOutputMaxPresValue bACnetConstructedDataAnalogOutputMaxPresValue =
           new BACnetConstructedDataAnalogOutputMaxPresValue(
-              openingTag, peekedTagHeader, closingTag, maxPresValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxPresValue);
       return bACnetConstructedDataAnalogOutputMaxPresValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputPresentValue.java
index 22b39888500..638c43a1ad9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogOutputPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getPresentValue() {
@@ -133,34 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogOutputPresentValue");
     // Create the instance
-    return new BACnetConstructedDataAnalogOutputPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogOutputPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataAnalogOutputPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAnalogOutputPresentValueBuilderImpl(
-        BACnetApplicationTagReal presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAnalogOutputPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogOutputPresentValue bACnetConstructedDataAnalogOutputPresentValue =
           new BACnetConstructedDataAnalogOutputPresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataAnalogOutputPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputRelinquishDefault.java
index e3455d1e273..5e6e82e2b0c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogOutputRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getRelinquishDefault() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogOutputRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataAnalogOutputRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogOutputRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataAnalogOutputRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAnalogOutputRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagReal relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAnalogOutputRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogOutputRelinquishDefault
           bACnetConstructedDataAnalogOutputRelinquishDefault =
               new BACnetConstructedDataAnalogOutputRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataAnalogOutputRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueAll.java
index e45a509c548..4f8f3e64f6c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogValueAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogValueAll");
     // Create the instance
-    return new BACnetConstructedDataAnalogValueAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogValueAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataAnalogValueAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAnalogValueAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataAnalogValueAllBuilderImpl() {}
 
     public BACnetConstructedDataAnalogValueAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogValueAll bACnetConstructedDataAnalogValueAll =
-          new BACnetConstructedDataAnalogValueAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataAnalogValueAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataAnalogValueAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultHighLimit.java
index 705cfd6633f..f9c84d559d0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultHighLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal faultHighLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogValueFaultHighLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal faultHighLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal faultHighLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultHighLimit = faultHighLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getFaultHighLimit() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogValueFaultHighLimit");
     // Create the instance
-    return new BACnetConstructedDataAnalogValueFaultHighLimitBuilderImpl(
-        faultHighLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogValueFaultHighLimitBuilderImpl(faultHighLimit);
   }
 
   public static class BACnetConstructedDataAnalogValueFaultHighLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal faultHighLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAnalogValueFaultHighLimitBuilderImpl(
-        BACnetApplicationTagReal faultHighLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal faultHighLimit) {
       this.faultHighLimit = faultHighLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAnalogValueFaultHighLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogValueFaultHighLimit
           bACnetConstructedDataAnalogValueFaultHighLimit =
               new BACnetConstructedDataAnalogValueFaultHighLimit(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  faultHighLimit,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, faultHighLimit);
       return bACnetConstructedDataAnalogValueFaultHighLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultLowLimit.java
index 90abf30709c..c4654a5928b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultLowLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal faultLowLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogValueFaultLowLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal faultLowLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal faultLowLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultLowLimit = faultLowLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getFaultLowLimit() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogValueFaultLowLimit");
     // Create the instance
-    return new BACnetConstructedDataAnalogValueFaultLowLimitBuilderImpl(
-        faultLowLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogValueFaultLowLimitBuilderImpl(faultLowLimit);
   }
 
   public static class BACnetConstructedDataAnalogValueFaultLowLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal faultLowLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAnalogValueFaultLowLimitBuilderImpl(
-        BACnetApplicationTagReal faultLowLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal faultLowLimit) {
       this.faultLowLimit = faultLowLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAnalogValueFaultLowLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogValueFaultLowLimit bACnetConstructedDataAnalogValueFaultLowLimit =
           new BACnetConstructedDataAnalogValueFaultLowLimit(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              faultLowLimit,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, faultLowLimit);
       return bACnetConstructedDataAnalogValueFaultLowLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueMaxPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueMaxPresValue.java
index b1332bb1783..84f7825ff3e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueMaxPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueMaxPresValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal maxPresValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogValueMaxPresValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal maxPresValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal maxPresValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxPresValue = maxPresValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getMaxPresValue() {
@@ -133,34 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogValueMaxPresValue");
     // Create the instance
-    return new BACnetConstructedDataAnalogValueMaxPresValueBuilderImpl(
-        maxPresValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogValueMaxPresValueBuilderImpl(maxPresValue);
   }
 
   public static class BACnetConstructedDataAnalogValueMaxPresValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal maxPresValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAnalogValueMaxPresValueBuilderImpl(
-        BACnetApplicationTagReal maxPresValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal maxPresValue) {
       this.maxPresValue = maxPresValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAnalogValueMaxPresValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogValueMaxPresValue bACnetConstructedDataAnalogValueMaxPresValue =
           new BACnetConstructedDataAnalogValueMaxPresValue(
-              openingTag, peekedTagHeader, closingTag, maxPresValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxPresValue);
       return bACnetConstructedDataAnalogValueMaxPresValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValuePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValuePresentValue.java
index edc3a111f07..e79b7387adc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValuePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValuePresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogValuePresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getPresentValue() {
@@ -133,34 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogValuePresentValue");
     // Create the instance
-    return new BACnetConstructedDataAnalogValuePresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogValuePresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataAnalogValuePresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAnalogValuePresentValueBuilderImpl(
-        BACnetApplicationTagReal presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAnalogValuePresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogValuePresentValue bACnetConstructedDataAnalogValuePresentValue =
           new BACnetConstructedDataAnalogValuePresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataAnalogValuePresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueRelinquishDefault.java
index ba4320a82c3..d3745dc0e2f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAnalogValueRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getRelinquishDefault() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAnalogValueRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataAnalogValueRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAnalogValueRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataAnalogValueRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAnalogValueRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagReal relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAnalogValueRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAnalogValueRelinquishDefault
           bACnetConstructedDataAnalogValueRelinquishDefault =
               new BACnetConstructedDataAnalogValueRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataAnalogValueRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataApplicationSoftwareVersion.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataApplicationSoftwareVersion.java
index 91617a60074..fdc564a5051 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataApplicationSoftwareVersion.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataApplicationSoftwareVersion.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString applicationSoftwareVersion;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataApplicationSoftwareVersion(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString applicationSoftwareVersion,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString applicationSoftwareVersion) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.applicationSoftwareVersion = applicationSoftwareVersion;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getApplicationSoftwareVersion() {
@@ -138,39 +130,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataApplicationSoftwareVersion");
     // Create the instance
     return new BACnetConstructedDataApplicationSoftwareVersionBuilderImpl(
-        applicationSoftwareVersion, tagNumber, arrayIndexArgument);
+        applicationSoftwareVersion);
   }
 
   public static class BACnetConstructedDataApplicationSoftwareVersionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString applicationSoftwareVersion;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataApplicationSoftwareVersionBuilderImpl(
-        BACnetApplicationTagCharacterString applicationSoftwareVersion,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString applicationSoftwareVersion) {
       this.applicationSoftwareVersion = applicationSoftwareVersion;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataApplicationSoftwareVersion build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataApplicationSoftwareVersion
           bACnetConstructedDataApplicationSoftwareVersion =
               new BACnetConstructedDataApplicationSoftwareVersion(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  applicationSoftwareVersion,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, applicationSoftwareVersion);
       return bACnetConstructedDataApplicationSoftwareVersion;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataArchive.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataArchive.java
index 0df803005f3..8bf22b900fc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataArchive.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataArchive.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean archive;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataArchive(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean archive,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean archive) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.archive = archive;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getArchive() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataArchive");
     // Create the instance
-    return new BACnetConstructedDataArchiveBuilderImpl(archive, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataArchiveBuilderImpl(archive);
   }
 
   public static class BACnetConstructedDataArchiveBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean archive;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataArchiveBuilderImpl(
-        BACnetApplicationTagBoolean archive,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataArchiveBuilderImpl(BACnetApplicationTagBoolean archive) {
       this.archive = archive;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataArchive build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataArchive bACnetConstructedDataArchive =
-          new BACnetConstructedDataArchive(
-              openingTag, peekedTagHeader, closingTag, archive, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataArchive(openingTag, peekedTagHeader, closingTag, archive);
       return bACnetConstructedDataArchive;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedAccessRights.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedAccessRights.java
index ccf0945d40d..7384421bee7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedAccessRights.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedAccessRights.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetAssignedAccessRights> assignedAccessRights;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAssignedAccessRights(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetAssignedAccessRights> assignedAccessRights,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetAssignedAccessRights> assignedAccessRights) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.assignedAccessRights = assignedAccessRights;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (assignedAccessRights)
     writeComplexTypeArrayField("assignedAccessRights", assignedAccessRights, writeBuffer);
@@ -171,42 +159,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataAssignedAccessRights");
     // Create the instance
     return new BACnetConstructedDataAssignedAccessRightsBuilderImpl(
-        numberOfDataElements, assignedAccessRights, tagNumber, arrayIndexArgument);
+        numberOfDataElements, assignedAccessRights);
   }
 
   public static class BACnetConstructedDataAssignedAccessRightsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetAssignedAccessRights> assignedAccessRights;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAssignedAccessRightsBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetAssignedAccessRights> assignedAccessRights,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetAssignedAccessRights> assignedAccessRights) {
       this.numberOfDataElements = numberOfDataElements;
       this.assignedAccessRights = assignedAccessRights;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAssignedAccessRights build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAssignedAccessRights bACnetConstructedDataAssignedAccessRights =
           new BACnetConstructedDataAssignedAccessRights(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              assignedAccessRights,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, assignedAccessRights);
       return bACnetConstructedDataAssignedAccessRights;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedLandingCalls.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedLandingCalls.java
index 135d07ef331..86cf447b0f8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedLandingCalls.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedLandingCalls.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetAssignedLandingCalls> assignedLandingCalls;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAssignedLandingCalls(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetAssignedLandingCalls> assignedLandingCalls,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetAssignedLandingCalls> assignedLandingCalls) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.assignedLandingCalls = assignedLandingCalls;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (assignedLandingCalls)
     writeComplexTypeArrayField("assignedLandingCalls", assignedLandingCalls, writeBuffer);
@@ -171,42 +159,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataAssignedLandingCalls");
     // Create the instance
     return new BACnetConstructedDataAssignedLandingCallsBuilderImpl(
-        numberOfDataElements, assignedLandingCalls, tagNumber, arrayIndexArgument);
+        numberOfDataElements, assignedLandingCalls);
   }
 
   public static class BACnetConstructedDataAssignedLandingCallsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetAssignedLandingCalls> assignedLandingCalls;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAssignedLandingCallsBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetAssignedLandingCalls> assignedLandingCalls,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetAssignedLandingCalls> assignedLandingCalls) {
       this.numberOfDataElements = numberOfDataElements;
       this.assignedLandingCalls = assignedLandingCalls;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAssignedLandingCalls build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAssignedLandingCalls bACnetConstructedDataAssignedLandingCalls =
           new BACnetConstructedDataAssignedLandingCalls(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              assignedLandingCalls,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, assignedLandingCalls);
       return bACnetConstructedDataAssignedLandingCalls;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAttemptedSamples.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAttemptedSamples.java
index ac151928c9b..8d60bd9eef7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAttemptedSamples.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAttemptedSamples.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger attemptedSamples;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAttemptedSamples(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger attemptedSamples,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger attemptedSamples) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.attemptedSamples = attemptedSamples;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getAttemptedSamples() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAttemptedSamples");
     // Create the instance
-    return new BACnetConstructedDataAttemptedSamplesBuilderImpl(
-        attemptedSamples, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAttemptedSamplesBuilderImpl(attemptedSamples);
   }
 
   public static class BACnetConstructedDataAttemptedSamplesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger attemptedSamples;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAttemptedSamplesBuilderImpl(
-        BACnetApplicationTagUnsignedInteger attemptedSamples,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger attemptedSamples) {
       this.attemptedSamples = attemptedSamples;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAttemptedSamples build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAttemptedSamples bACnetConstructedDataAttemptedSamples =
           new BACnetConstructedDataAttemptedSamples(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              attemptedSamples,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, attemptedSamples);
       return bACnetConstructedDataAttemptedSamples;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationFactors.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationFactors.java
index 28f63e91283..4610e0aa2ee 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationFactors.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationFactors.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetCredentialAuthenticationFactor> authenticationFactors;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAuthenticationFactors(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetCredentialAuthenticationFactor> authenticationFactors,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetCredentialAuthenticationFactor> authenticationFactors) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.authenticationFactors = authenticationFactors;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (authenticationFactors)
     writeComplexTypeArrayField("authenticationFactors", authenticationFactors, writeBuffer);
@@ -172,42 +160,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataAuthenticationFactors");
     // Create the instance
     return new BACnetConstructedDataAuthenticationFactorsBuilderImpl(
-        numberOfDataElements, authenticationFactors, tagNumber, arrayIndexArgument);
+        numberOfDataElements, authenticationFactors);
   }
 
   public static class BACnetConstructedDataAuthenticationFactorsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetCredentialAuthenticationFactor> authenticationFactors;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAuthenticationFactorsBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetCredentialAuthenticationFactor> authenticationFactors,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetCredentialAuthenticationFactor> authenticationFactors) {
       this.numberOfDataElements = numberOfDataElements;
       this.authenticationFactors = authenticationFactors;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAuthenticationFactors build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAuthenticationFactors bACnetConstructedDataAuthenticationFactors =
           new BACnetConstructedDataAuthenticationFactors(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              authenticationFactors,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, authenticationFactors);
       return bACnetConstructedDataAuthenticationFactors;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyList.java
index 2796763bd23..9a8e279b429 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyList.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetAuthenticationPolicy> authenticationPolicyList;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAuthenticationPolicyList(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetAuthenticationPolicy> authenticationPolicyList,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetAuthenticationPolicy> authenticationPolicyList) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.authenticationPolicyList = authenticationPolicyList;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (authenticationPolicyList)
     writeComplexTypeArrayField("authenticationPolicyList", authenticationPolicyList, writeBuffer);
@@ -171,42 +159,30 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataAuthenticationPolicyList");
     // Create the instance
     return new BACnetConstructedDataAuthenticationPolicyListBuilderImpl(
-        numberOfDataElements, authenticationPolicyList, tagNumber, arrayIndexArgument);
+        numberOfDataElements, authenticationPolicyList);
   }
 
   public static class BACnetConstructedDataAuthenticationPolicyListBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetAuthenticationPolicy> authenticationPolicyList;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAuthenticationPolicyListBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetAuthenticationPolicy> authenticationPolicyList,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetAuthenticationPolicy> authenticationPolicyList) {
       this.numberOfDataElements = numberOfDataElements;
       this.authenticationPolicyList = authenticationPolicyList;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAuthenticationPolicyList build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAuthenticationPolicyList bACnetConstructedDataAuthenticationPolicyList =
           new BACnetConstructedDataAuthenticationPolicyList(
               openingTag,
               peekedTagHeader,
               closingTag,
               numberOfDataElements,
-              authenticationPolicyList,
-              tagNumber,
-              arrayIndexArgument);
+              authenticationPolicyList);
       return bACnetConstructedDataAuthenticationPolicyList;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyNames.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyNames.java
index b353fd344f6..287c8afb3e7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyNames.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyNames.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagCharacterString> authenticationPolicyNames;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAuthenticationPolicyNames(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagCharacterString> authenticationPolicyNames,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagCharacterString> authenticationPolicyNames) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.authenticationPolicyNames = authenticationPolicyNames;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (authenticationPolicyNames)
     writeComplexTypeArrayField("authenticationPolicyNames", authenticationPolicyNames, writeBuffer);
@@ -175,33 +163,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataAuthenticationPolicyNames");
     // Create the instance
     return new BACnetConstructedDataAuthenticationPolicyNamesBuilderImpl(
-        numberOfDataElements, authenticationPolicyNames, tagNumber, arrayIndexArgument);
+        numberOfDataElements, authenticationPolicyNames);
   }
 
   public static class BACnetConstructedDataAuthenticationPolicyNamesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagCharacterString> authenticationPolicyNames;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAuthenticationPolicyNamesBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagCharacterString> authenticationPolicyNames,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagCharacterString> authenticationPolicyNames) {
       this.numberOfDataElements = numberOfDataElements;
       this.authenticationPolicyNames = authenticationPolicyNames;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAuthenticationPolicyNames build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAuthenticationPolicyNames
           bACnetConstructedDataAuthenticationPolicyNames =
               new BACnetConstructedDataAuthenticationPolicyNames(
@@ -209,9 +187,7 @@ public BACnetConstructedDataAuthenticationPolicyNames build(
                   peekedTagHeader,
                   closingTag,
                   numberOfDataElements,
-                  authenticationPolicyNames,
-                  tagNumber,
-                  arrayIndexArgument);
+                  authenticationPolicyNames);
       return bACnetConstructedDataAuthenticationPolicyNames;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationStatus.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationStatus.java
index cd6f6c16823..31a7584d0aa 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationStatus.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationStatus.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetAuthenticationStatusTagged authenticationStatus;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAuthenticationStatus(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetAuthenticationStatusTagged authenticationStatus,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetAuthenticationStatusTagged authenticationStatus) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.authenticationStatus = authenticationStatus;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetAuthenticationStatusTagged getAuthenticationStatus() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAuthenticationStatus");
     // Create the instance
-    return new BACnetConstructedDataAuthenticationStatusBuilderImpl(
-        authenticationStatus, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAuthenticationStatusBuilderImpl(authenticationStatus);
   }
 
   public static class BACnetConstructedDataAuthenticationStatusBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetAuthenticationStatusTagged authenticationStatus;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAuthenticationStatusBuilderImpl(
-        BACnetAuthenticationStatusTagged authenticationStatus,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetAuthenticationStatusTagged authenticationStatus) {
       this.authenticationStatus = authenticationStatus;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAuthenticationStatus build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAuthenticationStatus bACnetConstructedDataAuthenticationStatus =
           new BACnetConstructedDataAuthenticationStatus(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              authenticationStatus,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, authenticationStatus);
       return bACnetConstructedDataAuthenticationStatus;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationExemptions.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationExemptions.java
index 221dea1605d..a598345d746 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationExemptions.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationExemptions.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetAuthorizationExemptionTagged> authorizationExemption;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAuthorizationExemptions(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetAuthorizationExemptionTagged> authorizationExemption,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetAuthorizationExemptionTagged> authorizationExemption) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.authorizationExemption = authorizationExemption;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetAuthorizationExemptionTagged> getAuthorizationExemption() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAuthorizationExemptions");
     // Create the instance
-    return new BACnetConstructedDataAuthorizationExemptionsBuilderImpl(
-        authorizationExemption, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAuthorizationExemptionsBuilderImpl(authorizationExemption);
   }
 
   public static class BACnetConstructedDataAuthorizationExemptionsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetAuthorizationExemptionTagged> authorizationExemption;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAuthorizationExemptionsBuilderImpl(
-        List<BACnetAuthorizationExemptionTagged> authorizationExemption,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetAuthorizationExemptionTagged> authorizationExemption) {
       this.authorizationExemption = authorizationExemption;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAuthorizationExemptions build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAuthorizationExemptions bACnetConstructedDataAuthorizationExemptions =
           new BACnetConstructedDataAuthorizationExemptions(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              authorizationExemption,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, authorizationExemption);
       return bACnetConstructedDataAuthorizationExemptions;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationMode.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationMode.java
index be210754616..5df77deb8ac 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationMode.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationMode.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetAuthorizationModeTagged authorizationMode;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAuthorizationMode(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetAuthorizationModeTagged authorizationMode,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetAuthorizationModeTagged authorizationMode) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.authorizationMode = authorizationMode;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetAuthorizationModeTagged getAuthorizationMode() {
@@ -135,39 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAuthorizationMode");
     // Create the instance
-    return new BACnetConstructedDataAuthorizationModeBuilderImpl(
-        authorizationMode, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAuthorizationModeBuilderImpl(authorizationMode);
   }
 
   public static class BACnetConstructedDataAuthorizationModeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetAuthorizationModeTagged authorizationMode;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAuthorizationModeBuilderImpl(
-        BACnetAuthorizationModeTagged authorizationMode,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetAuthorizationModeTagged authorizationMode) {
       this.authorizationMode = authorizationMode;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAuthorizationMode build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAuthorizationMode bACnetConstructedDataAuthorizationMode =
           new BACnetConstructedDataAuthorizationMode(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              authorizationMode,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, authorizationMode);
       return bACnetConstructedDataAuthorizationMode;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAutoSlaveDiscovery.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAutoSlaveDiscovery.java
index 59a161bd9d7..c2c503ef2cd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAutoSlaveDiscovery.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAutoSlaveDiscovery.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean autoSlaveDiscovery;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAutoSlaveDiscovery(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean autoSlaveDiscovery,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean autoSlaveDiscovery) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.autoSlaveDiscovery = autoSlaveDiscovery;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getAutoSlaveDiscovery() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAutoSlaveDiscovery");
     // Create the instance
-    return new BACnetConstructedDataAutoSlaveDiscoveryBuilderImpl(
-        autoSlaveDiscovery, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAutoSlaveDiscoveryBuilderImpl(autoSlaveDiscovery);
   }
 
   public static class BACnetConstructedDataAutoSlaveDiscoveryBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean autoSlaveDiscovery;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataAutoSlaveDiscoveryBuilderImpl(
-        BACnetApplicationTagBoolean autoSlaveDiscovery,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean autoSlaveDiscovery) {
       this.autoSlaveDiscovery = autoSlaveDiscovery;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAutoSlaveDiscovery build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAutoSlaveDiscovery bACnetConstructedDataAutoSlaveDiscovery =
           new BACnetConstructedDataAutoSlaveDiscovery(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              autoSlaveDiscovery,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, autoSlaveDiscovery);
       return bACnetConstructedDataAutoSlaveDiscovery;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAverageValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAverageValue.java
index ecb39965ba3..0ea70901341 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAverageValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAverageValue.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal averageValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAverageValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal averageValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal averageValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.averageValue = averageValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getAverageValue() {
@@ -132,34 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAverageValue");
     // Create the instance
-    return new BACnetConstructedDataAverageValueBuilderImpl(
-        averageValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAverageValueBuilderImpl(averageValue);
   }
 
   public static class BACnetConstructedDataAverageValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal averageValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAverageValueBuilderImpl(
-        BACnetApplicationTagReal averageValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataAverageValueBuilderImpl(BACnetApplicationTagReal averageValue) {
       this.averageValue = averageValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataAverageValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAverageValue bACnetConstructedDataAverageValue =
           new BACnetConstructedDataAverageValue(
-              openingTag, peekedTagHeader, closingTag, averageValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, averageValue);
       return bACnetConstructedDataAverageValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAveragingAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAveragingAll.java
index 8b49d4d160e..57334638801 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAveragingAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAveragingAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataAveragingAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataAveragingAll");
     // Create the instance
-    return new BACnetConstructedDataAveragingAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataAveragingAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataAveragingAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataAveragingAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataAveragingAllBuilderImpl() {}
 
     public BACnetConstructedDataAveragingAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataAveragingAll bACnetConstructedDataAveragingAll =
-          new BACnetConstructedDataAveragingAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataAveragingAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataAveragingAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPGlobalAddress.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPGlobalAddress.java
index cbc0617a46e..8961ad2674d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPGlobalAddress.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPGlobalAddress.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetHostNPort bacnetIpGlobalAddress;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBACnetIPGlobalAddress(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetHostNPort bacnetIpGlobalAddress,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetHostNPort bacnetIpGlobalAddress) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.bacnetIpGlobalAddress = bacnetIpGlobalAddress;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetHostNPort getBacnetIpGlobalAddress() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBACnetIPGlobalAddress");
     // Create the instance
-    return new BACnetConstructedDataBACnetIPGlobalAddressBuilderImpl(
-        bacnetIpGlobalAddress, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBACnetIPGlobalAddressBuilderImpl(bacnetIpGlobalAddress);
   }
 
   public static class BACnetConstructedDataBACnetIPGlobalAddressBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetHostNPort bacnetIpGlobalAddress;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBACnetIPGlobalAddressBuilderImpl(
-        BACnetHostNPort bacnetIpGlobalAddress,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetHostNPort bacnetIpGlobalAddress) {
       this.bacnetIpGlobalAddress = bacnetIpGlobalAddress;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBACnetIPGlobalAddress build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBACnetIPGlobalAddress bACnetConstructedDataBACnetIPGlobalAddress =
           new BACnetConstructedDataBACnetIPGlobalAddress(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              bacnetIpGlobalAddress,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, bacnetIpGlobalAddress);
       return bACnetConstructedDataBACnetIPGlobalAddress;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMode.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMode.java
index 5de81782317..696ddc1df31 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMode.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMode.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetIPModeTagged bacnetIpMode;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBACnetIPMode(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetIPModeTagged bacnetIpMode,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetIPModeTagged bacnetIpMode) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.bacnetIpMode = bacnetIpMode;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetIPModeTagged getBacnetIpMode() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBACnetIPMode");
     // Create the instance
-    return new BACnetConstructedDataBACnetIPModeBuilderImpl(
-        bacnetIpMode, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBACnetIPModeBuilderImpl(bacnetIpMode);
   }
 
   public static class BACnetConstructedDataBACnetIPModeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetIPModeTagged bacnetIpMode;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataBACnetIPModeBuilderImpl(
-        BACnetIPModeTagged bacnetIpMode,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataBACnetIPModeBuilderImpl(BACnetIPModeTagged bacnetIpMode) {
       this.bacnetIpMode = bacnetIpMode;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBACnetIPMode build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBACnetIPMode bACnetConstructedDataBACnetIPMode =
           new BACnetConstructedDataBACnetIPMode(
-              openingTag, peekedTagHeader, closingTag, bacnetIpMode, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, bacnetIpMode);
       return bACnetConstructedDataBACnetIPMode;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMulticastAddress.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMulticastAddress.java
index fff3432ff5d..f7bf655500b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMulticastAddress.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMulticastAddress.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagOctetString ipMulticastAddress;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBACnetIPMulticastAddress(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagOctetString ipMulticastAddress,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagOctetString ipMulticastAddress) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipMulticastAddress = ipMulticastAddress;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagOctetString getIpMulticastAddress() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBACnetIPMulticastAddress");
     // Create the instance
-    return new BACnetConstructedDataBACnetIPMulticastAddressBuilderImpl(
-        ipMulticastAddress, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBACnetIPMulticastAddressBuilderImpl(ipMulticastAddress);
   }
 
   public static class BACnetConstructedDataBACnetIPMulticastAddressBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagOctetString ipMulticastAddress;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBACnetIPMulticastAddressBuilderImpl(
-        BACnetApplicationTagOctetString ipMulticastAddress,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagOctetString ipMulticastAddress) {
       this.ipMulticastAddress = ipMulticastAddress;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBACnetIPMulticastAddress build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBACnetIPMulticastAddress bACnetConstructedDataBACnetIPMulticastAddress =
           new BACnetConstructedDataBACnetIPMulticastAddress(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              ipMulticastAddress,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, ipMulticastAddress);
       return bACnetConstructedDataBACnetIPMulticastAddress;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPNATTraversal.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPNATTraversal.java
index 8177c39efec..60a3de2cf6c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPNATTraversal.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPNATTraversal.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean bacnetIPNATTraversal;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBACnetIPNATTraversal(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean bacnetIPNATTraversal,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean bacnetIPNATTraversal) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.bacnetIPNATTraversal = bacnetIPNATTraversal;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getBacnetIPNATTraversal() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBACnetIPNATTraversal");
     // Create the instance
-    return new BACnetConstructedDataBACnetIPNATTraversalBuilderImpl(
-        bacnetIPNATTraversal, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBACnetIPNATTraversalBuilderImpl(bacnetIPNATTraversal);
   }
 
   public static class BACnetConstructedDataBACnetIPNATTraversalBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean bacnetIPNATTraversal;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBACnetIPNATTraversalBuilderImpl(
-        BACnetApplicationTagBoolean bacnetIPNATTraversal,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean bacnetIPNATTraversal) {
       this.bacnetIPNATTraversal = bacnetIPNATTraversal;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBACnetIPNATTraversal build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBACnetIPNATTraversal bACnetConstructedDataBACnetIPNATTraversal =
           new BACnetConstructedDataBACnetIPNATTraversal(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              bacnetIPNATTraversal,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, bacnetIPNATTraversal);
       return bACnetConstructedDataBACnetIPNATTraversal;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPUDPPort.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPUDPPort.java
index 583e2e829ba..6d6f49716a1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPUDPPort.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPUDPPort.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger ipUdpPort;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBACnetIPUDPPort(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger ipUdpPort,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger ipUdpPort) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipUdpPort = ipUdpPort;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getIpUdpPort() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBACnetIPUDPPort");
     // Create the instance
-    return new BACnetConstructedDataBACnetIPUDPPortBuilderImpl(
-        ipUdpPort, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBACnetIPUDPPortBuilderImpl(ipUdpPort);
   }
 
   public static class BACnetConstructedDataBACnetIPUDPPortBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger ipUdpPort;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBACnetIPUDPPortBuilderImpl(
-        BACnetApplicationTagUnsignedInteger ipUdpPort,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger ipUdpPort) {
       this.ipUdpPort = ipUdpPort;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBACnetIPUDPPort build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBACnetIPUDPPort bACnetConstructedDataBACnetIPUDPPort =
           new BACnetConstructedDataBACnetIPUDPPort(
-              openingTag, peekedTagHeader, closingTag, ipUdpPort, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, ipUdpPort);
       return bACnetConstructedDataBACnetIPUDPPort;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6Mode.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6Mode.java
index f6f797b7bfa..227b806bab4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6Mode.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6Mode.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetIPModeTagged bacnetIpv6Mode;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBACnetIPv6Mode(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetIPModeTagged bacnetIpv6Mode,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetIPModeTagged bacnetIpv6Mode) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.bacnetIpv6Mode = bacnetIpv6Mode;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetIPModeTagged getBacnetIpv6Mode() {
@@ -134,39 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBACnetIPv6Mode");
     // Create the instance
-    return new BACnetConstructedDataBACnetIPv6ModeBuilderImpl(
-        bacnetIpv6Mode, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBACnetIPv6ModeBuilderImpl(bacnetIpv6Mode);
   }
 
   public static class BACnetConstructedDataBACnetIPv6ModeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetIPModeTagged bacnetIpv6Mode;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataBACnetIPv6ModeBuilderImpl(
-        BACnetIPModeTagged bacnetIpv6Mode,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataBACnetIPv6ModeBuilderImpl(BACnetIPModeTagged bacnetIpv6Mode) {
       this.bacnetIpv6Mode = bacnetIpv6Mode;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBACnetIPv6Mode build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBACnetIPv6Mode bACnetConstructedDataBACnetIPv6Mode =
           new BACnetConstructedDataBACnetIPv6Mode(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              bacnetIpv6Mode,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, bacnetIpv6Mode);
       return bACnetConstructedDataBACnetIPv6Mode;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6MulticastAddress.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6MulticastAddress.java
index b3c72d29a25..2fd83bf0706 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6MulticastAddress.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6MulticastAddress.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagOctetString ipv6MulticastAddress;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBACnetIPv6MulticastAddress(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagOctetString ipv6MulticastAddress,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagOctetString ipv6MulticastAddress) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipv6MulticastAddress = ipv6MulticastAddress;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagOctetString getIpv6MulticastAddress() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBACnetIPv6MulticastAddress");
     // Create the instance
-    return new BACnetConstructedDataBACnetIPv6MulticastAddressBuilderImpl(
-        ipv6MulticastAddress, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBACnetIPv6MulticastAddressBuilderImpl(ipv6MulticastAddress);
   }
 
   public static class BACnetConstructedDataBACnetIPv6MulticastAddressBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagOctetString ipv6MulticastAddress;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBACnetIPv6MulticastAddressBuilderImpl(
-        BACnetApplicationTagOctetString ipv6MulticastAddress,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagOctetString ipv6MulticastAddress) {
       this.ipv6MulticastAddress = ipv6MulticastAddress;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBACnetIPv6MulticastAddress build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBACnetIPv6MulticastAddress
           bACnetConstructedDataBACnetIPv6MulticastAddress =
               new BACnetConstructedDataBACnetIPv6MulticastAddress(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  ipv6MulticastAddress,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, ipv6MulticastAddress);
       return bACnetConstructedDataBACnetIPv6MulticastAddress;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6UDPPort.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6UDPPort.java
index 5bdba0d36f8..018a14772c5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6UDPPort.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6UDPPort.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger ipv6UdpPort;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBACnetIPv6UDPPort(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger ipv6UdpPort,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger ipv6UdpPort) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipv6UdpPort = ipv6UdpPort;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getIpv6UdpPort() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBACnetIPv6UDPPort");
     // Create the instance
-    return new BACnetConstructedDataBACnetIPv6UDPPortBuilderImpl(
-        ipv6UdpPort, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBACnetIPv6UDPPortBuilderImpl(ipv6UdpPort);
   }
 
   public static class BACnetConstructedDataBACnetIPv6UDPPortBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger ipv6UdpPort;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBACnetIPv6UDPPortBuilderImpl(
-        BACnetApplicationTagUnsignedInteger ipv6UdpPort,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger ipv6UdpPort) {
       this.ipv6UdpPort = ipv6UdpPort;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBACnetIPv6UDPPort build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBACnetIPv6UDPPort bACnetConstructedDataBACnetIPv6UDPPort =
           new BACnetConstructedDataBACnetIPv6UDPPort(
-              openingTag, peekedTagHeader, closingTag, ipv6UdpPort, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, ipv6UdpPort);
       return bACnetConstructedDataBACnetIPv6UDPPort;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDAcceptFDRegistrations.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDAcceptFDRegistrations.java
index 63f26e86dca..555c10b9886 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDAcceptFDRegistrations.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDAcceptFDRegistrations.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean bbmdAcceptFDRegistrations;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBBMDAcceptFDRegistrations(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean bbmdAcceptFDRegistrations,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean bbmdAcceptFDRegistrations) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.bbmdAcceptFDRegistrations = bbmdAcceptFDRegistrations;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getBbmdAcceptFDRegistrations() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBBMDAcceptFDRegistrations");
     // Create the instance
-    return new BACnetConstructedDataBBMDAcceptFDRegistrationsBuilderImpl(
-        bbmdAcceptFDRegistrations, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBBMDAcceptFDRegistrationsBuilderImpl(bbmdAcceptFDRegistrations);
   }
 
   public static class BACnetConstructedDataBBMDAcceptFDRegistrationsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean bbmdAcceptFDRegistrations;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBBMDAcceptFDRegistrationsBuilderImpl(
-        BACnetApplicationTagBoolean bbmdAcceptFDRegistrations,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean bbmdAcceptFDRegistrations) {
       this.bbmdAcceptFDRegistrations = bbmdAcceptFDRegistrations;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBBMDAcceptFDRegistrations build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBBMDAcceptFDRegistrations
           bACnetConstructedDataBBMDAcceptFDRegistrations =
               new BACnetConstructedDataBBMDAcceptFDRegistrations(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  bbmdAcceptFDRegistrations,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, bbmdAcceptFDRegistrations);
       return bACnetConstructedDataBBMDAcceptFDRegistrations;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDBroadcastDistributionTable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDBroadcastDistributionTable.java
index 6b14f64baf5..1839912a026 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDBroadcastDistributionTable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDBroadcastDistributionTable.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetBDTEntry> bbmdBroadcastDistributionTable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBBMDBroadcastDistributionTable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetBDTEntry> bbmdBroadcastDistributionTable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetBDTEntry> bbmdBroadcastDistributionTable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.bbmdBroadcastDistributionTable = bbmdBroadcastDistributionTable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetBDTEntry> getBbmdBroadcastDistributionTable() {
@@ -129,39 +121,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataBBMDBroadcastDistributionTable");
     // Create the instance
     return new BACnetConstructedDataBBMDBroadcastDistributionTableBuilderImpl(
-        bbmdBroadcastDistributionTable, tagNumber, arrayIndexArgument);
+        bbmdBroadcastDistributionTable);
   }
 
   public static class BACnetConstructedDataBBMDBroadcastDistributionTableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetBDTEntry> bbmdBroadcastDistributionTable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBBMDBroadcastDistributionTableBuilderImpl(
-        List<BACnetBDTEntry> bbmdBroadcastDistributionTable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetBDTEntry> bbmdBroadcastDistributionTable) {
       this.bbmdBroadcastDistributionTable = bbmdBroadcastDistributionTable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBBMDBroadcastDistributionTable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBBMDBroadcastDistributionTable
           bACnetConstructedDataBBMDBroadcastDistributionTable =
               new BACnetConstructedDataBBMDBroadcastDistributionTable(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  bbmdBroadcastDistributionTable,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, bbmdBroadcastDistributionTable);
       return bACnetConstructedDataBBMDBroadcastDistributionTable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDForeignDeviceTable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDForeignDeviceTable.java
index cb7afa9f06a..ada10892333 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDForeignDeviceTable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDForeignDeviceTable.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetBDTEntry> bbmdForeignDeviceTable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBBMDForeignDeviceTable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetBDTEntry> bbmdForeignDeviceTable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetBDTEntry> bbmdForeignDeviceTable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.bbmdForeignDeviceTable = bbmdForeignDeviceTable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetBDTEntry> getBbmdForeignDeviceTable() {
@@ -127,39 +119,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBBMDForeignDeviceTable");
     // Create the instance
-    return new BACnetConstructedDataBBMDForeignDeviceTableBuilderImpl(
-        bbmdForeignDeviceTable, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBBMDForeignDeviceTableBuilderImpl(bbmdForeignDeviceTable);
   }
 
   public static class BACnetConstructedDataBBMDForeignDeviceTableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetBDTEntry> bbmdForeignDeviceTable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBBMDForeignDeviceTableBuilderImpl(
-        List<BACnetBDTEntry> bbmdForeignDeviceTable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetBDTEntry> bbmdForeignDeviceTable) {
       this.bbmdForeignDeviceTable = bbmdForeignDeviceTable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBBMDForeignDeviceTable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBBMDForeignDeviceTable bACnetConstructedDataBBMDForeignDeviceTable =
           new BACnetConstructedDataBBMDForeignDeviceTable(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              bbmdForeignDeviceTable,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, bbmdForeignDeviceTable);
       return bACnetConstructedDataBBMDForeignDeviceTable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupAndRestoreState.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupAndRestoreState.java
index 3af01ebc654..0a0c868a35f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupAndRestoreState.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupAndRestoreState.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetBackupStateTagged backupAndRestoreState;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBackupAndRestoreState(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetBackupStateTagged backupAndRestoreState,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetBackupStateTagged backupAndRestoreState) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.backupAndRestoreState = backupAndRestoreState;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetBackupStateTagged getBackupAndRestoreState() {
@@ -135,39 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBackupAndRestoreState");
     // Create the instance
-    return new BACnetConstructedDataBackupAndRestoreStateBuilderImpl(
-        backupAndRestoreState, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBackupAndRestoreStateBuilderImpl(backupAndRestoreState);
   }
 
   public static class BACnetConstructedDataBackupAndRestoreStateBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetBackupStateTagged backupAndRestoreState;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBackupAndRestoreStateBuilderImpl(
-        BACnetBackupStateTagged backupAndRestoreState,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetBackupStateTagged backupAndRestoreState) {
       this.backupAndRestoreState = backupAndRestoreState;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBackupAndRestoreState build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBackupAndRestoreState bACnetConstructedDataBackupAndRestoreState =
           new BACnetConstructedDataBackupAndRestoreState(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              backupAndRestoreState,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, backupAndRestoreState);
       return bACnetConstructedDataBackupAndRestoreState;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupFailureTimeout.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupFailureTimeout.java
index a5c4069db40..54f930c0a5f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupFailureTimeout.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupFailureTimeout.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger backupFailureTimeout;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBackupFailureTimeout(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger backupFailureTimeout,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger backupFailureTimeout) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.backupFailureTimeout = backupFailureTimeout;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getBackupFailureTimeout() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBackupFailureTimeout");
     // Create the instance
-    return new BACnetConstructedDataBackupFailureTimeoutBuilderImpl(
-        backupFailureTimeout, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBackupFailureTimeoutBuilderImpl(backupFailureTimeout);
   }
 
   public static class BACnetConstructedDataBackupFailureTimeoutBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger backupFailureTimeout;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBackupFailureTimeoutBuilderImpl(
-        BACnetApplicationTagUnsignedInteger backupFailureTimeout,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger backupFailureTimeout) {
       this.backupFailureTimeout = backupFailureTimeout;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBackupFailureTimeout build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBackupFailureTimeout bACnetConstructedDataBackupFailureTimeout =
           new BACnetConstructedDataBackupFailureTimeout(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              backupFailureTimeout,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, backupFailureTimeout);
       return bACnetConstructedDataBackupFailureTimeout;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupPreparationTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupPreparationTime.java
index c8e6b30df5f..48a223e3fd6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupPreparationTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupPreparationTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger backupPreparationTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBackupPreparationTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger backupPreparationTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger backupPreparationTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.backupPreparationTime = backupPreparationTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getBackupPreparationTime() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBackupPreparationTime");
     // Create the instance
-    return new BACnetConstructedDataBackupPreparationTimeBuilderImpl(
-        backupPreparationTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBackupPreparationTimeBuilderImpl(backupPreparationTime);
   }
 
   public static class BACnetConstructedDataBackupPreparationTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger backupPreparationTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBackupPreparationTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger backupPreparationTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger backupPreparationTime) {
       this.backupPreparationTime = backupPreparationTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBackupPreparationTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBackupPreparationTime bACnetConstructedDataBackupPreparationTime =
           new BACnetConstructedDataBackupPreparationTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              backupPreparationTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, backupPreparationTime);
       return bACnetConstructedDataBackupPreparationTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBaseDeviceSecurityPolicy.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBaseDeviceSecurityPolicy.java
index 4c30a23925e..72c334257b5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBaseDeviceSecurityPolicy.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBaseDeviceSecurityPolicy.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetSecurityLevelTagged baseDeviceSecurityPolicy;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBaseDeviceSecurityPolicy(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetSecurityLevelTagged baseDeviceSecurityPolicy,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetSecurityLevelTagged baseDeviceSecurityPolicy) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.baseDeviceSecurityPolicy = baseDeviceSecurityPolicy;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetSecurityLevelTagged getBaseDeviceSecurityPolicy() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBaseDeviceSecurityPolicy");
     // Create the instance
-    return new BACnetConstructedDataBaseDeviceSecurityPolicyBuilderImpl(
-        baseDeviceSecurityPolicy, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBaseDeviceSecurityPolicyBuilderImpl(baseDeviceSecurityPolicy);
   }
 
   public static class BACnetConstructedDataBaseDeviceSecurityPolicyBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetSecurityLevelTagged baseDeviceSecurityPolicy;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBaseDeviceSecurityPolicyBuilderImpl(
-        BACnetSecurityLevelTagged baseDeviceSecurityPolicy,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetSecurityLevelTagged baseDeviceSecurityPolicy) {
       this.baseDeviceSecurityPolicy = baseDeviceSecurityPolicy;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBaseDeviceSecurityPolicy build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBaseDeviceSecurityPolicy bACnetConstructedDataBaseDeviceSecurityPolicy =
           new BACnetConstructedDataBaseDeviceSecurityPolicy(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              baseDeviceSecurityPolicy,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, baseDeviceSecurityPolicy);
       return bACnetConstructedDataBaseDeviceSecurityPolicy;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBelongsTo.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBelongsTo.java
index 266870cda0d..5acd788f5ef 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBelongsTo.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBelongsTo.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDeviceObjectReference belongsTo;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBelongsTo(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDeviceObjectReference belongsTo,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDeviceObjectReference belongsTo) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.belongsTo = belongsTo;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDeviceObjectReference getBelongsTo() {
@@ -130,33 +122,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBelongsTo");
     // Create the instance
-    return new BACnetConstructedDataBelongsToBuilderImpl(belongsTo, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBelongsToBuilderImpl(belongsTo);
   }
 
   public static class BACnetConstructedDataBelongsToBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDeviceObjectReference belongsTo;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataBelongsToBuilderImpl(
-        BACnetDeviceObjectReference belongsTo,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataBelongsToBuilderImpl(BACnetDeviceObjectReference belongsTo) {
       this.belongsTo = belongsTo;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBelongsTo build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBelongsTo bACnetConstructedDataBelongsTo =
-          new BACnetConstructedDataBelongsTo(
-              openingTag, peekedTagHeader, closingTag, belongsTo, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataBelongsTo(openingTag, peekedTagHeader, closingTag, belongsTo);
       return bACnetConstructedDataBelongsTo;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBias.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBias.java
index 0b6f44ddeaf..158177b4228 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBias.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBias.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal bias;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBias(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal bias,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal bias) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.bias = bias;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getBias() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBias");
     // Create the instance
-    return new BACnetConstructedDataBiasBuilderImpl(bias, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBiasBuilderImpl(bias);
   }
 
   public static class BACnetConstructedDataBiasBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal bias;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataBiasBuilderImpl(
-        BACnetApplicationTagReal bias,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataBiasBuilderImpl(BACnetApplicationTagReal bias) {
       this.bias = bias;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBias build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBias bACnetConstructedDataBias =
-          new BACnetConstructedDataBias(
-              openingTag, peekedTagHeader, closingTag, bias, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataBias(openingTag, peekedTagHeader, closingTag, bias);
       return bACnetConstructedDataBias;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputAll.java
index 6bfc980cd75..9a4b73db08c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBinaryInputAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBinaryInputAll");
     // Create the instance
-    return new BACnetConstructedDataBinaryInputAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBinaryInputAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataBinaryInputAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataBinaryInputAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataBinaryInputAllBuilderImpl() {}
 
     public BACnetConstructedDataBinaryInputAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBinaryInputAll bACnetConstructedDataBinaryInputAll =
-          new BACnetConstructedDataBinaryInputAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataBinaryInputAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataBinaryInputAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputInterfaceValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputInterfaceValue.java
index 39cc56e4bde..34a69f50beb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputInterfaceValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputInterfaceValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetOptionalBinaryPV interfaceValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBinaryInputInterfaceValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetOptionalBinaryPV interfaceValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetOptionalBinaryPV interfaceValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.interfaceValue = interfaceValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetOptionalBinaryPV getInterfaceValue() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBinaryInputInterfaceValue");
     // Create the instance
-    return new BACnetConstructedDataBinaryInputInterfaceValueBuilderImpl(
-        interfaceValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBinaryInputInterfaceValueBuilderImpl(interfaceValue);
   }
 
   public static class BACnetConstructedDataBinaryInputInterfaceValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetOptionalBinaryPV interfaceValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBinaryInputInterfaceValueBuilderImpl(
-        BACnetOptionalBinaryPV interfaceValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOptionalBinaryPV interfaceValue) {
       this.interfaceValue = interfaceValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBinaryInputInterfaceValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBinaryInputInterfaceValue
           bACnetConstructedDataBinaryInputInterfaceValue =
               new BACnetConstructedDataBinaryInputInterfaceValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  interfaceValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, interfaceValue);
       return bACnetConstructedDataBinaryInputInterfaceValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputPresentValue.java
index 7c70abac509..355089ac932 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetBinaryPVTagged presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBinaryInputPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetBinaryPVTagged presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetBinaryPVTagged presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetBinaryPVTagged getPresentValue() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBinaryInputPresentValue");
     // Create the instance
-    return new BACnetConstructedDataBinaryInputPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBinaryInputPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataBinaryInputPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetBinaryPVTagged presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBinaryInputPresentValueBuilderImpl(
-        BACnetBinaryPVTagged presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetBinaryPVTagged presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBinaryInputPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBinaryInputPresentValue bACnetConstructedDataBinaryInputPresentValue =
           new BACnetConstructedDataBinaryInputPresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataBinaryInputPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputAll.java
index a864b77ca4c..aa68332c0ca 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBinaryLightingOutputAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,30 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBinaryLightingOutputAll");
     // Create the instance
-    return new BACnetConstructedDataBinaryLightingOutputAllBuilderImpl(
-        tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBinaryLightingOutputAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataBinaryLightingOutputAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataBinaryLightingOutputAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataBinaryLightingOutputAllBuilderImpl() {}
 
     public BACnetConstructedDataBinaryLightingOutputAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBinaryLightingOutputAll bACnetConstructedDataBinaryLightingOutputAll =
-          new BACnetConstructedDataBinaryLightingOutputAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataBinaryLightingOutputAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataBinaryLightingOutputAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputFeedbackValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputFeedbackValue.java
index ff3aaf5287d..0311b986765 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputFeedbackValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputFeedbackValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetBinaryLightingPVTagged feedbackValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBinaryLightingOutputFeedbackValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetBinaryLightingPVTagged feedbackValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetBinaryLightingPVTagged feedbackValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.feedbackValue = feedbackValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetBinaryLightingPVTagged getFeedbackValue() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBinaryLightingOutputFeedbackValue");
     // Create the instance
-    return new BACnetConstructedDataBinaryLightingOutputFeedbackValueBuilderImpl(
-        feedbackValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBinaryLightingOutputFeedbackValueBuilderImpl(feedbackValue);
   }
 
   public static class BACnetConstructedDataBinaryLightingOutputFeedbackValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetBinaryLightingPVTagged feedbackValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBinaryLightingOutputFeedbackValueBuilderImpl(
-        BACnetBinaryLightingPVTagged feedbackValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetBinaryLightingPVTagged feedbackValue) {
       this.feedbackValue = feedbackValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBinaryLightingOutputFeedbackValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBinaryLightingOutputFeedbackValue
           bACnetConstructedDataBinaryLightingOutputFeedbackValue =
               new BACnetConstructedDataBinaryLightingOutputFeedbackValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  feedbackValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, feedbackValue);
       return bACnetConstructedDataBinaryLightingOutputFeedbackValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputPresentValue.java
index d1216d32406..c2b53d5425d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetBinaryLightingPVTagged presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBinaryLightingOutputPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetBinaryLightingPVTagged presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetBinaryLightingPVTagged presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetBinaryLightingPVTagged getPresentValue() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBinaryLightingOutputPresentValue");
     // Create the instance
-    return new BACnetConstructedDataBinaryLightingOutputPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBinaryLightingOutputPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataBinaryLightingOutputPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetBinaryLightingPVTagged presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBinaryLightingOutputPresentValueBuilderImpl(
-        BACnetBinaryLightingPVTagged presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetBinaryLightingPVTagged presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBinaryLightingOutputPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBinaryLightingOutputPresentValue
           bACnetConstructedDataBinaryLightingOutputPresentValue =
               new BACnetConstructedDataBinaryLightingOutputPresentValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  presentValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataBinaryLightingOutputPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.java
index 3ec19d07577..06be628f685 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetBinaryLightingPVTagged relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBinaryLightingOutputRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetBinaryLightingPVTagged relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetBinaryLightingPVTagged relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetBinaryLightingPVTagged getRelinquishDefault() {
@@ -136,39 +128,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataBinaryLightingOutputRelinquishDefault");
     // Create the instance
     return new BACnetConstructedDataBinaryLightingOutputRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+        relinquishDefault);
   }
 
   public static class BACnetConstructedDataBinaryLightingOutputRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetBinaryLightingPVTagged relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBinaryLightingOutputRelinquishDefaultBuilderImpl(
-        BACnetBinaryLightingPVTagged relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetBinaryLightingPVTagged relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBinaryLightingOutputRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBinaryLightingOutputRelinquishDefault
           bACnetConstructedDataBinaryLightingOutputRelinquishDefault =
               new BACnetConstructedDataBinaryLightingOutputRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataBinaryLightingOutputRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputAll.java
index 465bf006b46..3b869a2116f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBinaryOutputAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBinaryOutputAll");
     // Create the instance
-    return new BACnetConstructedDataBinaryOutputAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBinaryOutputAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataBinaryOutputAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataBinaryOutputAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataBinaryOutputAllBuilderImpl() {}
 
     public BACnetConstructedDataBinaryOutputAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBinaryOutputAll bACnetConstructedDataBinaryOutputAll =
-          new BACnetConstructedDataBinaryOutputAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataBinaryOutputAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataBinaryOutputAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputFeedbackValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputFeedbackValue.java
index 88d9b08b52b..215896933a7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputFeedbackValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputFeedbackValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetBinaryPVTagged feedbackValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBinaryOutputFeedbackValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetBinaryPVTagged feedbackValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetBinaryPVTagged feedbackValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.feedbackValue = feedbackValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetBinaryPVTagged getFeedbackValue() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBinaryOutputFeedbackValue");
     // Create the instance
-    return new BACnetConstructedDataBinaryOutputFeedbackValueBuilderImpl(
-        feedbackValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBinaryOutputFeedbackValueBuilderImpl(feedbackValue);
   }
 
   public static class BACnetConstructedDataBinaryOutputFeedbackValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetBinaryPVTagged feedbackValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBinaryOutputFeedbackValueBuilderImpl(
-        BACnetBinaryPVTagged feedbackValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetBinaryPVTagged feedbackValue) {
       this.feedbackValue = feedbackValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBinaryOutputFeedbackValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBinaryOutputFeedbackValue
           bACnetConstructedDataBinaryOutputFeedbackValue =
               new BACnetConstructedDataBinaryOutputFeedbackValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  feedbackValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, feedbackValue);
       return bACnetConstructedDataBinaryOutputFeedbackValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputInterfaceValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputInterfaceValue.java
index 03495f170bd..cdf4b508378 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputInterfaceValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputInterfaceValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetOptionalBinaryPV interfaceValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBinaryOutputInterfaceValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetOptionalBinaryPV interfaceValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetOptionalBinaryPV interfaceValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.interfaceValue = interfaceValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetOptionalBinaryPV getInterfaceValue() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBinaryOutputInterfaceValue");
     // Create the instance
-    return new BACnetConstructedDataBinaryOutputInterfaceValueBuilderImpl(
-        interfaceValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBinaryOutputInterfaceValueBuilderImpl(interfaceValue);
   }
 
   public static class BACnetConstructedDataBinaryOutputInterfaceValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetOptionalBinaryPV interfaceValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBinaryOutputInterfaceValueBuilderImpl(
-        BACnetOptionalBinaryPV interfaceValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOptionalBinaryPV interfaceValue) {
       this.interfaceValue = interfaceValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBinaryOutputInterfaceValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBinaryOutputInterfaceValue
           bACnetConstructedDataBinaryOutputInterfaceValue =
               new BACnetConstructedDataBinaryOutputInterfaceValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  interfaceValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, interfaceValue);
       return bACnetConstructedDataBinaryOutputInterfaceValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputPresentValue.java
index 11349a8c852..163a1587a2a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetBinaryPVTagged presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBinaryOutputPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetBinaryPVTagged presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetBinaryPVTagged presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetBinaryPVTagged getPresentValue() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBinaryOutputPresentValue");
     // Create the instance
-    return new BACnetConstructedDataBinaryOutputPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBinaryOutputPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataBinaryOutputPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetBinaryPVTagged presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBinaryOutputPresentValueBuilderImpl(
-        BACnetBinaryPVTagged presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetBinaryPVTagged presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBinaryOutputPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBinaryOutputPresentValue bACnetConstructedDataBinaryOutputPresentValue =
           new BACnetConstructedDataBinaryOutputPresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataBinaryOutputPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputRelinquishDefault.java
index 7af24354b94..2ad320504e1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetBinaryPVTagged relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBinaryOutputRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetBinaryPVTagged relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetBinaryPVTagged relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetBinaryPVTagged getRelinquishDefault() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBinaryOutputRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataBinaryOutputRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBinaryOutputRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataBinaryOutputRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetBinaryPVTagged relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBinaryOutputRelinquishDefaultBuilderImpl(
-        BACnetBinaryPVTagged relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetBinaryPVTagged relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBinaryOutputRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBinaryOutputRelinquishDefault
           bACnetConstructedDataBinaryOutputRelinquishDefault =
               new BACnetConstructedDataBinaryOutputRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataBinaryOutputRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryValueAll.java
index 6d597a9d37a..8ff063e9329 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryValueAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBinaryValueAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBinaryValueAll");
     // Create the instance
-    return new BACnetConstructedDataBinaryValueAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBinaryValueAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataBinaryValueAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataBinaryValueAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataBinaryValueAllBuilderImpl() {}
 
     public BACnetConstructedDataBinaryValueAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBinaryValueAll bACnetConstructedDataBinaryValueAll =
-          new BACnetConstructedDataBinaryValueAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataBinaryValueAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataBinaryValueAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryValuePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryValuePresentValue.java
index e1d98c1360f..06c63441f1a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryValuePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryValuePresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetBinaryPVTagged presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBinaryValuePresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetBinaryPVTagged presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetBinaryPVTagged presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetBinaryPVTagged getPresentValue() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBinaryValuePresentValue");
     // Create the instance
-    return new BACnetConstructedDataBinaryValuePresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBinaryValuePresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataBinaryValuePresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetBinaryPVTagged presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBinaryValuePresentValueBuilderImpl(
-        BACnetBinaryPVTagged presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetBinaryPVTagged presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBinaryValuePresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBinaryValuePresentValue bACnetConstructedDataBinaryValuePresentValue =
           new BACnetConstructedDataBinaryValuePresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataBinaryValuePresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryValueRelinquishDefault.java
index 6f9445a6e0b..713ecfb4474 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryValueRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetBinaryPVTagged relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBinaryValueRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetBinaryPVTagged relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetBinaryPVTagged relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetBinaryPVTagged getRelinquishDefault() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBinaryValueRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataBinaryValueRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBinaryValueRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataBinaryValueRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetBinaryPVTagged relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBinaryValueRelinquishDefaultBuilderImpl(
-        BACnetBinaryPVTagged relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetBinaryPVTagged relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBinaryValueRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBinaryValueRelinquishDefault
           bACnetConstructedDataBinaryValueRelinquishDefault =
               new BACnetConstructedDataBinaryValueRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataBinaryValueRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitMask.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitMask.java
index 79c8d030763..da14012bc24 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitMask.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitMask.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBitString bitString;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBitMask(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBitString bitString,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBitString bitString) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.bitString = bitString;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBitString getBitString() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBitMask");
     // Create the instance
-    return new BACnetConstructedDataBitMaskBuilderImpl(bitString, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBitMaskBuilderImpl(bitString);
   }
 
   public static class BACnetConstructedDataBitMaskBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBitString bitString;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataBitMaskBuilderImpl(
-        BACnetApplicationTagBitString bitString,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataBitMaskBuilderImpl(BACnetApplicationTagBitString bitString) {
       this.bitString = bitString;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBitMask build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBitMask bACnetConstructedDataBitMask =
-          new BACnetConstructedDataBitMask(
-              openingTag, peekedTagHeader, closingTag, bitString, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataBitMask(openingTag, peekedTagHeader, closingTag, bitString);
       return bACnetConstructedDataBitMask;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitStringValueAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitStringValueAlarmValues.java
index 55c3d2ec626..2ad0efc4444 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitStringValueAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitStringValueAlarmValues.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagBitString> alarmValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBitStringValueAlarmValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagBitString> alarmValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagBitString> alarmValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.alarmValues = alarmValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (alarmValues)
     writeComplexTypeArrayField("alarmValues", alarmValues, writeBuffer);
@@ -173,43 +161,27 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataBitStringValueAlarmValues");
     // Create the instance
     return new BACnetConstructedDataBitStringValueAlarmValuesBuilderImpl(
-        numberOfDataElements, alarmValues, tagNumber, arrayIndexArgument);
+        numberOfDataElements, alarmValues);
   }
 
   public static class BACnetConstructedDataBitStringValueAlarmValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagBitString> alarmValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBitStringValueAlarmValuesBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagBitString> alarmValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagBitString> alarmValues) {
       this.numberOfDataElements = numberOfDataElements;
       this.alarmValues = alarmValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBitStringValueAlarmValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBitStringValueAlarmValues
           bACnetConstructedDataBitStringValueAlarmValues =
               new BACnetConstructedDataBitStringValueAlarmValues(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  numberOfDataElements,
-                  alarmValues,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, numberOfDataElements, alarmValues);
       return bACnetConstructedDataBitStringValueAlarmValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitStringValuePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitStringValuePresentValue.java
index 9aa2bfd7fd5..d2b275b6bd6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitStringValuePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitStringValuePresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBitString presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBitStringValuePresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBitString presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBitString presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBitString getPresentValue() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBitStringValuePresentValue");
     // Create the instance
-    return new BACnetConstructedDataBitStringValuePresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBitStringValuePresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataBitStringValuePresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBitString presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBitStringValuePresentValueBuilderImpl(
-        BACnetApplicationTagBitString presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBitString presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBitStringValuePresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBitStringValuePresentValue
           bACnetConstructedDataBitStringValuePresentValue =
               new BACnetConstructedDataBitStringValuePresentValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  presentValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataBitStringValuePresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitStringValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitStringValueRelinquishDefault.java
index 9fe9717d423..549bbec36c2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitStringValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitStringValueRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBitString relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBitStringValueRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBitString relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBitString relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBitString getRelinquishDefault() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBitStringValueRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataBitStringValueRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBitStringValueRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataBitStringValueRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBitString relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBitStringValueRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagBitString relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBitString relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBitStringValueRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBitStringValueRelinquishDefault
           bACnetConstructedDataBitStringValueRelinquishDefault =
               new BACnetConstructedDataBitStringValueRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataBitStringValueRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitText.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitText.java
index aabbf92afec..806fb75b777 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitText.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitText.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagCharacterString> bitText;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBitText(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagCharacterString> bitText,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagCharacterString> bitText) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.bitText = bitText;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (bitText)
     writeComplexTypeArrayField("bitText", bitText, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBitText");
     // Create the instance
-    return new BACnetConstructedDataBitTextBuilderImpl(
-        numberOfDataElements, bitText, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBitTextBuilderImpl(numberOfDataElements, bitText);
   }
 
   public static class BACnetConstructedDataBitTextBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagCharacterString> bitText;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBitTextBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagCharacterString> bitText,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagCharacterString> bitText) {
       this.numberOfDataElements = numberOfDataElements;
       this.bitText = bitText;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBitText build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBitText bACnetConstructedDataBitText =
           new BACnetConstructedDataBitText(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              bitText,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, bitText);
       return bACnetConstructedDataBitText;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitstringValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitstringValueAll.java
index 1544927f004..ba8bc756736 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitstringValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBitstringValueAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBitstringValueAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBitstringValueAll");
     // Create the instance
-    return new BACnetConstructedDataBitstringValueAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBitstringValueAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataBitstringValueAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataBitstringValueAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataBitstringValueAllBuilderImpl() {}
 
     public BACnetConstructedDataBitstringValueAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBitstringValueAll bACnetConstructedDataBitstringValueAll =
-          new BACnetConstructedDataBitstringValueAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataBitstringValueAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataBitstringValueAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBlinkWarnEnable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBlinkWarnEnable.java
index f2e058158f9..c666b134a02 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBlinkWarnEnable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBlinkWarnEnable.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean blinkWarnEnable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBlinkWarnEnable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean blinkWarnEnable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean blinkWarnEnable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.blinkWarnEnable = blinkWarnEnable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getBlinkWarnEnable() {
@@ -132,39 +124,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBlinkWarnEnable");
     // Create the instance
-    return new BACnetConstructedDataBlinkWarnEnableBuilderImpl(
-        blinkWarnEnable, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBlinkWarnEnableBuilderImpl(blinkWarnEnable);
   }
 
   public static class BACnetConstructedDataBlinkWarnEnableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean blinkWarnEnable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBlinkWarnEnableBuilderImpl(
-        BACnetApplicationTagBoolean blinkWarnEnable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean blinkWarnEnable) {
       this.blinkWarnEnable = blinkWarnEnable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBlinkWarnEnable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBlinkWarnEnable bACnetConstructedDataBlinkWarnEnable =
           new BACnetConstructedDataBlinkWarnEnable(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              blinkWarnEnable,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, blinkWarnEnable);
       return bACnetConstructedDataBlinkWarnEnable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBufferSize.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBufferSize.java
index 7b37c128b48..8079a67be51 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBufferSize.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBufferSize.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger bufferSize;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataBufferSize(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger bufferSize,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger bufferSize) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.bufferSize = bufferSize;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getBufferSize() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataBufferSize");
     // Create the instance
-    return new BACnetConstructedDataBufferSizeBuilderImpl(
-        bufferSize, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataBufferSizeBuilderImpl(bufferSize);
   }
 
   public static class BACnetConstructedDataBufferSizeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger bufferSize;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataBufferSizeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger bufferSize,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger bufferSize) {
       this.bufferSize = bufferSize;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataBufferSize build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataBufferSize bACnetConstructedDataBufferSize =
-          new BACnetConstructedDataBufferSize(
-              openingTag, peekedTagHeader, closingTag, bufferSize, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataBufferSize(openingTag, peekedTagHeader, closingTag, bufferSize);
       return bACnetConstructedDataBufferSize;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVIncrement.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVIncrement.java
index 0ba73468ad7..316d356f7ac 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVIncrement.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVIncrement.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal covIncrement;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCOVIncrement(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal covIncrement,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal covIncrement) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.covIncrement = covIncrement;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getCovIncrement() {
@@ -132,34 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCOVIncrement");
     // Create the instance
-    return new BACnetConstructedDataCOVIncrementBuilderImpl(
-        covIncrement, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCOVIncrementBuilderImpl(covIncrement);
   }
 
   public static class BACnetConstructedDataCOVIncrementBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal covIncrement;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataCOVIncrementBuilderImpl(
-        BACnetApplicationTagReal covIncrement,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataCOVIncrementBuilderImpl(BACnetApplicationTagReal covIncrement) {
       this.covIncrement = covIncrement;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCOVIncrement build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCOVIncrement bACnetConstructedDataCOVIncrement =
           new BACnetConstructedDataCOVIncrement(
-              openingTag, peekedTagHeader, closingTag, covIncrement, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, covIncrement);
       return bACnetConstructedDataCOVIncrement;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVPeriod.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVPeriod.java
index 2d6dc7d9bdc..56edeae0150 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVPeriod.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVPeriod.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger covPeriod;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCOVPeriod(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger covPeriod,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger covPeriod) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.covPeriod = covPeriod;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getCovPeriod() {
@@ -134,33 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCOVPeriod");
     // Create the instance
-    return new BACnetConstructedDataCOVPeriodBuilderImpl(covPeriod, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCOVPeriodBuilderImpl(covPeriod);
   }
 
   public static class BACnetConstructedDataCOVPeriodBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger covPeriod;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCOVPeriodBuilderImpl(
-        BACnetApplicationTagUnsignedInteger covPeriod,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger covPeriod) {
       this.covPeriod = covPeriod;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCOVPeriod build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCOVPeriod bACnetConstructedDataCOVPeriod =
-          new BACnetConstructedDataCOVPeriod(
-              openingTag, peekedTagHeader, closingTag, covPeriod, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataCOVPeriod(openingTag, peekedTagHeader, closingTag, covPeriod);
       return bACnetConstructedDataCOVPeriod;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVResubscriptionInterval.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVResubscriptionInterval.java
index 24b801b6243..663dd01e7bc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVResubscriptionInterval.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVResubscriptionInterval.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger covResubscriptionInterval;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCOVResubscriptionInterval(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger covResubscriptionInterval,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger covResubscriptionInterval) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.covResubscriptionInterval = covResubscriptionInterval;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getCovResubscriptionInterval() {
@@ -137,40 +129,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCOVResubscriptionInterval");
     // Create the instance
-    return new BACnetConstructedDataCOVResubscriptionIntervalBuilderImpl(
-        covResubscriptionInterval, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCOVResubscriptionIntervalBuilderImpl(covResubscriptionInterval);
   }
 
   public static class BACnetConstructedDataCOVResubscriptionIntervalBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger covResubscriptionInterval;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCOVResubscriptionIntervalBuilderImpl(
-        BACnetApplicationTagUnsignedInteger covResubscriptionInterval,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger covResubscriptionInterval) {
       this.covResubscriptionInterval = covResubscriptionInterval;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCOVResubscriptionInterval build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCOVResubscriptionInterval
           bACnetConstructedDataCOVResubscriptionInterval =
               new BACnetConstructedDataCOVResubscriptionInterval(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  covResubscriptionInterval,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, covResubscriptionInterval);
       return bACnetConstructedDataCOVResubscriptionInterval;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVUPeriod.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVUPeriod.java
index be5d9ad442e..7b633d234dc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVUPeriod.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVUPeriod.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger covuPeriod;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCOVUPeriod(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger covuPeriod,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger covuPeriod) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.covuPeriod = covuPeriod;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getCovuPeriod() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCOVUPeriod");
     // Create the instance
-    return new BACnetConstructedDataCOVUPeriodBuilderImpl(
-        covuPeriod, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCOVUPeriodBuilderImpl(covuPeriod);
   }
 
   public static class BACnetConstructedDataCOVUPeriodBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger covuPeriod;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCOVUPeriodBuilderImpl(
-        BACnetApplicationTagUnsignedInteger covuPeriod,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger covuPeriod) {
       this.covuPeriod = covuPeriod;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCOVUPeriod build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCOVUPeriod bACnetConstructedDataCOVUPeriod =
-          new BACnetConstructedDataCOVUPeriod(
-              openingTag, peekedTagHeader, closingTag, covuPeriod, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataCOVUPeriod(openingTag, peekedTagHeader, closingTag, covuPeriod);
       return bACnetConstructedDataCOVUPeriod;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVURecipients.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVURecipients.java
index 8074b491da3..c49d96447db 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVURecipients.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCOVURecipients.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetRecipient> covuRecipients;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCOVURecipients(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetRecipient> covuRecipients,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetRecipient> covuRecipients) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.covuRecipients = covuRecipients;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetRecipient> getCovuRecipients() {
@@ -126,39 +118,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCOVURecipients");
     // Create the instance
-    return new BACnetConstructedDataCOVURecipientsBuilderImpl(
-        covuRecipients, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCOVURecipientsBuilderImpl(covuRecipients);
   }
 
   public static class BACnetConstructedDataCOVURecipientsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetRecipient> covuRecipients;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataCOVURecipientsBuilderImpl(
-        List<BACnetRecipient> covuRecipients,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataCOVURecipientsBuilderImpl(List<BACnetRecipient> covuRecipients) {
       this.covuRecipients = covuRecipients;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCOVURecipients build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCOVURecipients bACnetConstructedDataCOVURecipients =
           new BACnetConstructedDataCOVURecipients(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              covuRecipients,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, covuRecipients);
       return bACnetConstructedDataCOVURecipients;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCalendarAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCalendarAll.java
index 3ba9179b618..179f16793d9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCalendarAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCalendarAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCalendarAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCalendarAll");
     // Create the instance
-    return new BACnetConstructedDataCalendarAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCalendarAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataCalendarAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataCalendarAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataCalendarAllBuilderImpl() {}
 
     public BACnetConstructedDataCalendarAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCalendarAll bACnetConstructedDataCalendarAll =
-          new BACnetConstructedDataCalendarAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataCalendarAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataCalendarAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCalendarPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCalendarPresentValue.java
index 2a9c4a27f30..9455180e5fc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCalendarPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCalendarPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCalendarPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getPresentValue() {
@@ -133,34 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCalendarPresentValue");
     // Create the instance
-    return new BACnetConstructedDataCalendarPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCalendarPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataCalendarPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCalendarPresentValueBuilderImpl(
-        BACnetApplicationTagBoolean presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCalendarPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCalendarPresentValue bACnetConstructedDataCalendarPresentValue =
           new BACnetConstructedDataCalendarPresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataCalendarPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarAssignedDirection.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarAssignedDirection.java
index f44bf092f49..1f460e10fe6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarAssignedDirection.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarAssignedDirection.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLiftCarDirectionTagged assignedDirection;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCarAssignedDirection(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLiftCarDirectionTagged assignedDirection,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLiftCarDirectionTagged assignedDirection) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.assignedDirection = assignedDirection;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLiftCarDirectionTagged getAssignedDirection() {
@@ -135,39 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCarAssignedDirection");
     // Create the instance
-    return new BACnetConstructedDataCarAssignedDirectionBuilderImpl(
-        assignedDirection, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCarAssignedDirectionBuilderImpl(assignedDirection);
   }
 
   public static class BACnetConstructedDataCarAssignedDirectionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLiftCarDirectionTagged assignedDirection;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCarAssignedDirectionBuilderImpl(
-        BACnetLiftCarDirectionTagged assignedDirection,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetLiftCarDirectionTagged assignedDirection) {
       this.assignedDirection = assignedDirection;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCarAssignedDirection build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCarAssignedDirection bACnetConstructedDataCarAssignedDirection =
           new BACnetConstructedDataCarAssignedDirection(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              assignedDirection,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, assignedDirection);
       return bACnetConstructedDataCarAssignedDirection;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorCommand.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorCommand.java
index a62fd308e4f..8ff34365fcb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorCommand.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorCommand.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetLiftCarDoorCommandTagged> carDoorCommand;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCarDoorCommand(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetLiftCarDoorCommandTagged> carDoorCommand,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLiftCarDoorCommandTagged> carDoorCommand) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.carDoorCommand = carDoorCommand;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (carDoorCommand)
     writeComplexTypeArrayField("carDoorCommand", carDoorCommand, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCarDoorCommand");
     // Create the instance
-    return new BACnetConstructedDataCarDoorCommandBuilderImpl(
-        numberOfDataElements, carDoorCommand, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCarDoorCommandBuilderImpl(numberOfDataElements, carDoorCommand);
   }
 
   public static class BACnetConstructedDataCarDoorCommandBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetLiftCarDoorCommandTagged> carDoorCommand;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCarDoorCommandBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetLiftCarDoorCommandTagged> carDoorCommand,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetLiftCarDoorCommandTagged> carDoorCommand) {
       this.numberOfDataElements = numberOfDataElements;
       this.carDoorCommand = carDoorCommand;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCarDoorCommand build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCarDoorCommand bACnetConstructedDataCarDoorCommand =
           new BACnetConstructedDataCarDoorCommand(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              carDoorCommand,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, carDoorCommand);
       return bACnetConstructedDataCarDoorCommand;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorStatus.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorStatus.java
index 18dec69e7bc..b7be28a271c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorStatus.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorStatus.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetDoorStatusTagged> carDoorStatus;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCarDoorStatus(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetDoorStatusTagged> carDoorStatus,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDoorStatusTagged> carDoorStatus) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.carDoorStatus = carDoorStatus;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (carDoorStatus)
     writeComplexTypeArrayField("carDoorStatus", carDoorStatus, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCarDoorStatus");
     // Create the instance
-    return new BACnetConstructedDataCarDoorStatusBuilderImpl(
-        numberOfDataElements, carDoorStatus, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCarDoorStatusBuilderImpl(numberOfDataElements, carDoorStatus);
   }
 
   public static class BACnetConstructedDataCarDoorStatusBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetDoorStatusTagged> carDoorStatus;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCarDoorStatusBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetDoorStatusTagged> carDoorStatus,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDoorStatusTagged> carDoorStatus) {
       this.numberOfDataElements = numberOfDataElements;
       this.carDoorStatus = carDoorStatus;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCarDoorStatus build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCarDoorStatus bACnetConstructedDataCarDoorStatus =
           new BACnetConstructedDataCarDoorStatus(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              carDoorStatus,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, carDoorStatus);
       return bACnetConstructedDataCarDoorStatus;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorText.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorText.java
index 41a56d6e173..9328a617a65 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorText.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorText.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagCharacterString> carDoorText;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCarDoorText(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagCharacterString> carDoorText,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagCharacterString> carDoorText) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.carDoorText = carDoorText;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (carDoorText)
     writeComplexTypeArrayField("carDoorText", carDoorText, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCarDoorText");
     // Create the instance
-    return new BACnetConstructedDataCarDoorTextBuilderImpl(
-        numberOfDataElements, carDoorText, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCarDoorTextBuilderImpl(numberOfDataElements, carDoorText);
   }
 
   public static class BACnetConstructedDataCarDoorTextBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagCharacterString> carDoorText;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCarDoorTextBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagCharacterString> carDoorText,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagCharacterString> carDoorText) {
       this.numberOfDataElements = numberOfDataElements;
       this.carDoorText = carDoorText;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCarDoorText build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCarDoorText bACnetConstructedDataCarDoorText =
           new BACnetConstructedDataCarDoorText(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              carDoorText,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, carDoorText);
       return bACnetConstructedDataCarDoorText;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorZone.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorZone.java
index 68d0331af93..1f0c1f8087c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorZone.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDoorZone.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean carDoorZone;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCarDoorZone(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean carDoorZone,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean carDoorZone) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.carDoorZone = carDoorZone;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getCarDoorZone() {
@@ -132,34 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCarDoorZone");
     // Create the instance
-    return new BACnetConstructedDataCarDoorZoneBuilderImpl(
-        carDoorZone, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCarDoorZoneBuilderImpl(carDoorZone);
   }
 
   public static class BACnetConstructedDataCarDoorZoneBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean carDoorZone;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataCarDoorZoneBuilderImpl(
-        BACnetApplicationTagBoolean carDoorZone,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataCarDoorZoneBuilderImpl(BACnetApplicationTagBoolean carDoorZone) {
       this.carDoorZone = carDoorZone;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCarDoorZone build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCarDoorZone bACnetConstructedDataCarDoorZone =
           new BACnetConstructedDataCarDoorZone(
-              openingTag, peekedTagHeader, closingTag, carDoorZone, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, carDoorZone);
       return bACnetConstructedDataCarDoorZone;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDriveStatus.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDriveStatus.java
index 538732d2f10..f2dc28b8b28 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDriveStatus.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarDriveStatus.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLiftCarDriveStatusTagged carDriveStatus;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCarDriveStatus(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLiftCarDriveStatusTagged carDriveStatus,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLiftCarDriveStatusTagged carDriveStatus) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.carDriveStatus = carDriveStatus;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLiftCarDriveStatusTagged getCarDriveStatus() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCarDriveStatus");
     // Create the instance
-    return new BACnetConstructedDataCarDriveStatusBuilderImpl(
-        carDriveStatus, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCarDriveStatusBuilderImpl(carDriveStatus);
   }
 
   public static class BACnetConstructedDataCarDriveStatusBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLiftCarDriveStatusTagged carDriveStatus;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCarDriveStatusBuilderImpl(
-        BACnetLiftCarDriveStatusTagged carDriveStatus,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetLiftCarDriveStatusTagged carDriveStatus) {
       this.carDriveStatus = carDriveStatus;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCarDriveStatus build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCarDriveStatus bACnetConstructedDataCarDriveStatus =
           new BACnetConstructedDataCarDriveStatus(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              carDriveStatus,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, carDriveStatus);
       return bACnetConstructedDataCarDriveStatus;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarLoad.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarLoad.java
index 22f91405980..46784010364 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarLoad.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarLoad.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal carLoad;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCarLoad(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal carLoad,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal carLoad) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.carLoad = carLoad;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getCarLoad() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCarLoad");
     // Create the instance
-    return new BACnetConstructedDataCarLoadBuilderImpl(carLoad, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCarLoadBuilderImpl(carLoad);
   }
 
   public static class BACnetConstructedDataCarLoadBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal carLoad;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataCarLoadBuilderImpl(
-        BACnetApplicationTagReal carLoad,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataCarLoadBuilderImpl(BACnetApplicationTagReal carLoad) {
       this.carLoad = carLoad;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCarLoad build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCarLoad bACnetConstructedDataCarLoad =
-          new BACnetConstructedDataCarLoad(
-              openingTag, peekedTagHeader, closingTag, carLoad, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataCarLoad(openingTag, peekedTagHeader, closingTag, carLoad);
       return bACnetConstructedDataCarLoad;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarLoadUnits.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarLoadUnits.java
index 7d426f7fff3..c53fc26b451 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarLoadUnits.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarLoadUnits.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetEngineeringUnitsTagged units;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCarLoadUnits(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetEngineeringUnitsTagged units,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetEngineeringUnitsTagged units) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.units = units;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetEngineeringUnitsTagged getUnits() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCarLoadUnits");
     // Create the instance
-    return new BACnetConstructedDataCarLoadUnitsBuilderImpl(units, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCarLoadUnitsBuilderImpl(units);
   }
 
   public static class BACnetConstructedDataCarLoadUnitsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetEngineeringUnitsTagged units;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataCarLoadUnitsBuilderImpl(
-        BACnetEngineeringUnitsTagged units,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataCarLoadUnitsBuilderImpl(BACnetEngineeringUnitsTagged units) {
       this.units = units;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCarLoadUnits build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCarLoadUnits bACnetConstructedDataCarLoadUnits =
-          new BACnetConstructedDataCarLoadUnits(
-              openingTag, peekedTagHeader, closingTag, units, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataCarLoadUnits(openingTag, peekedTagHeader, closingTag, units);
       return bACnetConstructedDataCarLoadUnits;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarMode.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarMode.java
index 5d97f27fb49..27fa656a94a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarMode.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarMode.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLiftCarModeTagged carMode;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCarMode(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLiftCarModeTagged carMode,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLiftCarModeTagged carMode) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.carMode = carMode;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLiftCarModeTagged getCarMode() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCarMode");
     // Create the instance
-    return new BACnetConstructedDataCarModeBuilderImpl(carMode, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCarModeBuilderImpl(carMode);
   }
 
   public static class BACnetConstructedDataCarModeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLiftCarModeTagged carMode;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataCarModeBuilderImpl(
-        BACnetLiftCarModeTagged carMode,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataCarModeBuilderImpl(BACnetLiftCarModeTagged carMode) {
       this.carMode = carMode;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCarMode build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCarMode bACnetConstructedDataCarMode =
-          new BACnetConstructedDataCarMode(
-              openingTag, peekedTagHeader, closingTag, carMode, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataCarMode(openingTag, peekedTagHeader, closingTag, carMode);
       return bACnetConstructedDataCarMode;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarMovingDirection.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarMovingDirection.java
index bb1fb978fda..3ad91228f32 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarMovingDirection.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarMovingDirection.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLiftCarDirectionTagged carMovingDirection;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCarMovingDirection(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLiftCarDirectionTagged carMovingDirection,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLiftCarDirectionTagged carMovingDirection) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.carMovingDirection = carMovingDirection;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLiftCarDirectionTagged getCarMovingDirection() {
@@ -135,39 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCarMovingDirection");
     // Create the instance
-    return new BACnetConstructedDataCarMovingDirectionBuilderImpl(
-        carMovingDirection, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCarMovingDirectionBuilderImpl(carMovingDirection);
   }
 
   public static class BACnetConstructedDataCarMovingDirectionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLiftCarDirectionTagged carMovingDirection;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCarMovingDirectionBuilderImpl(
-        BACnetLiftCarDirectionTagged carMovingDirection,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetLiftCarDirectionTagged carMovingDirection) {
       this.carMovingDirection = carMovingDirection;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCarMovingDirection build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCarMovingDirection bACnetConstructedDataCarMovingDirection =
           new BACnetConstructedDataCarMovingDirection(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              carMovingDirection,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, carMovingDirection);
       return bACnetConstructedDataCarMovingDirection;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarPosition.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarPosition.java
index 3c030619cd6..4d2227eae1c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarPosition.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCarPosition.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger carPosition;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCarPosition(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger carPosition,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger carPosition) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.carPosition = carPosition;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getCarPosition() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCarPosition");
     // Create the instance
-    return new BACnetConstructedDataCarPositionBuilderImpl(
-        carPosition, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCarPositionBuilderImpl(carPosition);
   }
 
   public static class BACnetConstructedDataCarPositionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger carPosition;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCarPositionBuilderImpl(
-        BACnetApplicationTagUnsignedInteger carPosition,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger carPosition) {
       this.carPosition = carPosition;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCarPosition build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCarPosition bACnetConstructedDataCarPosition =
           new BACnetConstructedDataCarPosition(
-              openingTag, peekedTagHeader, closingTag, carPosition, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, carPosition);
       return bACnetConstructedDataCarPosition;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChangeOfStateCount.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChangeOfStateCount.java
index 65d2a0f932a..a1e0ac6be6e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChangeOfStateCount.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChangeOfStateCount.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger changeIfStateCount;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataChangeOfStateCount(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger changeIfStateCount,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger changeIfStateCount) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.changeIfStateCount = changeIfStateCount;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getChangeIfStateCount() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataChangeOfStateCount");
     // Create the instance
-    return new BACnetConstructedDataChangeOfStateCountBuilderImpl(
-        changeIfStateCount, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataChangeOfStateCountBuilderImpl(changeIfStateCount);
   }
 
   public static class BACnetConstructedDataChangeOfStateCountBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger changeIfStateCount;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataChangeOfStateCountBuilderImpl(
-        BACnetApplicationTagUnsignedInteger changeIfStateCount,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger changeIfStateCount) {
       this.changeIfStateCount = changeIfStateCount;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataChangeOfStateCount build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataChangeOfStateCount bACnetConstructedDataChangeOfStateCount =
           new BACnetConstructedDataChangeOfStateCount(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              changeIfStateCount,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, changeIfStateCount);
       return bACnetConstructedDataChangeOfStateCount;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChangeOfStateTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChangeOfStateTime.java
index f59cc548595..c8b09da0c4b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChangeOfStateTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChangeOfStateTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime changeOfStateTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataChangeOfStateTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime changeOfStateTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime changeOfStateTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.changeOfStateTime = changeOfStateTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getChangeOfStateTime() {
@@ -131,39 +123,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataChangeOfStateTime");
     // Create the instance
-    return new BACnetConstructedDataChangeOfStateTimeBuilderImpl(
-        changeOfStateTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataChangeOfStateTimeBuilderImpl(changeOfStateTime);
   }
 
   public static class BACnetConstructedDataChangeOfStateTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime changeOfStateTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataChangeOfStateTimeBuilderImpl(
-        BACnetDateTime changeOfStateTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataChangeOfStateTimeBuilderImpl(BACnetDateTime changeOfStateTime) {
       this.changeOfStateTime = changeOfStateTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataChangeOfStateTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataChangeOfStateTime bACnetConstructedDataChangeOfStateTime =
           new BACnetConstructedDataChangeOfStateTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              changeOfStateTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, changeOfStateTime);
       return bACnetConstructedDataChangeOfStateTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChangesPending.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChangesPending.java
index 73f9a54ecc4..a222268dd17 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChangesPending.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChangesPending.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean changesPending;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataChangesPending(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean changesPending,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean changesPending) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.changesPending = changesPending;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getChangesPending() {
@@ -132,39 +124,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataChangesPending");
     // Create the instance
-    return new BACnetConstructedDataChangesPendingBuilderImpl(
-        changesPending, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataChangesPendingBuilderImpl(changesPending);
   }
 
   public static class BACnetConstructedDataChangesPendingBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean changesPending;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataChangesPendingBuilderImpl(
-        BACnetApplicationTagBoolean changesPending,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean changesPending) {
       this.changesPending = changesPending;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataChangesPending build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataChangesPending bACnetConstructedDataChangesPending =
           new BACnetConstructedDataChangesPending(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              changesPending,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, changesPending);
       return bACnetConstructedDataChangesPending;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelAll.java
index 289adecb4ec..f73de9ba7a5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataChannelAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataChannelAll");
     // Create the instance
-    return new BACnetConstructedDataChannelAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataChannelAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataChannelAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataChannelAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataChannelAllBuilderImpl() {}
 
     public BACnetConstructedDataChannelAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataChannelAll bACnetConstructedDataChannelAll =
-          new BACnetConstructedDataChannelAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataChannelAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataChannelAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelListOfObjectPropertyReferences.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelListOfObjectPropertyReferences.java
index ab2789f0179..504db8a39de 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelListOfObjectPropertyReferences.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelListOfObjectPropertyReferences.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetDeviceObjectPropertyReference> references;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataChannelListOfObjectPropertyReferences(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetDeviceObjectPropertyReference> references,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDeviceObjectPropertyReference> references) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.references = references;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (references)
     writeComplexTypeArrayField("references", references, writeBuffer);
@@ -172,43 +160,27 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataChannelListOfObjectPropertyReferences");
     // Create the instance
     return new BACnetConstructedDataChannelListOfObjectPropertyReferencesBuilderImpl(
-        numberOfDataElements, references, tagNumber, arrayIndexArgument);
+        numberOfDataElements, references);
   }
 
   public static class BACnetConstructedDataChannelListOfObjectPropertyReferencesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetDeviceObjectPropertyReference> references;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataChannelListOfObjectPropertyReferencesBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetDeviceObjectPropertyReference> references,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDeviceObjectPropertyReference> references) {
       this.numberOfDataElements = numberOfDataElements;
       this.references = references;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataChannelListOfObjectPropertyReferences build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataChannelListOfObjectPropertyReferences
           bACnetConstructedDataChannelListOfObjectPropertyReferences =
               new BACnetConstructedDataChannelListOfObjectPropertyReferences(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  numberOfDataElements,
-                  references,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, numberOfDataElements, references);
       return bACnetConstructedDataChannelListOfObjectPropertyReferences;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelNumber.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelNumber.java
index b54ef55faaa..891d41889ea 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelNumber.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelNumber.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger channelNumber;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataChannelNumber(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger channelNumber,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger channelNumber) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.channelNumber = channelNumber;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getChannelNumber() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataChannelNumber");
     // Create the instance
-    return new BACnetConstructedDataChannelNumberBuilderImpl(
-        channelNumber, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataChannelNumberBuilderImpl(channelNumber);
   }
 
   public static class BACnetConstructedDataChannelNumberBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger channelNumber;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataChannelNumberBuilderImpl(
-        BACnetApplicationTagUnsignedInteger channelNumber,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger channelNumber) {
       this.channelNumber = channelNumber;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataChannelNumber build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataChannelNumber bACnetConstructedDataChannelNumber =
           new BACnetConstructedDataChannelNumber(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              channelNumber,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, channelNumber);
       return bACnetConstructedDataChannelNumber;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelPresentValue.java
index 7a5c7b68f1c..a4c0e2fb5a4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataChannelPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetChannelValue presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataChannelPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetChannelValue presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetChannelValue presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetChannelValue getPresentValue() {
@@ -131,34 +123,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataChannelPresentValue");
     // Create the instance
-    return new BACnetConstructedDataChannelPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataChannelPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataChannelPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetChannelValue presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataChannelPresentValueBuilderImpl(
-        BACnetChannelValue presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataChannelPresentValueBuilderImpl(BACnetChannelValue presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataChannelPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataChannelPresentValue bACnetConstructedDataChannelPresentValue =
           new BACnetConstructedDataChannelPresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataChannelPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValueAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValueAlarmValues.java
index 0324cb9afef..f7f50dad905 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValueAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValueAlarmValues.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetOptionalCharacterString> alarmValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCharacterStringValueAlarmValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetOptionalCharacterString> alarmValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetOptionalCharacterString> alarmValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.alarmValues = alarmValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (alarmValues)
     writeComplexTypeArrayField("alarmValues", alarmValues, writeBuffer);
@@ -171,43 +159,27 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataCharacterStringValueAlarmValues");
     // Create the instance
     return new BACnetConstructedDataCharacterStringValueAlarmValuesBuilderImpl(
-        numberOfDataElements, alarmValues, tagNumber, arrayIndexArgument);
+        numberOfDataElements, alarmValues);
   }
 
   public static class BACnetConstructedDataCharacterStringValueAlarmValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetOptionalCharacterString> alarmValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCharacterStringValueAlarmValuesBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetOptionalCharacterString> alarmValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetOptionalCharacterString> alarmValues) {
       this.numberOfDataElements = numberOfDataElements;
       this.alarmValues = alarmValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCharacterStringValueAlarmValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCharacterStringValueAlarmValues
           bACnetConstructedDataCharacterStringValueAlarmValues =
               new BACnetConstructedDataCharacterStringValueAlarmValues(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  numberOfDataElements,
-                  alarmValues,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, numberOfDataElements, alarmValues);
       return bACnetConstructedDataCharacterStringValueAlarmValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValueFaultValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValueFaultValues.java
index 323bbb5c793..8d641eb4381 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValueFaultValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValueFaultValues.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetOptionalCharacterString> faultValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCharacterStringValueFaultValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetOptionalCharacterString> faultValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetOptionalCharacterString> faultValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.faultValues = faultValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (faultValues)
     writeComplexTypeArrayField("faultValues", faultValues, writeBuffer);
@@ -171,43 +159,27 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataCharacterStringValueFaultValues");
     // Create the instance
     return new BACnetConstructedDataCharacterStringValueFaultValuesBuilderImpl(
-        numberOfDataElements, faultValues, tagNumber, arrayIndexArgument);
+        numberOfDataElements, faultValues);
   }
 
   public static class BACnetConstructedDataCharacterStringValueFaultValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetOptionalCharacterString> faultValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCharacterStringValueFaultValuesBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetOptionalCharacterString> faultValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetOptionalCharacterString> faultValues) {
       this.numberOfDataElements = numberOfDataElements;
       this.faultValues = faultValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCharacterStringValueFaultValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCharacterStringValueFaultValues
           bACnetConstructedDataCharacterStringValueFaultValues =
               new BACnetConstructedDataCharacterStringValueFaultValues(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  numberOfDataElements,
-                  faultValues,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, numberOfDataElements, faultValues);
       return bACnetConstructedDataCharacterStringValueFaultValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValuePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValuePresentValue.java
index 3657586f4c6..26612331eef 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValuePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValuePresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCharacterStringValuePresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getPresentValue() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCharacterStringValuePresentValue");
     // Create the instance
-    return new BACnetConstructedDataCharacterStringValuePresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCharacterStringValuePresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataCharacterStringValuePresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCharacterStringValuePresentValueBuilderImpl(
-        BACnetApplicationTagCharacterString presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCharacterStringValuePresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCharacterStringValuePresentValue
           bACnetConstructedDataCharacterStringValuePresentValue =
               new BACnetConstructedDataCharacterStringValuePresentValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  presentValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataCharacterStringValuePresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValueRelinquishDefault.java
index 3a2cd71414f..92c31a666e2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterStringValueRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCharacterStringValueRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getRelinquishDefault() {
@@ -137,39 +129,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataCharacterStringValueRelinquishDefault");
     // Create the instance
     return new BACnetConstructedDataCharacterStringValueRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+        relinquishDefault);
   }
 
   public static class BACnetConstructedDataCharacterStringValueRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCharacterStringValueRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagCharacterString relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCharacterStringValueRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCharacterStringValueRelinquishDefault
           bACnetConstructedDataCharacterStringValueRelinquishDefault =
               new BACnetConstructedDataCharacterStringValueRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataCharacterStringValueRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterstringValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterstringValueAll.java
index f8584063bb8..88f640d8d49 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterstringValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCharacterstringValueAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCharacterstringValueAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,30 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCharacterstringValueAll");
     // Create the instance
-    return new BACnetConstructedDataCharacterstringValueAllBuilderImpl(
-        tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCharacterstringValueAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataCharacterstringValueAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataCharacterstringValueAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataCharacterstringValueAllBuilderImpl() {}
 
     public BACnetConstructedDataCharacterstringValueAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCharacterstringValueAll bACnetConstructedDataCharacterstringValueAll =
-          new BACnetConstructedDataCharacterstringValueAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataCharacterstringValueAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataCharacterstringValueAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataClientCOVIncrement.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataClientCOVIncrement.java
index cc0fa6bb228..ec2670c537a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataClientCOVIncrement.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataClientCOVIncrement.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetClientCOV covIncrement;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataClientCOVIncrement(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetClientCOV covIncrement,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetClientCOV covIncrement) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.covIncrement = covIncrement;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetClientCOV getCovIncrement() {
@@ -130,34 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataClientCOVIncrement");
     // Create the instance
-    return new BACnetConstructedDataClientCOVIncrementBuilderImpl(
-        covIncrement, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataClientCOVIncrementBuilderImpl(covIncrement);
   }
 
   public static class BACnetConstructedDataClientCOVIncrementBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetClientCOV covIncrement;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataClientCOVIncrementBuilderImpl(
-        BACnetClientCOV covIncrement,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataClientCOVIncrementBuilderImpl(BACnetClientCOV covIncrement) {
       this.covIncrement = covIncrement;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataClientCOVIncrement build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataClientCOVIncrement bACnetConstructedDataClientCOVIncrement =
           new BACnetConstructedDataClientCOVIncrement(
-              openingTag, peekedTagHeader, closingTag, covIncrement, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, covIncrement);
       return bACnetConstructedDataClientCOVIncrement;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommand.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommand.java
index f9cd982d8ab..ca5a78665b4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommand.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommand.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetNetworkPortCommandTagged command;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCommand(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetNetworkPortCommandTagged command,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetNetworkPortCommandTagged command) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.command = command;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetNetworkPortCommandTagged getCommand() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCommand");
     // Create the instance
-    return new BACnetConstructedDataCommandBuilderImpl(command, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCommandBuilderImpl(command);
   }
 
   public static class BACnetConstructedDataCommandBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetNetworkPortCommandTagged command;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataCommandBuilderImpl(
-        BACnetNetworkPortCommandTagged command,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataCommandBuilderImpl(BACnetNetworkPortCommandTagged command) {
       this.command = command;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCommand build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCommand bACnetConstructedDataCommand =
-          new BACnetConstructedDataCommand(
-              openingTag, peekedTagHeader, closingTag, command, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataCommand(openingTag, peekedTagHeader, closingTag, command);
       return bACnetConstructedDataCommand;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommandAction.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommandAction.java
index 1b053b373d0..c84ca52ac65 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommandAction.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommandAction.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetActionList> actionLists;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCommandAction(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetActionList> actionLists,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetActionList> actionLists) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.actionLists = actionLists;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (actionLists)
     writeComplexTypeArrayField("actionLists", actionLists, writeBuffer);
@@ -169,43 +157,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCommandAction");
     // Create the instance
-    return new BACnetConstructedDataCommandActionBuilderImpl(
-        numberOfDataElements, actionLists, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCommandActionBuilderImpl(numberOfDataElements, actionLists);
   }
 
   public static class BACnetConstructedDataCommandActionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetActionList> actionLists;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCommandActionBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetActionList> actionLists,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetActionList> actionLists) {
       this.numberOfDataElements = numberOfDataElements;
       this.actionLists = actionLists;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCommandAction build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCommandAction bACnetConstructedDataCommandAction =
           new BACnetConstructedDataCommandAction(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              actionLists,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, actionLists);
       return bACnetConstructedDataCommandAction;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommandAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommandAll.java
index 2993bd038b4..a0316a7dc7c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommandAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommandAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCommandAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCommandAll");
     // Create the instance
-    return new BACnetConstructedDataCommandAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCommandAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataCommandAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataCommandAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataCommandAllBuilderImpl() {}
 
     public BACnetConstructedDataCommandAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCommandAll bACnetConstructedDataCommandAll =
-          new BACnetConstructedDataCommandAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataCommandAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataCommandAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommandTimeArray.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommandTimeArray.java
index 7b02083c253..35a97a6f183 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommandTimeArray.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCommandTimeArray.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetTimeStamp> commandTimeArray;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCommandTimeArray(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetTimeStamp> commandTimeArray,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetTimeStamp> commandTimeArray) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.commandTimeArray = commandTimeArray;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (commandTimeArray)
     writeComplexTypeArrayField("commandTimeArray", commandTimeArray, writeBuffer);
@@ -175,42 +163,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataCommandTimeArray");
     // Create the instance
     return new BACnetConstructedDataCommandTimeArrayBuilderImpl(
-        numberOfDataElements, commandTimeArray, tagNumber, arrayIndexArgument);
+        numberOfDataElements, commandTimeArray);
   }
 
   public static class BACnetConstructedDataCommandTimeArrayBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetTimeStamp> commandTimeArray;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCommandTimeArrayBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetTimeStamp> commandTimeArray,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetTimeStamp> commandTimeArray) {
       this.numberOfDataElements = numberOfDataElements;
       this.commandTimeArray = commandTimeArray;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCommandTimeArray build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCommandTimeArray bACnetConstructedDataCommandTimeArray =
           new BACnetConstructedDataCommandTimeArray(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              commandTimeArray,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, commandTimeArray);
       return bACnetConstructedDataCommandTimeArray;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataConfigurationFiles.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataConfigurationFiles.java
index b480dab2002..bbe2f6b49f8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataConfigurationFiles.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataConfigurationFiles.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagObjectIdentifier> configurationFiles;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataConfigurationFiles(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagObjectIdentifier> configurationFiles,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagObjectIdentifier> configurationFiles) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.configurationFiles = configurationFiles;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (configurationFiles)
     writeComplexTypeArrayField("configurationFiles", configurationFiles, writeBuffer);
@@ -175,42 +163,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataConfigurationFiles");
     // Create the instance
     return new BACnetConstructedDataConfigurationFilesBuilderImpl(
-        numberOfDataElements, configurationFiles, tagNumber, arrayIndexArgument);
+        numberOfDataElements, configurationFiles);
   }
 
   public static class BACnetConstructedDataConfigurationFilesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagObjectIdentifier> configurationFiles;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataConfigurationFilesBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagObjectIdentifier> configurationFiles,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagObjectIdentifier> configurationFiles) {
       this.numberOfDataElements = numberOfDataElements;
       this.configurationFiles = configurationFiles;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataConfigurationFiles build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataConfigurationFiles bACnetConstructedDataConfigurationFiles =
           new BACnetConstructedDataConfigurationFiles(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              configurationFiles,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, configurationFiles);
       return bACnetConstructedDataConfigurationFiles;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlGroups.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlGroups.java
index 2798df4421b..a107e19a130 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlGroups.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlGroups.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagUnsignedInteger> controlGroups;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataControlGroups(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagUnsignedInteger> controlGroups,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagUnsignedInteger> controlGroups) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.controlGroups = controlGroups;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (controlGroups)
     writeComplexTypeArrayField("controlGroups", controlGroups, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataControlGroups");
     // Create the instance
-    return new BACnetConstructedDataControlGroupsBuilderImpl(
-        numberOfDataElements, controlGroups, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataControlGroupsBuilderImpl(numberOfDataElements, controlGroups);
   }
 
   public static class BACnetConstructedDataControlGroupsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagUnsignedInteger> controlGroups;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataControlGroupsBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagUnsignedInteger> controlGroups,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagUnsignedInteger> controlGroups) {
       this.numberOfDataElements = numberOfDataElements;
       this.controlGroups = controlGroups;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataControlGroups build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataControlGroups bACnetConstructedDataControlGroups =
           new BACnetConstructedDataControlGroups(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              controlGroups,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, controlGroups);
       return bACnetConstructedDataControlGroups;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlledVariableReference.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlledVariableReference.java
index 0f686df1bfd..a94c5fc4ab8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlledVariableReference.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlledVariableReference.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetObjectPropertyReference controlledVariableReference;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataControlledVariableReference(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetObjectPropertyReference controlledVariableReference,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetObjectPropertyReference controlledVariableReference) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.controlledVariableReference = controlledVariableReference;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetObjectPropertyReference getControlledVariableReference() {
@@ -134,39 +126,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataControlledVariableReference");
     // Create the instance
     return new BACnetConstructedDataControlledVariableReferenceBuilderImpl(
-        controlledVariableReference, tagNumber, arrayIndexArgument);
+        controlledVariableReference);
   }
 
   public static class BACnetConstructedDataControlledVariableReferenceBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetObjectPropertyReference controlledVariableReference;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataControlledVariableReferenceBuilderImpl(
-        BACnetObjectPropertyReference controlledVariableReference,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetObjectPropertyReference controlledVariableReference) {
       this.controlledVariableReference = controlledVariableReference;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataControlledVariableReference build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataControlledVariableReference
           bACnetConstructedDataControlledVariableReference =
               new BACnetConstructedDataControlledVariableReference(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  controlledVariableReference,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, controlledVariableReference);
       return bACnetConstructedDataControlledVariableReference;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlledVariableUnits.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlledVariableUnits.java
index c55fea897cb..6d940f325cb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlledVariableUnits.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlledVariableUnits.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetEngineeringUnitsTagged units;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataControlledVariableUnits(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetEngineeringUnitsTagged units,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetEngineeringUnitsTagged units) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.units = units;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetEngineeringUnitsTagged getUnits() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataControlledVariableUnits");
     // Create the instance
-    return new BACnetConstructedDataControlledVariableUnitsBuilderImpl(
-        units, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataControlledVariableUnitsBuilderImpl(units);
   }
 
   public static class BACnetConstructedDataControlledVariableUnitsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetEngineeringUnitsTagged units;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataControlledVariableUnitsBuilderImpl(
-        BACnetEngineeringUnitsTagged units,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetEngineeringUnitsTagged units) {
       this.units = units;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataControlledVariableUnits build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataControlledVariableUnits bACnetConstructedDataControlledVariableUnits =
           new BACnetConstructedDataControlledVariableUnits(
-              openingTag, peekedTagHeader, closingTag, units, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, units);
       return bACnetConstructedDataControlledVariableUnits;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlledVariableValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlledVariableValue.java
index 5a201ade2f6..5d34c2e28e5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlledVariableValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataControlledVariableValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal controlledVariableValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataControlledVariableValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal controlledVariableValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal controlledVariableValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.controlledVariableValue = controlledVariableValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getControlledVariableValue() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataControlledVariableValue");
     // Create the instance
-    return new BACnetConstructedDataControlledVariableValueBuilderImpl(
-        controlledVariableValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataControlledVariableValueBuilderImpl(controlledVariableValue);
   }
 
   public static class BACnetConstructedDataControlledVariableValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal controlledVariableValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataControlledVariableValueBuilderImpl(
-        BACnetApplicationTagReal controlledVariableValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal controlledVariableValue) {
       this.controlledVariableValue = controlledVariableValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataControlledVariableValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataControlledVariableValue bACnetConstructedDataControlledVariableValue =
           new BACnetConstructedDataControlledVariableValue(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              controlledVariableValue,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, controlledVariableValue);
       return bACnetConstructedDataControlledVariableValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCount.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCount.java
index 7ae6b83533a..1106e865703 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCount.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCount.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger count;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCount(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger count,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger count) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.count = count;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getCount() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCount");
     // Create the instance
-    return new BACnetConstructedDataCountBuilderImpl(count, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCountBuilderImpl(count);
   }
 
   public static class BACnetConstructedDataCountBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger count;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataCountBuilderImpl(
-        BACnetApplicationTagUnsignedInteger count,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataCountBuilderImpl(BACnetApplicationTagUnsignedInteger count) {
       this.count = count;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCount build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCount bACnetConstructedDataCount =
-          new BACnetConstructedDataCount(
-              openingTag, peekedTagHeader, closingTag, count, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataCount(openingTag, peekedTagHeader, closingTag, count);
       return bACnetConstructedDataCount;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCountBeforeChange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCountBeforeChange.java
index aa40bccf9a8..b54e28a31c5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCountBeforeChange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCountBeforeChange.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger countBeforeChange;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCountBeforeChange(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger countBeforeChange,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger countBeforeChange) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.countBeforeChange = countBeforeChange;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getCountBeforeChange() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCountBeforeChange");
     // Create the instance
-    return new BACnetConstructedDataCountBeforeChangeBuilderImpl(
-        countBeforeChange, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCountBeforeChangeBuilderImpl(countBeforeChange);
   }
 
   public static class BACnetConstructedDataCountBeforeChangeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger countBeforeChange;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCountBeforeChangeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger countBeforeChange,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger countBeforeChange) {
       this.countBeforeChange = countBeforeChange;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCountBeforeChange build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCountBeforeChange bACnetConstructedDataCountBeforeChange =
           new BACnetConstructedDataCountBeforeChange(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              countBeforeChange,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, countBeforeChange);
       return bACnetConstructedDataCountBeforeChange;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCountChangeTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCountChangeTime.java
index 05dd55449b2..fea7b70cb10 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCountChangeTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCountChangeTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime countChangeTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCountChangeTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime countChangeTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime countChangeTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.countChangeTime = countChangeTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getCountChangeTime() {
@@ -130,39 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCountChangeTime");
     // Create the instance
-    return new BACnetConstructedDataCountChangeTimeBuilderImpl(
-        countChangeTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCountChangeTimeBuilderImpl(countChangeTime);
   }
 
   public static class BACnetConstructedDataCountChangeTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime countChangeTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataCountChangeTimeBuilderImpl(
-        BACnetDateTime countChangeTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataCountChangeTimeBuilderImpl(BACnetDateTime countChangeTime) {
       this.countChangeTime = countChangeTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCountChangeTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCountChangeTime bACnetConstructedDataCountChangeTime =
           new BACnetConstructedDataCountChangeTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              countChangeTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, countChangeTime);
       return bACnetConstructedDataCountChangeTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDataInputAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDataInputAll.java
index 77c306ec95c..7e7c362025d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDataInputAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDataInputAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCredentialDataInputAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,30 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCredentialDataInputAll");
     // Create the instance
-    return new BACnetConstructedDataCredentialDataInputAllBuilderImpl(
-        tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCredentialDataInputAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataCredentialDataInputAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataCredentialDataInputAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataCredentialDataInputAllBuilderImpl() {}
 
     public BACnetConstructedDataCredentialDataInputAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCredentialDataInputAll bACnetConstructedDataCredentialDataInputAll =
-          new BACnetConstructedDataCredentialDataInputAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataCredentialDataInputAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataCredentialDataInputAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDataInputPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDataInputPresentValue.java
index 43bcfb8cb48..8c0ac69d8e6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDataInputPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDataInputPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetAuthenticationFactor presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCredentialDataInputPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetAuthenticationFactor presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetAuthenticationFactor presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetAuthenticationFactor getPresentValue() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCredentialDataInputPresentValue");
     // Create the instance
-    return new BACnetConstructedDataCredentialDataInputPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCredentialDataInputPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataCredentialDataInputPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetAuthenticationFactor presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCredentialDataInputPresentValueBuilderImpl(
-        BACnetAuthenticationFactor presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetAuthenticationFactor presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCredentialDataInputPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCredentialDataInputPresentValue
           bACnetConstructedDataCredentialDataInputPresentValue =
               new BACnetConstructedDataCredentialDataInputPresentValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  presentValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataCredentialDataInputPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDataInputUpdateTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDataInputUpdateTime.java
index d7ff2187b4d..0d5c75420f8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDataInputUpdateTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDataInputUpdateTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetTimeStamp updateTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCredentialDataInputUpdateTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetTimeStamp updateTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetTimeStamp updateTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.updateTime = updateTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetTimeStamp getUpdateTime() {
@@ -130,40 +122,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCredentialDataInputUpdateTime");
     // Create the instance
-    return new BACnetConstructedDataCredentialDataInputUpdateTimeBuilderImpl(
-        updateTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCredentialDataInputUpdateTimeBuilderImpl(updateTime);
   }
 
   public static class BACnetConstructedDataCredentialDataInputUpdateTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetTimeStamp updateTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCredentialDataInputUpdateTimeBuilderImpl(
-        BACnetTimeStamp updateTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetTimeStamp updateTime) {
       this.updateTime = updateTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCredentialDataInputUpdateTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCredentialDataInputUpdateTime
           bACnetConstructedDataCredentialDataInputUpdateTime =
               new BACnetConstructedDataCredentialDataInputUpdateTime(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  updateTime,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, updateTime);
       return bACnetConstructedDataCredentialDataInputUpdateTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDisable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDisable.java
index cf8ce3fd15f..e91af3cb260 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDisable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialDisable.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetAccessCredentialDisableTagged credentialDisable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCredentialDisable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetAccessCredentialDisableTagged credentialDisable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetAccessCredentialDisableTagged credentialDisable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.credentialDisable = credentialDisable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetAccessCredentialDisableTagged getCredentialDisable() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCredentialDisable");
     // Create the instance
-    return new BACnetConstructedDataCredentialDisableBuilderImpl(
-        credentialDisable, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCredentialDisableBuilderImpl(credentialDisable);
   }
 
   public static class BACnetConstructedDataCredentialDisableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetAccessCredentialDisableTagged credentialDisable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCredentialDisableBuilderImpl(
-        BACnetAccessCredentialDisableTagged credentialDisable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetAccessCredentialDisableTagged credentialDisable) {
       this.credentialDisable = credentialDisable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCredentialDisable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCredentialDisable bACnetConstructedDataCredentialDisable =
           new BACnetConstructedDataCredentialDisable(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              credentialDisable,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, credentialDisable);
       return bACnetConstructedDataCredentialDisable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialStatus.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialStatus.java
index 03dc1045809..46d7b6da489 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialStatus.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialStatus.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetBinaryPVTagged binaryPv;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCredentialStatus(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetBinaryPVTagged binaryPv,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetBinaryPVTagged binaryPv) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.binaryPv = binaryPv;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetBinaryPVTagged getBinaryPv() {
@@ -135,34 +127,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCredentialStatus");
     // Create the instance
-    return new BACnetConstructedDataCredentialStatusBuilderImpl(
-        binaryPv, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCredentialStatusBuilderImpl(binaryPv);
   }
 
   public static class BACnetConstructedDataCredentialStatusBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetBinaryPVTagged binaryPv;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataCredentialStatusBuilderImpl(
-        BACnetBinaryPVTagged binaryPv,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataCredentialStatusBuilderImpl(BACnetBinaryPVTagged binaryPv) {
       this.binaryPv = binaryPv;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCredentialStatus build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCredentialStatus bACnetConstructedDataCredentialStatus =
           new BACnetConstructedDataCredentialStatus(
-              openingTag, peekedTagHeader, closingTag, binaryPv, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, binaryPv);
       return bACnetConstructedDataCredentialStatus;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentials.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentials.java
index e3f30118831..5c9c7c90096 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentials.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentials.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetDeviceObjectReference> credentials;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCredentials(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetDeviceObjectReference> credentials,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDeviceObjectReference> credentials) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.credentials = credentials;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetDeviceObjectReference> getCredentials() {
@@ -126,34 +118,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCredentials");
     // Create the instance
-    return new BACnetConstructedDataCredentialsBuilderImpl(
-        credentials, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCredentialsBuilderImpl(credentials);
   }
 
   public static class BACnetConstructedDataCredentialsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetDeviceObjectReference> credentials;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCredentialsBuilderImpl(
-        List<BACnetDeviceObjectReference> credentials,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDeviceObjectReference> credentials) {
       this.credentials = credentials;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCredentials build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCredentials bACnetConstructedDataCredentials =
           new BACnetConstructedDataCredentials(
-              openingTag, peekedTagHeader, closingTag, credentials, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, credentials);
       return bACnetConstructedDataCredentials;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialsInZone.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialsInZone.java
index ac516b123e8..098621fe2e4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialsInZone.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCredentialsInZone.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetDeviceObjectReference> credentialsInZone;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCredentialsInZone(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetDeviceObjectReference> credentialsInZone,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDeviceObjectReference> credentialsInZone) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.credentialsInZone = credentialsInZone;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetDeviceObjectReference> getCredentialsInZone() {
@@ -127,39 +119,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCredentialsInZone");
     // Create the instance
-    return new BACnetConstructedDataCredentialsInZoneBuilderImpl(
-        credentialsInZone, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCredentialsInZoneBuilderImpl(credentialsInZone);
   }
 
   public static class BACnetConstructedDataCredentialsInZoneBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetDeviceObjectReference> credentialsInZone;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCredentialsInZoneBuilderImpl(
-        List<BACnetDeviceObjectReference> credentialsInZone,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDeviceObjectReference> credentialsInZone) {
       this.credentialsInZone = credentialsInZone;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCredentialsInZone build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCredentialsInZone bACnetConstructedDataCredentialsInZone =
           new BACnetConstructedDataCredentialsInZone(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              credentialsInZone,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, credentialsInZone);
       return bACnetConstructedDataCredentialsInZone;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCurrentCommandPriority.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCurrentCommandPriority.java
index 314984db86e..ff49452c9f7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCurrentCommandPriority.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataCurrentCommandPriority.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetOptionalUnsigned currentCommandPriority;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataCurrentCommandPriority(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetOptionalUnsigned currentCommandPriority,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetOptionalUnsigned currentCommandPriority) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.currentCommandPriority = currentCommandPriority;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetOptionalUnsigned getCurrentCommandPriority() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataCurrentCommandPriority");
     // Create the instance
-    return new BACnetConstructedDataCurrentCommandPriorityBuilderImpl(
-        currentCommandPriority, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataCurrentCommandPriorityBuilderImpl(currentCommandPriority);
   }
 
   public static class BACnetConstructedDataCurrentCommandPriorityBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetOptionalUnsigned currentCommandPriority;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataCurrentCommandPriorityBuilderImpl(
-        BACnetOptionalUnsigned currentCommandPriority,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOptionalUnsigned currentCommandPriority) {
       this.currentCommandPriority = currentCommandPriority;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataCurrentCommandPriority build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataCurrentCommandPriority bACnetConstructedDataCurrentCommandPriority =
           new BACnetConstructedDataCurrentCommandPriority(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              currentCommandPriority,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, currentCommandPriority);
       return bACnetConstructedDataCurrentCommandPriority;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatabaseRevision.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatabaseRevision.java
index 5eeb2c11eee..f9657359ad8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatabaseRevision.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatabaseRevision.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger databaseRevision;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDatabaseRevision(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger databaseRevision,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger databaseRevision) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.databaseRevision = databaseRevision;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getDatabaseRevision() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDatabaseRevision");
     // Create the instance
-    return new BACnetConstructedDataDatabaseRevisionBuilderImpl(
-        databaseRevision, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDatabaseRevisionBuilderImpl(databaseRevision);
   }
 
   public static class BACnetConstructedDataDatabaseRevisionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger databaseRevision;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDatabaseRevisionBuilderImpl(
-        BACnetApplicationTagUnsignedInteger databaseRevision,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger databaseRevision) {
       this.databaseRevision = databaseRevision;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDatabaseRevision build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDatabaseRevision bACnetConstructedDataDatabaseRevision =
           new BACnetConstructedDataDatabaseRevision(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              databaseRevision,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, databaseRevision);
       return bACnetConstructedDataDatabaseRevision;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateList.java
index 1051239820d..716dfe6ca98 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateList.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetCalendarEntry> dateList;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDateList(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetCalendarEntry> dateList,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetCalendarEntry> dateList) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.dateList = dateList;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetCalendarEntry> getDateList() {
@@ -126,33 +118,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDateList");
     // Create the instance
-    return new BACnetConstructedDataDateListBuilderImpl(dateList, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDateListBuilderImpl(dateList);
   }
 
   public static class BACnetConstructedDataDateListBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetCalendarEntry> dateList;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataDateListBuilderImpl(
-        List<BACnetCalendarEntry> dateList,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataDateListBuilderImpl(List<BACnetCalendarEntry> dateList) {
       this.dateList = dateList;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDateList build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDateList bACnetConstructedDataDateList =
-          new BACnetConstructedDataDateList(
-              openingTag, peekedTagHeader, closingTag, dateList, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataDateList(openingTag, peekedTagHeader, closingTag, dateList);
       return bACnetConstructedDataDateList;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatePatternValuePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatePatternValuePresentValue.java
index 4c054ea8e14..f256b7cebbb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatePatternValuePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatePatternValuePresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDate presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDatePatternValuePresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDate presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDate presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDate getPresentValue() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDatePatternValuePresentValue");
     // Create the instance
-    return new BACnetConstructedDataDatePatternValuePresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDatePatternValuePresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataDatePatternValuePresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDate presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDatePatternValuePresentValueBuilderImpl(
-        BACnetApplicationTagDate presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagDate presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDatePatternValuePresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDatePatternValuePresentValue
           bACnetConstructedDataDatePatternValuePresentValue =
               new BACnetConstructedDataDatePatternValuePresentValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  presentValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataDatePatternValuePresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatePatternValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatePatternValueRelinquishDefault.java
index 66749ebeab8..fb238741dea 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatePatternValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatePatternValueRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDate relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDatePatternValueRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDate relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDate relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDate getRelinquishDefault() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDatePatternValueRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataDatePatternValueRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDatePatternValueRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataDatePatternValueRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDate relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDatePatternValueRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagDate relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagDate relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDatePatternValueRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDatePatternValueRelinquishDefault
           bACnetConstructedDataDatePatternValueRelinquishDefault =
               new BACnetConstructedDataDatePatternValueRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataDatePatternValueRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimePatternValuePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimePatternValuePresentValue.java
index c0efa2e67fd..642a9f618ec 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimePatternValuePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimePatternValuePresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDateTimePatternValuePresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getPresentValue() {
@@ -130,40 +122,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDateTimePatternValuePresentValue");
     // Create the instance
-    return new BACnetConstructedDataDateTimePatternValuePresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDateTimePatternValuePresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataDateTimePatternValuePresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDateTimePatternValuePresentValueBuilderImpl(
-        BACnetDateTime presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDateTime presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDateTimePatternValuePresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDateTimePatternValuePresentValue
           bACnetConstructedDataDateTimePatternValuePresentValue =
               new BACnetConstructedDataDateTimePatternValuePresentValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  presentValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataDateTimePatternValuePresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimePatternValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimePatternValueRelinquishDefault.java
index ff4354b76f6..00e83741949 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimePatternValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimePatternValueRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDateTimePatternValueRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getRelinquishDefault() {
@@ -132,39 +124,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataDateTimePatternValueRelinquishDefault");
     // Create the instance
     return new BACnetConstructedDataDateTimePatternValueRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+        relinquishDefault);
   }
 
   public static class BACnetConstructedDataDateTimePatternValueRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDateTimePatternValueRelinquishDefaultBuilderImpl(
-        BACnetDateTime relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDateTime relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDateTimePatternValueRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDateTimePatternValueRelinquishDefault
           bACnetConstructedDataDateTimePatternValueRelinquishDefault =
               new BACnetConstructedDataDateTimePatternValueRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataDateTimePatternValueRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimeValuePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimeValuePresentValue.java
index 6ad3af313e3..5aa352cb2ea 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimeValuePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimeValuePresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDateTimeValuePresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getPresentValue() {
@@ -130,40 +122,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDateTimeValuePresentValue");
     // Create the instance
-    return new BACnetConstructedDataDateTimeValuePresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDateTimeValuePresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataDateTimeValuePresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataDateTimeValuePresentValueBuilderImpl(
-        BACnetDateTime presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataDateTimeValuePresentValueBuilderImpl(BACnetDateTime presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDateTimeValuePresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDateTimeValuePresentValue
           bACnetConstructedDataDateTimeValuePresentValue =
               new BACnetConstructedDataDateTimeValuePresentValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  presentValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataDateTimeValuePresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimeValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimeValueRelinquishDefault.java
index a45160f8fb5..04a005e4511 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimeValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateTimeValueRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDateTimeValueRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getRelinquishDefault() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDateTimeValueRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataDateTimeValueRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDateTimeValueRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataDateTimeValueRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDateTimeValueRelinquishDefaultBuilderImpl(
-        BACnetDateTime relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDateTime relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDateTimeValueRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDateTimeValueRelinquishDefault
           bACnetConstructedDataDateTimeValueRelinquishDefault =
               new BACnetConstructedDataDateTimeValueRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataDateTimeValueRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateValueAll.java
index 3ccc6b67236..54a04d44c0b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateValueAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDateValueAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDateValueAll");
     // Create the instance
-    return new BACnetConstructedDataDateValueAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDateValueAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataDateValueAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataDateValueAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataDateValueAllBuilderImpl() {}
 
     public BACnetConstructedDataDateValueAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDateValueAll bACnetConstructedDataDateValueAll =
-          new BACnetConstructedDataDateValueAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataDateValueAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataDateValueAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateValuePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateValuePresentValue.java
index 4e59318156a..d9d656d0c79 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateValuePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateValuePresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDate presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDateValuePresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDate presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDate presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDate getPresentValue() {
@@ -133,34 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDateValuePresentValue");
     // Create the instance
-    return new BACnetConstructedDataDateValuePresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDateValuePresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataDateValuePresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDate presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDateValuePresentValueBuilderImpl(
-        BACnetApplicationTagDate presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagDate presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDateValuePresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDateValuePresentValue bACnetConstructedDataDateValuePresentValue =
           new BACnetConstructedDataDateValuePresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataDateValuePresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateValueRelinquishDefault.java
index 04d68af3627..0f0a7ff7a20 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDateValueRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDate relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDateValueRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDate relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDate relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDate getRelinquishDefault() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDateValueRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataDateValueRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDateValueRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataDateValueRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDate relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDateValueRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagDate relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagDate relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDateValueRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDateValueRelinquishDefault
           bACnetConstructedDataDateValueRelinquishDefault =
               new BACnetConstructedDataDateValueRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataDateValueRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatepatternValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatepatternValueAll.java
index 60f2b120c36..68d5af99d13 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatepatternValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatepatternValueAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDatepatternValueAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDatepatternValueAll");
     // Create the instance
-    return new BACnetConstructedDataDatepatternValueAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDatepatternValueAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataDatepatternValueAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataDatepatternValueAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataDatepatternValueAllBuilderImpl() {}
 
     public BACnetConstructedDataDatepatternValueAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDatepatternValueAll bACnetConstructedDataDatepatternValueAll =
-          new BACnetConstructedDataDatepatternValueAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataDatepatternValueAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataDatepatternValueAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatetimeValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatetimeValueAll.java
index f2402cb1e83..7999c652026 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatetimeValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatetimeValueAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDatetimeValueAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDatetimeValueAll");
     // Create the instance
-    return new BACnetConstructedDataDatetimeValueAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDatetimeValueAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataDatetimeValueAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataDatetimeValueAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataDatetimeValueAllBuilderImpl() {}
 
     public BACnetConstructedDataDatetimeValueAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDatetimeValueAll bACnetConstructedDataDatetimeValueAll =
-          new BACnetConstructedDataDatetimeValueAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataDatetimeValueAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataDatetimeValueAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatetimepatternValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatetimepatternValueAll.java
index 0f6ed8737b4..bc991e47bc3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatetimepatternValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDatetimepatternValueAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDatetimepatternValueAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,30 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDatetimepatternValueAll");
     // Create the instance
-    return new BACnetConstructedDataDatetimepatternValueAllBuilderImpl(
-        tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDatetimepatternValueAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataDatetimepatternValueAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataDatetimepatternValueAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataDatetimepatternValueAllBuilderImpl() {}
 
     public BACnetConstructedDataDatetimepatternValueAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDatetimepatternValueAll bACnetConstructedDataDatetimepatternValueAll =
-          new BACnetConstructedDataDatetimepatternValueAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataDatetimepatternValueAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataDatetimepatternValueAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDaylightSavingsStatus.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDaylightSavingsStatus.java
index 4cde44f616a..976c1cf49ad 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDaylightSavingsStatus.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDaylightSavingsStatus.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean daylightSavingsStatus;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDaylightSavingsStatus(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean daylightSavingsStatus,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean daylightSavingsStatus) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.daylightSavingsStatus = daylightSavingsStatus;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getDaylightSavingsStatus() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDaylightSavingsStatus");
     // Create the instance
-    return new BACnetConstructedDataDaylightSavingsStatusBuilderImpl(
-        daylightSavingsStatus, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDaylightSavingsStatusBuilderImpl(daylightSavingsStatus);
   }
 
   public static class BACnetConstructedDataDaylightSavingsStatusBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean daylightSavingsStatus;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDaylightSavingsStatusBuilderImpl(
-        BACnetApplicationTagBoolean daylightSavingsStatus,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean daylightSavingsStatus) {
       this.daylightSavingsStatus = daylightSavingsStatus;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDaylightSavingsStatus build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDaylightSavingsStatus bACnetConstructedDataDaylightSavingsStatus =
           new BACnetConstructedDataDaylightSavingsStatus(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              daylightSavingsStatus,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, daylightSavingsStatus);
       return bACnetConstructedDataDaylightSavingsStatus;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDaysRemaining.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDaysRemaining.java
index e1839d202e5..d37bd661f87 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDaysRemaining.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDaysRemaining.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger daysRemaining;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDaysRemaining(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger daysRemaining,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger daysRemaining) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.daysRemaining = daysRemaining;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getDaysRemaining() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDaysRemaining");
     // Create the instance
-    return new BACnetConstructedDataDaysRemainingBuilderImpl(
-        daysRemaining, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDaysRemainingBuilderImpl(daysRemaining);
   }
 
   public static class BACnetConstructedDataDaysRemainingBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger daysRemaining;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDaysRemainingBuilderImpl(
-        BACnetApplicationTagSignedInteger daysRemaining,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagSignedInteger daysRemaining) {
       this.daysRemaining = daysRemaining;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDaysRemaining build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDaysRemaining bACnetConstructedDataDaysRemaining =
           new BACnetConstructedDataDaysRemaining(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              daysRemaining,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, daysRemaining);
       return bACnetConstructedDataDaysRemaining;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeadband.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeadband.java
index b540bf149b5..bb0ee86cd63 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeadband.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeadband.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal deadband;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDeadband(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal deadband,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal deadband) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.deadband = deadband;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getDeadband() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDeadband");
     // Create the instance
-    return new BACnetConstructedDataDeadbandBuilderImpl(deadband, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDeadbandBuilderImpl(deadband);
   }
 
   public static class BACnetConstructedDataDeadbandBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal deadband;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataDeadbandBuilderImpl(
-        BACnetApplicationTagReal deadband,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataDeadbandBuilderImpl(BACnetApplicationTagReal deadband) {
       this.deadband = deadband;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDeadband build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDeadband bACnetConstructedDataDeadband =
-          new BACnetConstructedDataDeadband(
-              openingTag, peekedTagHeader, closingTag, deadband, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataDeadband(openingTag, peekedTagHeader, closingTag, deadband);
       return bACnetConstructedDataDeadband;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultFadeTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultFadeTime.java
index 8547de2ed1f..7c43c9bc100 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultFadeTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultFadeTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger defaultFadeTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDefaultFadeTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger defaultFadeTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger defaultFadeTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.defaultFadeTime = defaultFadeTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getDefaultFadeTime() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDefaultFadeTime");
     // Create the instance
-    return new BACnetConstructedDataDefaultFadeTimeBuilderImpl(
-        defaultFadeTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDefaultFadeTimeBuilderImpl(defaultFadeTime);
   }
 
   public static class BACnetConstructedDataDefaultFadeTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger defaultFadeTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDefaultFadeTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger defaultFadeTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger defaultFadeTime) {
       this.defaultFadeTime = defaultFadeTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDefaultFadeTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDefaultFadeTime bACnetConstructedDataDefaultFadeTime =
           new BACnetConstructedDataDefaultFadeTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              defaultFadeTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, defaultFadeTime);
       return bACnetConstructedDataDefaultFadeTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultRampRate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultRampRate.java
index 3f222dcd364..2cdf74f1c14 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultRampRate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultRampRate.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal defaultRampRate;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDefaultRampRate(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal defaultRampRate,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal defaultRampRate) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.defaultRampRate = defaultRampRate;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getDefaultRampRate() {
@@ -132,39 +124,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDefaultRampRate");
     // Create the instance
-    return new BACnetConstructedDataDefaultRampRateBuilderImpl(
-        defaultRampRate, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDefaultRampRateBuilderImpl(defaultRampRate);
   }
 
   public static class BACnetConstructedDataDefaultRampRateBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal defaultRampRate;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDefaultRampRateBuilderImpl(
-        BACnetApplicationTagReal defaultRampRate,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal defaultRampRate) {
       this.defaultRampRate = defaultRampRate;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDefaultRampRate build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDefaultRampRate bACnetConstructedDataDefaultRampRate =
           new BACnetConstructedDataDefaultRampRate(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              defaultRampRate,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, defaultRampRate);
       return bACnetConstructedDataDefaultRampRate;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultStepIncrement.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultStepIncrement.java
index 2dc77e49cda..2cbf04f49a6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultStepIncrement.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultStepIncrement.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal defaultStepIncrement;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDefaultStepIncrement(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal defaultStepIncrement,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal defaultStepIncrement) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.defaultStepIncrement = defaultStepIncrement;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getDefaultStepIncrement() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDefaultStepIncrement");
     // Create the instance
-    return new BACnetConstructedDataDefaultStepIncrementBuilderImpl(
-        defaultStepIncrement, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDefaultStepIncrementBuilderImpl(defaultStepIncrement);
   }
 
   public static class BACnetConstructedDataDefaultStepIncrementBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal defaultStepIncrement;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDefaultStepIncrementBuilderImpl(
-        BACnetApplicationTagReal defaultStepIncrement,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal defaultStepIncrement) {
       this.defaultStepIncrement = defaultStepIncrement;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDefaultStepIncrement build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDefaultStepIncrement bACnetConstructedDataDefaultStepIncrement =
           new BACnetConstructedDataDefaultStepIncrement(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              defaultStepIncrement,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, defaultStepIncrement);
       return bACnetConstructedDataDefaultStepIncrement;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultSubordinateRelationship.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultSubordinateRelationship.java
index 8586ef8b158..8f6b96c7e0e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultSubordinateRelationship.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultSubordinateRelationship.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetRelationshipTagged defaultSubordinateRelationship;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDefaultSubordinateRelationship(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetRelationshipTagged defaultSubordinateRelationship,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetRelationshipTagged defaultSubordinateRelationship) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.defaultSubordinateRelationship = defaultSubordinateRelationship;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetRelationshipTagged getDefaultSubordinateRelationship() {
@@ -140,39 +132,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataDefaultSubordinateRelationship");
     // Create the instance
     return new BACnetConstructedDataDefaultSubordinateRelationshipBuilderImpl(
-        defaultSubordinateRelationship, tagNumber, arrayIndexArgument);
+        defaultSubordinateRelationship);
   }
 
   public static class BACnetConstructedDataDefaultSubordinateRelationshipBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetRelationshipTagged defaultSubordinateRelationship;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDefaultSubordinateRelationshipBuilderImpl(
-        BACnetRelationshipTagged defaultSubordinateRelationship,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetRelationshipTagged defaultSubordinateRelationship) {
       this.defaultSubordinateRelationship = defaultSubordinateRelationship;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDefaultSubordinateRelationship build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDefaultSubordinateRelationship
           bACnetConstructedDataDefaultSubordinateRelationship =
               new BACnetConstructedDataDefaultSubordinateRelationship(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  defaultSubordinateRelationship,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, defaultSubordinateRelationship);
       return bACnetConstructedDataDefaultSubordinateRelationship;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultTimeout.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultTimeout.java
index c4ec4835003..5f3b9305522 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultTimeout.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDefaultTimeout.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger defaultTimeout;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDefaultTimeout(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger defaultTimeout,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger defaultTimeout) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.defaultTimeout = defaultTimeout;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getDefaultTimeout() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDefaultTimeout");
     // Create the instance
-    return new BACnetConstructedDataDefaultTimeoutBuilderImpl(
-        defaultTimeout, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDefaultTimeoutBuilderImpl(defaultTimeout);
   }
 
   public static class BACnetConstructedDataDefaultTimeoutBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger defaultTimeout;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDefaultTimeoutBuilderImpl(
-        BACnetApplicationTagUnsignedInteger defaultTimeout,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger defaultTimeout) {
       this.defaultTimeout = defaultTimeout;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDefaultTimeout build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDefaultTimeout bACnetConstructedDataDefaultTimeout =
           new BACnetConstructedDataDefaultTimeout(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              defaultTimeout,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, defaultTimeout);
       return bACnetConstructedDataDefaultTimeout;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeployedProfileLocation.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeployedProfileLocation.java
index 4d6ecc14fb1..7a3022f00f5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeployedProfileLocation.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeployedProfileLocation.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString deployedProfileLocation;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDeployedProfileLocation(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString deployedProfileLocation,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString deployedProfileLocation) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.deployedProfileLocation = deployedProfileLocation;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getDeployedProfileLocation() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDeployedProfileLocation");
     // Create the instance
-    return new BACnetConstructedDataDeployedProfileLocationBuilderImpl(
-        deployedProfileLocation, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDeployedProfileLocationBuilderImpl(deployedProfileLocation);
   }
 
   public static class BACnetConstructedDataDeployedProfileLocationBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString deployedProfileLocation;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDeployedProfileLocationBuilderImpl(
-        BACnetApplicationTagCharacterString deployedProfileLocation,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString deployedProfileLocation) {
       this.deployedProfileLocation = deployedProfileLocation;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDeployedProfileLocation build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDeployedProfileLocation bACnetConstructedDataDeployedProfileLocation =
           new BACnetConstructedDataDeployedProfileLocation(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              deployedProfileLocation,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, deployedProfileLocation);
       return bACnetConstructedDataDeployedProfileLocation;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDerivativeConstant.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDerivativeConstant.java
index 90cbf02e921..92fe27c0df8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDerivativeConstant.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDerivativeConstant.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal derivativeConstant;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDerivativeConstant(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal derivativeConstant,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal derivativeConstant) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.derivativeConstant = derivativeConstant;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getDerivativeConstant() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDerivativeConstant");
     // Create the instance
-    return new BACnetConstructedDataDerivativeConstantBuilderImpl(
-        derivativeConstant, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDerivativeConstantBuilderImpl(derivativeConstant);
   }
 
   public static class BACnetConstructedDataDerivativeConstantBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal derivativeConstant;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDerivativeConstantBuilderImpl(
-        BACnetApplicationTagReal derivativeConstant,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal derivativeConstant) {
       this.derivativeConstant = derivativeConstant;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDerivativeConstant build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDerivativeConstant bACnetConstructedDataDerivativeConstant =
           new BACnetConstructedDataDerivativeConstant(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              derivativeConstant,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, derivativeConstant);
       return bACnetConstructedDataDerivativeConstant;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDerivativeConstantUnits.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDerivativeConstantUnits.java
index b81244fd1b4..2925205e2b2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDerivativeConstantUnits.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDerivativeConstantUnits.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetEngineeringUnitsTagged units;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDerivativeConstantUnits(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetEngineeringUnitsTagged units,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetEngineeringUnitsTagged units) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.units = units;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetEngineeringUnitsTagged getUnits() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDerivativeConstantUnits");
     // Create the instance
-    return new BACnetConstructedDataDerivativeConstantUnitsBuilderImpl(
-        units, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDerivativeConstantUnitsBuilderImpl(units);
   }
 
   public static class BACnetConstructedDataDerivativeConstantUnitsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetEngineeringUnitsTagged units;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDerivativeConstantUnitsBuilderImpl(
-        BACnetEngineeringUnitsTagged units,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetEngineeringUnitsTagged units) {
       this.units = units;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDerivativeConstantUnits build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDerivativeConstantUnits bACnetConstructedDataDerivativeConstantUnits =
           new BACnetConstructedDataDerivativeConstantUnits(
-              openingTag, peekedTagHeader, closingTag, units, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, units);
       return bACnetConstructedDataDerivativeConstantUnits;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDescription.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDescription.java
index e810866eb3d..3331cc15558 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDescription.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDescription.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString description;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDescription(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString description,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString description) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.description = description;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getDescription() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDescription");
     // Create the instance
-    return new BACnetConstructedDataDescriptionBuilderImpl(
-        description, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDescriptionBuilderImpl(description);
   }
 
   public static class BACnetConstructedDataDescriptionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString description;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDescriptionBuilderImpl(
-        BACnetApplicationTagCharacterString description,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString description) {
       this.description = description;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDescription build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDescription bACnetConstructedDataDescription =
           new BACnetConstructedDataDescription(
-              openingTag, peekedTagHeader, closingTag, description, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, description);
       return bACnetConstructedDataDescription;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDescriptionOfHalt.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDescriptionOfHalt.java
index 0bc9349daff..bec9d49163b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDescriptionOfHalt.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDescriptionOfHalt.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString descriptionForHalt;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDescriptionOfHalt(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString descriptionForHalt,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString descriptionForHalt) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.descriptionForHalt = descriptionForHalt;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getDescriptionForHalt() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDescriptionOfHalt");
     // Create the instance
-    return new BACnetConstructedDataDescriptionOfHaltBuilderImpl(
-        descriptionForHalt, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDescriptionOfHaltBuilderImpl(descriptionForHalt);
   }
 
   public static class BACnetConstructedDataDescriptionOfHaltBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString descriptionForHalt;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDescriptionOfHaltBuilderImpl(
-        BACnetApplicationTagCharacterString descriptionForHalt,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString descriptionForHalt) {
       this.descriptionForHalt = descriptionForHalt;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDescriptionOfHalt build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDescriptionOfHalt bACnetConstructedDataDescriptionOfHalt =
           new BACnetConstructedDataDescriptionOfHalt(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              descriptionForHalt,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, descriptionForHalt);
       return bACnetConstructedDataDescriptionOfHalt;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceAddressBinding.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceAddressBinding.java
index 915b27e0053..b74cb27acb7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceAddressBinding.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceAddressBinding.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetAddressBinding> deviceAddressBinding;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDeviceAddressBinding(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetAddressBinding> deviceAddressBinding,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetAddressBinding> deviceAddressBinding) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.deviceAddressBinding = deviceAddressBinding;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetAddressBinding> getDeviceAddressBinding() {
@@ -127,39 +119,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDeviceAddressBinding");
     // Create the instance
-    return new BACnetConstructedDataDeviceAddressBindingBuilderImpl(
-        deviceAddressBinding, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDeviceAddressBindingBuilderImpl(deviceAddressBinding);
   }
 
   public static class BACnetConstructedDataDeviceAddressBindingBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetAddressBinding> deviceAddressBinding;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDeviceAddressBindingBuilderImpl(
-        List<BACnetAddressBinding> deviceAddressBinding,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetAddressBinding> deviceAddressBinding) {
       this.deviceAddressBinding = deviceAddressBinding;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDeviceAddressBinding build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDeviceAddressBinding bACnetConstructedDataDeviceAddressBinding =
           new BACnetConstructedDataDeviceAddressBinding(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              deviceAddressBinding,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, deviceAddressBinding);
       return bACnetConstructedDataDeviceAddressBinding;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceAll.java
index 6fadab8a989..498b943ef40 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDeviceAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDeviceAll");
     // Create the instance
-    return new BACnetConstructedDataDeviceAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDeviceAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataDeviceAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataDeviceAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataDeviceAllBuilderImpl() {}
 
     public BACnetConstructedDataDeviceAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDeviceAll bACnetConstructedDataDeviceAll =
-          new BACnetConstructedDataDeviceAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataDeviceAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataDeviceAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceMaxInfoFrames.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceMaxInfoFrames.java
index 3016954bf57..745856a9ab5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceMaxInfoFrames.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceMaxInfoFrames.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger maxInfoFrames;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDeviceMaxInfoFrames(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger maxInfoFrames,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger maxInfoFrames) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxInfoFrames = maxInfoFrames;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMaxInfoFrames() {
@@ -135,39 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDeviceMaxInfoFrames");
     // Create the instance
-    return new BACnetConstructedDataDeviceMaxInfoFramesBuilderImpl(
-        maxInfoFrames, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDeviceMaxInfoFramesBuilderImpl(maxInfoFrames);
   }
 
   public static class BACnetConstructedDataDeviceMaxInfoFramesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger maxInfoFrames;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDeviceMaxInfoFramesBuilderImpl(
-        BACnetApplicationTagUnsignedInteger maxInfoFrames,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger maxInfoFrames) {
       this.maxInfoFrames = maxInfoFrames;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDeviceMaxInfoFrames build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDeviceMaxInfoFrames bACnetConstructedDataDeviceMaxInfoFrames =
           new BACnetConstructedDataDeviceMaxInfoFrames(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              maxInfoFrames,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxInfoFrames);
       return bACnetConstructedDataDeviceMaxInfoFrames;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceMaxMaster.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceMaxMaster.java
index ccac1926ddb..dac7c74f4a5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceMaxMaster.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceMaxMaster.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger maxMaster;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDeviceMaxMaster(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger maxMaster,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger maxMaster) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxMaster = maxMaster;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMaxMaster() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDeviceMaxMaster");
     // Create the instance
-    return new BACnetConstructedDataDeviceMaxMasterBuilderImpl(
-        maxMaster, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDeviceMaxMasterBuilderImpl(maxMaster);
   }
 
   public static class BACnetConstructedDataDeviceMaxMasterBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger maxMaster;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDeviceMaxMasterBuilderImpl(
-        BACnetApplicationTagUnsignedInteger maxMaster,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger maxMaster) {
       this.maxMaster = maxMaster;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDeviceMaxMaster build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDeviceMaxMaster bACnetConstructedDataDeviceMaxMaster =
           new BACnetConstructedDataDeviceMaxMaster(
-              openingTag, peekedTagHeader, closingTag, maxMaster, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxMaster);
       return bACnetConstructedDataDeviceMaxMaster;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceType.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceType.java
index b2832e2c103..f01f59f1749 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceType.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDeviceType.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString deviceType;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDeviceType(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString deviceType,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString deviceType) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.deviceType = deviceType;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getDeviceType() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDeviceType");
     // Create the instance
-    return new BACnetConstructedDataDeviceTypeBuilderImpl(
-        deviceType, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDeviceTypeBuilderImpl(deviceType);
   }
 
   public static class BACnetConstructedDataDeviceTypeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString deviceType;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDeviceTypeBuilderImpl(
-        BACnetApplicationTagCharacterString deviceType,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString deviceType) {
       this.deviceType = deviceType;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDeviceType build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDeviceType bACnetConstructedDataDeviceType =
-          new BACnetConstructedDataDeviceType(
-              openingTag, peekedTagHeader, closingTag, deviceType, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataDeviceType(openingTag, peekedTagHeader, closingTag, deviceType);
       return bACnetConstructedDataDeviceType;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDirectReading.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDirectReading.java
index 3c6894e7c56..25dea716de4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDirectReading.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDirectReading.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal directReading;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDirectReading(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal directReading,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal directReading) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.directReading = directReading;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getDirectReading() {
@@ -132,39 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDirectReading");
     // Create the instance
-    return new BACnetConstructedDataDirectReadingBuilderImpl(
-        directReading, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDirectReadingBuilderImpl(directReading);
   }
 
   public static class BACnetConstructedDataDirectReadingBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal directReading;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataDirectReadingBuilderImpl(
-        BACnetApplicationTagReal directReading,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataDirectReadingBuilderImpl(BACnetApplicationTagReal directReading) {
       this.directReading = directReading;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDirectReading build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDirectReading bACnetConstructedDataDirectReading =
           new BACnetConstructedDataDirectReading(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              directReading,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, directReading);
       return bACnetConstructedDataDirectReading;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDistributionKeyRevision.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDistributionKeyRevision.java
index 0ae2e66d233..68daab1c856 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDistributionKeyRevision.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDistributionKeyRevision.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger distributionKeyRevision;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDistributionKeyRevision(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger distributionKeyRevision,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger distributionKeyRevision) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.distributionKeyRevision = distributionKeyRevision;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getDistributionKeyRevision() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDistributionKeyRevision");
     // Create the instance
-    return new BACnetConstructedDataDistributionKeyRevisionBuilderImpl(
-        distributionKeyRevision, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDistributionKeyRevisionBuilderImpl(distributionKeyRevision);
   }
 
   public static class BACnetConstructedDataDistributionKeyRevisionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger distributionKeyRevision;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDistributionKeyRevisionBuilderImpl(
-        BACnetApplicationTagUnsignedInteger distributionKeyRevision,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger distributionKeyRevision) {
       this.distributionKeyRevision = distributionKeyRevision;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDistributionKeyRevision build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDistributionKeyRevision bACnetConstructedDataDistributionKeyRevision =
           new BACnetConstructedDataDistributionKeyRevision(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              distributionKeyRevision,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, distributionKeyRevision);
       return bACnetConstructedDataDistributionKeyRevision;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoNotHide.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoNotHide.java
index 5787b01bff6..f0050c4dfd6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoNotHide.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoNotHide.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean doNotHide;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDoNotHide(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean doNotHide,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean doNotHide) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.doNotHide = doNotHide;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getDoNotHide() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDoNotHide");
     // Create the instance
-    return new BACnetConstructedDataDoNotHideBuilderImpl(doNotHide, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDoNotHideBuilderImpl(doNotHide);
   }
 
   public static class BACnetConstructedDataDoNotHideBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean doNotHide;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataDoNotHideBuilderImpl(
-        BACnetApplicationTagBoolean doNotHide,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataDoNotHideBuilderImpl(BACnetApplicationTagBoolean doNotHide) {
       this.doNotHide = doNotHide;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDoNotHide build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDoNotHide bACnetConstructedDataDoNotHide =
-          new BACnetConstructedDataDoNotHide(
-              openingTag, peekedTagHeader, closingTag, doNotHide, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataDoNotHide(openingTag, peekedTagHeader, closingTag, doNotHide);
       return bACnetConstructedDataDoNotHide;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorAlarmState.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorAlarmState.java
index e94aaa01ac5..96e3361502d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorAlarmState.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorAlarmState.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDoorAlarmStateTagged doorAlarmState;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDoorAlarmState(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDoorAlarmStateTagged doorAlarmState,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDoorAlarmStateTagged doorAlarmState) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.doorAlarmState = doorAlarmState;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDoorAlarmStateTagged getDoorAlarmState() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDoorAlarmState");
     // Create the instance
-    return new BACnetConstructedDataDoorAlarmStateBuilderImpl(
-        doorAlarmState, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDoorAlarmStateBuilderImpl(doorAlarmState);
   }
 
   public static class BACnetConstructedDataDoorAlarmStateBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDoorAlarmStateTagged doorAlarmState;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDoorAlarmStateBuilderImpl(
-        BACnetDoorAlarmStateTagged doorAlarmState,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDoorAlarmStateTagged doorAlarmState) {
       this.doorAlarmState = doorAlarmState;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDoorAlarmState build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDoorAlarmState bACnetConstructedDataDoorAlarmState =
           new BACnetConstructedDataDoorAlarmState(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              doorAlarmState,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, doorAlarmState);
       return bACnetConstructedDataDoorAlarmState;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorExtendedPulseTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorExtendedPulseTime.java
index cf4bd9ec18f..c985562b31a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorExtendedPulseTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorExtendedPulseTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger doorExtendedPulseTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDoorExtendedPulseTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger doorExtendedPulseTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger doorExtendedPulseTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.doorExtendedPulseTime = doorExtendedPulseTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getDoorExtendedPulseTime() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDoorExtendedPulseTime");
     // Create the instance
-    return new BACnetConstructedDataDoorExtendedPulseTimeBuilderImpl(
-        doorExtendedPulseTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDoorExtendedPulseTimeBuilderImpl(doorExtendedPulseTime);
   }
 
   public static class BACnetConstructedDataDoorExtendedPulseTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger doorExtendedPulseTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDoorExtendedPulseTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger doorExtendedPulseTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger doorExtendedPulseTime) {
       this.doorExtendedPulseTime = doorExtendedPulseTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDoorExtendedPulseTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDoorExtendedPulseTime bACnetConstructedDataDoorExtendedPulseTime =
           new BACnetConstructedDataDoorExtendedPulseTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              doorExtendedPulseTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, doorExtendedPulseTime);
       return bACnetConstructedDataDoorExtendedPulseTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorMembers.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorMembers.java
index f9a3cdd9a42..97a37b8fab5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorMembers.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorMembers.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetDeviceObjectReference> doorMembers;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDoorMembers(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetDeviceObjectReference> doorMembers,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDeviceObjectReference> doorMembers) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.doorMembers = doorMembers;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (doorMembers)
     writeComplexTypeArrayField("doorMembers", doorMembers, writeBuffer);
@@ -169,43 +157,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDoorMembers");
     // Create the instance
-    return new BACnetConstructedDataDoorMembersBuilderImpl(
-        numberOfDataElements, doorMembers, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDoorMembersBuilderImpl(numberOfDataElements, doorMembers);
   }
 
   public static class BACnetConstructedDataDoorMembersBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetDeviceObjectReference> doorMembers;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDoorMembersBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetDeviceObjectReference> doorMembers,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDeviceObjectReference> doorMembers) {
       this.numberOfDataElements = numberOfDataElements;
       this.doorMembers = doorMembers;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDoorMembers build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDoorMembers bACnetConstructedDataDoorMembers =
           new BACnetConstructedDataDoorMembers(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              doorMembers,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, doorMembers);
       return bACnetConstructedDataDoorMembers;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorOpenTooLongTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorOpenTooLongTime.java
index 5181cfd3eb9..2bc01a5f4f5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorOpenTooLongTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorOpenTooLongTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger doorOpenTooLongTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDoorOpenTooLongTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger doorOpenTooLongTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger doorOpenTooLongTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.doorOpenTooLongTime = doorOpenTooLongTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getDoorOpenTooLongTime() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDoorOpenTooLongTime");
     // Create the instance
-    return new BACnetConstructedDataDoorOpenTooLongTimeBuilderImpl(
-        doorOpenTooLongTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDoorOpenTooLongTimeBuilderImpl(doorOpenTooLongTime);
   }
 
   public static class BACnetConstructedDataDoorOpenTooLongTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger doorOpenTooLongTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDoorOpenTooLongTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger doorOpenTooLongTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger doorOpenTooLongTime) {
       this.doorOpenTooLongTime = doorOpenTooLongTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDoorOpenTooLongTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDoorOpenTooLongTime bACnetConstructedDataDoorOpenTooLongTime =
           new BACnetConstructedDataDoorOpenTooLongTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              doorOpenTooLongTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, doorOpenTooLongTime);
       return bACnetConstructedDataDoorOpenTooLongTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorPulseTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorPulseTime.java
index d893b3af95f..7d9d09b56d9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorPulseTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorPulseTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger doorPulseTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDoorPulseTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger doorPulseTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger doorPulseTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.doorPulseTime = doorPulseTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getDoorPulseTime() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDoorPulseTime");
     // Create the instance
-    return new BACnetConstructedDataDoorPulseTimeBuilderImpl(
-        doorPulseTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDoorPulseTimeBuilderImpl(doorPulseTime);
   }
 
   public static class BACnetConstructedDataDoorPulseTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger doorPulseTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDoorPulseTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger doorPulseTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger doorPulseTime) {
       this.doorPulseTime = doorPulseTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDoorPulseTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDoorPulseTime bACnetConstructedDataDoorPulseTime =
           new BACnetConstructedDataDoorPulseTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              doorPulseTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, doorPulseTime);
       return bACnetConstructedDataDoorPulseTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorStatus.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorStatus.java
index c94e6e508c0..37cb319bb14 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorStatus.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorStatus.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDoorStatusTagged doorStatus;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDoorStatus(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDoorStatusTagged doorStatus,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDoorStatusTagged doorStatus) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.doorStatus = doorStatus;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDoorStatusTagged getDoorStatus() {
@@ -134,34 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDoorStatus");
     // Create the instance
-    return new BACnetConstructedDataDoorStatusBuilderImpl(
-        doorStatus, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDoorStatusBuilderImpl(doorStatus);
   }
 
   public static class BACnetConstructedDataDoorStatusBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDoorStatusTagged doorStatus;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataDoorStatusBuilderImpl(
-        BACnetDoorStatusTagged doorStatus,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataDoorStatusBuilderImpl(BACnetDoorStatusTagged doorStatus) {
       this.doorStatus = doorStatus;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDoorStatus build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDoorStatus bACnetConstructedDataDoorStatus =
-          new BACnetConstructedDataDoorStatus(
-              openingTag, peekedTagHeader, closingTag, doorStatus, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataDoorStatus(openingTag, peekedTagHeader, closingTag, doorStatus);
       return bACnetConstructedDataDoorStatus;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorUnlockDelayTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorUnlockDelayTime.java
index 78c0c4ad71e..fcb62546b65 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorUnlockDelayTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDoorUnlockDelayTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger doorUnlockDelayTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDoorUnlockDelayTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger doorUnlockDelayTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger doorUnlockDelayTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.doorUnlockDelayTime = doorUnlockDelayTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getDoorUnlockDelayTime() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDoorUnlockDelayTime");
     // Create the instance
-    return new BACnetConstructedDataDoorUnlockDelayTimeBuilderImpl(
-        doorUnlockDelayTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDoorUnlockDelayTimeBuilderImpl(doorUnlockDelayTime);
   }
 
   public static class BACnetConstructedDataDoorUnlockDelayTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger doorUnlockDelayTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDoorUnlockDelayTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger doorUnlockDelayTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger doorUnlockDelayTime) {
       this.doorUnlockDelayTime = doorUnlockDelayTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDoorUnlockDelayTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDoorUnlockDelayTime bACnetConstructedDataDoorUnlockDelayTime =
           new BACnetConstructedDataDoorUnlockDelayTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              doorUnlockDelayTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, doorUnlockDelayTime);
       return bACnetConstructedDataDoorUnlockDelayTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDutyWindow.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDutyWindow.java
index e73ef35f3fb..fb38a165753 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDutyWindow.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataDutyWindow.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger dutyWindow;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataDutyWindow(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger dutyWindow,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger dutyWindow) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.dutyWindow = dutyWindow;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getDutyWindow() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataDutyWindow");
     // Create the instance
-    return new BACnetConstructedDataDutyWindowBuilderImpl(
-        dutyWindow, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataDutyWindowBuilderImpl(dutyWindow);
   }
 
   public static class BACnetConstructedDataDutyWindowBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger dutyWindow;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataDutyWindowBuilderImpl(
-        BACnetApplicationTagUnsignedInteger dutyWindow,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger dutyWindow) {
       this.dutyWindow = dutyWindow;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataDutyWindow build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataDutyWindow bACnetConstructedDataDutyWindow =
-          new BACnetConstructedDataDutyWindow(
-              openingTag, peekedTagHeader, closingTag, dutyWindow, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataDutyWindow(openingTag, peekedTagHeader, closingTag, dutyWindow);
       return bACnetConstructedDataDutyWindow;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEffectivePeriod.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEffectivePeriod.java
index 222a6470f08..e9d92d898dd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEffectivePeriod.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEffectivePeriod.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateRange dateRange;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEffectivePeriod(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateRange dateRange,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateRange dateRange) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.dateRange = dateRange;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateRange getDateRange() {
@@ -128,34 +120,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEffectivePeriod");
     // Create the instance
-    return new BACnetConstructedDataEffectivePeriodBuilderImpl(
-        dateRange, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEffectivePeriodBuilderImpl(dateRange);
   }
 
   public static class BACnetConstructedDataEffectivePeriodBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateRange dateRange;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataEffectivePeriodBuilderImpl(
-        BACnetDateRange dateRange,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataEffectivePeriodBuilderImpl(BACnetDateRange dateRange) {
       this.dateRange = dateRange;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEffectivePeriod build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEffectivePeriod bACnetConstructedDataEffectivePeriod =
           new BACnetConstructedDataEffectivePeriod(
-              openingTag, peekedTagHeader, closingTag, dateRange, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, dateRange);
       return bACnetConstructedDataEffectivePeriod;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEgressActive.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEgressActive.java
index 719a82d4c2c..dc62feaf081 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEgressActive.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEgressActive.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean egressActive;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEgressActive(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean egressActive,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean egressActive) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.egressActive = egressActive;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getEgressActive() {
@@ -132,34 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEgressActive");
     // Create the instance
-    return new BACnetConstructedDataEgressActiveBuilderImpl(
-        egressActive, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEgressActiveBuilderImpl(egressActive);
   }
 
   public static class BACnetConstructedDataEgressActiveBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean egressActive;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataEgressActiveBuilderImpl(
-        BACnetApplicationTagBoolean egressActive,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataEgressActiveBuilderImpl(BACnetApplicationTagBoolean egressActive) {
       this.egressActive = egressActive;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEgressActive build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEgressActive bACnetConstructedDataEgressActive =
           new BACnetConstructedDataEgressActive(
-              openingTag, peekedTagHeader, closingTag, egressActive, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, egressActive);
       return bACnetConstructedDataEgressActive;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEgressTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEgressTime.java
index 387bd9f988e..bff7d1dd66b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEgressTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEgressTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger egressTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEgressTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger egressTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger egressTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.egressTime = egressTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getEgressTime() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEgressTime");
     // Create the instance
-    return new BACnetConstructedDataEgressTimeBuilderImpl(
-        egressTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEgressTimeBuilderImpl(egressTime);
   }
 
   public static class BACnetConstructedDataEgressTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger egressTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataEgressTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger egressTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger egressTime) {
       this.egressTime = egressTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEgressTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEgressTime bACnetConstructedDataEgressTime =
-          new BACnetConstructedDataEgressTime(
-              openingTag, peekedTagHeader, closingTag, egressTime, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataEgressTime(openingTag, peekedTagHeader, closingTag, egressTime);
       return bACnetConstructedDataEgressTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElapsedActiveTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElapsedActiveTime.java
index ec226d681d7..95f595fea06 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElapsedActiveTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElapsedActiveTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger elapsedActiveTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataElapsedActiveTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger elapsedActiveTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger elapsedActiveTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.elapsedActiveTime = elapsedActiveTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getElapsedActiveTime() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataElapsedActiveTime");
     // Create the instance
-    return new BACnetConstructedDataElapsedActiveTimeBuilderImpl(
-        elapsedActiveTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataElapsedActiveTimeBuilderImpl(elapsedActiveTime);
   }
 
   public static class BACnetConstructedDataElapsedActiveTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger elapsedActiveTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataElapsedActiveTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger elapsedActiveTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger elapsedActiveTime) {
       this.elapsedActiveTime = elapsedActiveTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataElapsedActiveTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataElapsedActiveTime bACnetConstructedDataElapsedActiveTime =
           new BACnetConstructedDataElapsedActiveTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              elapsedActiveTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, elapsedActiveTime);
       return bACnetConstructedDataElapsedActiveTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElement.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElement.java
index 5b3a6a06f1e..74d53e7a261 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElement.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElement.java
@@ -43,27 +43,16 @@ public class BACnetConstructedDataElement implements Message {
   protected final BACnetContextTag contextTag;
   protected final BACnetConstructedData constructedData;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-  protected final BACnetPropertyIdentifier propertyIdentifierArgument;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataElement(
       BACnetTagHeader peekedTagHeader,
       BACnetApplicationTag applicationTag,
       BACnetContextTag contextTag,
-      BACnetConstructedData constructedData,
-      BACnetObjectType objectTypeArgument,
-      BACnetPropertyIdentifier propertyIdentifierArgument,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+      BACnetConstructedData constructedData) {
     super();
     this.peekedTagHeader = peekedTagHeader;
     this.applicationTag = applicationTag;
     this.contextTag = contextTag;
     this.constructedData = constructedData;
-    this.objectTypeArgument = objectTypeArgument;
-    this.propertyIdentifierArgument = propertyIdentifierArgument;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetTagHeader getPeekedTagHeader() {
@@ -121,15 +110,13 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     writeBuffer.writeVirtual("isContextTag", isContextTag);
 
     // Optional Field (applicationTag) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "applicationTag", applicationTag, writeComplex(writeBuffer), getIsApplicationTag());
+    writeOptionalField("applicationTag", applicationTag, writeComplex(writeBuffer));
 
     // Optional Field (contextTag) (Can be skipped, if the value is null)
-    writeOptionalField("contextTag", contextTag, writeComplex(writeBuffer), getIsContextTag());
+    writeOptionalField("contextTag", contextTag, writeComplex(writeBuffer));
 
     // Optional Field (constructedData) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "constructedData", constructedData, writeComplex(writeBuffer), getIsConstructedData());
+    writeOptionalField("constructedData", constructedData, writeComplex(writeBuffer));
 
     writeBuffer.popContext("BACnetConstructedDataElement");
   }
@@ -249,13 +236,7 @@ public static BACnetConstructedDataElement staticParse(
     BACnetConstructedDataElement _bACnetConstructedDataElement;
     _bACnetConstructedDataElement =
         new BACnetConstructedDataElement(
-            peekedTagHeader,
-            applicationTag,
-            contextTag,
-            constructedData,
-            objectTypeArgument,
-            propertyIdentifierArgument,
-            arrayIndexArgument);
+            peekedTagHeader, applicationTag, contextTag, constructedData);
     return _bACnetConstructedDataElement;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElevatorGroup.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElevatorGroup.java
index 43bd15f4dcd..9f1e252cace 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElevatorGroup.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElevatorGroup.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagObjectIdentifier elevatorGroup;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataElevatorGroup(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagObjectIdentifier elevatorGroup,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagObjectIdentifier elevatorGroup) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.elevatorGroup = elevatorGroup;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagObjectIdentifier getElevatorGroup() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataElevatorGroup");
     // Create the instance
-    return new BACnetConstructedDataElevatorGroupBuilderImpl(
-        elevatorGroup, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataElevatorGroupBuilderImpl(elevatorGroup);
   }
 
   public static class BACnetConstructedDataElevatorGroupBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagObjectIdentifier elevatorGroup;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataElevatorGroupBuilderImpl(
-        BACnetApplicationTagObjectIdentifier elevatorGroup,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagObjectIdentifier elevatorGroup) {
       this.elevatorGroup = elevatorGroup;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataElevatorGroup build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataElevatorGroup bACnetConstructedDataElevatorGroup =
           new BACnetConstructedDataElevatorGroup(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              elevatorGroup,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, elevatorGroup);
       return bACnetConstructedDataElevatorGroup;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElevatorGroupAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElevatorGroupAll.java
index bb83dc08b33..e743f71363b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElevatorGroupAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElevatorGroupAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataElevatorGroupAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataElevatorGroupAll");
     // Create the instance
-    return new BACnetConstructedDataElevatorGroupAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataElevatorGroupAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataElevatorGroupAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataElevatorGroupAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataElevatorGroupAllBuilderImpl() {}
 
     public BACnetConstructedDataElevatorGroupAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataElevatorGroupAll bACnetConstructedDataElevatorGroupAll =
-          new BACnetConstructedDataElevatorGroupAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataElevatorGroupAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataElevatorGroupAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElevatorGroupGroupMembers.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElevatorGroupGroupMembers.java
index 18f2f31ce7e..8a28dc5661c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElevatorGroupGroupMembers.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataElevatorGroupGroupMembers.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagObjectIdentifier> groupMembers;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataElevatorGroupGroupMembers(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagObjectIdentifier> groupMembers,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagObjectIdentifier> groupMembers) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.groupMembers = groupMembers;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (groupMembers)
     writeComplexTypeArrayField("groupMembers", groupMembers, writeBuffer);
@@ -175,43 +163,27 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataElevatorGroupGroupMembers");
     // Create the instance
     return new BACnetConstructedDataElevatorGroupGroupMembersBuilderImpl(
-        numberOfDataElements, groupMembers, tagNumber, arrayIndexArgument);
+        numberOfDataElements, groupMembers);
   }
 
   public static class BACnetConstructedDataElevatorGroupGroupMembersBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagObjectIdentifier> groupMembers;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataElevatorGroupGroupMembersBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagObjectIdentifier> groupMembers,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagObjectIdentifier> groupMembers) {
       this.numberOfDataElements = numberOfDataElements;
       this.groupMembers = groupMembers;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataElevatorGroupGroupMembers build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataElevatorGroupGroupMembers
           bACnetConstructedDataElevatorGroupGroupMembers =
               new BACnetConstructedDataElevatorGroupGroupMembers(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  numberOfDataElements,
-                  groupMembers,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, numberOfDataElements, groupMembers);
       return bACnetConstructedDataElevatorGroupGroupMembers;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEnable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEnable.java
index 9b10f71521a..6df622c0709 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEnable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEnable.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean enable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEnable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean enable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean enable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.enable = enable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getEnable() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEnable");
     // Create the instance
-    return new BACnetConstructedDataEnableBuilderImpl(enable, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEnableBuilderImpl(enable);
   }
 
   public static class BACnetConstructedDataEnableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean enable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataEnableBuilderImpl(
-        BACnetApplicationTagBoolean enable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataEnableBuilderImpl(BACnetApplicationTagBoolean enable) {
       this.enable = enable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEnable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEnable bACnetConstructedDataEnable =
-          new BACnetConstructedDataEnable(
-              openingTag, peekedTagHeader, closingTag, enable, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataEnable(openingTag, peekedTagHeader, closingTag, enable);
       return bACnetConstructedDataEnable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEnergyMeter.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEnergyMeter.java
index 6d424c4ac43..9fcf6b642b2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEnergyMeter.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEnergyMeter.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal energyMeter;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEnergyMeter(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal energyMeter,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal energyMeter) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.energyMeter = energyMeter;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getEnergyMeter() {
@@ -132,34 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEnergyMeter");
     // Create the instance
-    return new BACnetConstructedDataEnergyMeterBuilderImpl(
-        energyMeter, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEnergyMeterBuilderImpl(energyMeter);
   }
 
   public static class BACnetConstructedDataEnergyMeterBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal energyMeter;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataEnergyMeterBuilderImpl(
-        BACnetApplicationTagReal energyMeter,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataEnergyMeterBuilderImpl(BACnetApplicationTagReal energyMeter) {
       this.energyMeter = energyMeter;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEnergyMeter build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEnergyMeter bACnetConstructedDataEnergyMeter =
           new BACnetConstructedDataEnergyMeter(
-              openingTag, peekedTagHeader, closingTag, energyMeter, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, energyMeter);
       return bACnetConstructedDataEnergyMeter;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEnergyMeterRef.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEnergyMeterRef.java
index bd426d494a4..6593d2100a3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEnergyMeterRef.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEnergyMeterRef.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDeviceObjectReference energyMeterRef;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEnergyMeterRef(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDeviceObjectReference energyMeterRef,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDeviceObjectReference energyMeterRef) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.energyMeterRef = energyMeterRef;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDeviceObjectReference getEnergyMeterRef() {
@@ -130,39 +122,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEnergyMeterRef");
     // Create the instance
-    return new BACnetConstructedDataEnergyMeterRefBuilderImpl(
-        energyMeterRef, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEnergyMeterRefBuilderImpl(energyMeterRef);
   }
 
   public static class BACnetConstructedDataEnergyMeterRefBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDeviceObjectReference energyMeterRef;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataEnergyMeterRefBuilderImpl(
-        BACnetDeviceObjectReference energyMeterRef,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDeviceObjectReference energyMeterRef) {
       this.energyMeterRef = energyMeterRef;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEnergyMeterRef build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEnergyMeterRef bACnetConstructedDataEnergyMeterRef =
           new BACnetConstructedDataEnergyMeterRef(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              energyMeterRef,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, energyMeterRef);
       return bACnetConstructedDataEnergyMeterRef;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEntryPoints.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEntryPoints.java
index 9ca830d4920..40e8f18efb7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEntryPoints.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEntryPoints.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetDeviceObjectReference> entryPoints;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEntryPoints(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetDeviceObjectReference> entryPoints,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDeviceObjectReference> entryPoints) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.entryPoints = entryPoints;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetDeviceObjectReference> getEntryPoints() {
@@ -126,34 +118,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEntryPoints");
     // Create the instance
-    return new BACnetConstructedDataEntryPointsBuilderImpl(
-        entryPoints, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEntryPointsBuilderImpl(entryPoints);
   }
 
   public static class BACnetConstructedDataEntryPointsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetDeviceObjectReference> entryPoints;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataEntryPointsBuilderImpl(
-        List<BACnetDeviceObjectReference> entryPoints,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDeviceObjectReference> entryPoints) {
       this.entryPoints = entryPoints;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEntryPoints build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEntryPoints bACnetConstructedDataEntryPoints =
           new BACnetConstructedDataEntryPoints(
-              openingTag, peekedTagHeader, closingTag, entryPoints, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, entryPoints);
       return bACnetConstructedDataEntryPoints;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataErrorLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataErrorLimit.java
index bcb8c93aa50..96d1a2733f2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataErrorLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataErrorLimit.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal errorLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataErrorLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal errorLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal errorLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.errorLimit = errorLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getErrorLimit() {
@@ -132,34 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataErrorLimit");
     // Create the instance
-    return new BACnetConstructedDataErrorLimitBuilderImpl(
-        errorLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataErrorLimitBuilderImpl(errorLimit);
   }
 
   public static class BACnetConstructedDataErrorLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal errorLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataErrorLimitBuilderImpl(
-        BACnetApplicationTagReal errorLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataErrorLimitBuilderImpl(BACnetApplicationTagReal errorLimit) {
       this.errorLimit = errorLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataErrorLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataErrorLimit bACnetConstructedDataErrorLimit =
-          new BACnetConstructedDataErrorLimit(
-              openingTag, peekedTagHeader, closingTag, errorLimit, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataErrorLimit(openingTag, peekedTagHeader, closingTag, errorLimit);
       return bACnetConstructedDataErrorLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEscalatorAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEscalatorAll.java
index df3aa6c55c3..54fe0287e2f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEscalatorAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEscalatorAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEscalatorAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEscalatorAll");
     // Create the instance
-    return new BACnetConstructedDataEscalatorAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEscalatorAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataEscalatorAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataEscalatorAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataEscalatorAllBuilderImpl() {}
 
     public BACnetConstructedDataEscalatorAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEscalatorAll bACnetConstructedDataEscalatorAll =
-          new BACnetConstructedDataEscalatorAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataEscalatorAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataEscalatorAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEscalatorFaultSignals.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEscalatorFaultSignals.java
index 6b734ce92f3..c939c517a4f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEscalatorFaultSignals.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEscalatorFaultSignals.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetEscalatorFaultTagged> faultSignals;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEscalatorFaultSignals(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetEscalatorFaultTagged> faultSignals,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetEscalatorFaultTagged> faultSignals) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultSignals = faultSignals;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetEscalatorFaultTagged> getFaultSignals() {
@@ -131,34 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEscalatorFaultSignals");
     // Create the instance
-    return new BACnetConstructedDataEscalatorFaultSignalsBuilderImpl(
-        faultSignals, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEscalatorFaultSignalsBuilderImpl(faultSignals);
   }
 
   public static class BACnetConstructedDataEscalatorFaultSignalsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetEscalatorFaultTagged> faultSignals;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataEscalatorFaultSignalsBuilderImpl(
-        List<BACnetEscalatorFaultTagged> faultSignals,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetEscalatorFaultTagged> faultSignals) {
       this.faultSignals = faultSignals;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEscalatorFaultSignals build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEscalatorFaultSignals bACnetConstructedDataEscalatorFaultSignals =
           new BACnetConstructedDataEscalatorFaultSignals(
-              openingTag, peekedTagHeader, closingTag, faultSignals, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, faultSignals);
       return bACnetConstructedDataEscalatorFaultSignals;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEscalatorMode.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEscalatorMode.java
index c6ecbc5dd91..54a28f85804 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEscalatorMode.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEscalatorMode.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetEscalatorModeTagged escalatorMode;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEscalatorMode(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetEscalatorModeTagged escalatorMode,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetEscalatorModeTagged escalatorMode) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.escalatorMode = escalatorMode;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetEscalatorModeTagged getEscalatorMode() {
@@ -134,39 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEscalatorMode");
     // Create the instance
-    return new BACnetConstructedDataEscalatorModeBuilderImpl(
-        escalatorMode, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEscalatorModeBuilderImpl(escalatorMode);
   }
 
   public static class BACnetConstructedDataEscalatorModeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetEscalatorModeTagged escalatorMode;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataEscalatorModeBuilderImpl(
-        BACnetEscalatorModeTagged escalatorMode,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataEscalatorModeBuilderImpl(BACnetEscalatorModeTagged escalatorMode) {
       this.escalatorMode = escalatorMode;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEscalatorMode build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEscalatorMode bACnetConstructedDataEscalatorMode =
           new BACnetConstructedDataEscalatorMode(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              escalatorMode,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, escalatorMode);
       return bACnetConstructedDataEscalatorMode;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventAlgorithmInhibit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventAlgorithmInhibit.java
index 1daf3eb46a1..bf9200296ba 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventAlgorithmInhibit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventAlgorithmInhibit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean eventAlgorithmInhibit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEventAlgorithmInhibit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean eventAlgorithmInhibit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean eventAlgorithmInhibit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.eventAlgorithmInhibit = eventAlgorithmInhibit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getEventAlgorithmInhibit() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEventAlgorithmInhibit");
     // Create the instance
-    return new BACnetConstructedDataEventAlgorithmInhibitBuilderImpl(
-        eventAlgorithmInhibit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEventAlgorithmInhibitBuilderImpl(eventAlgorithmInhibit);
   }
 
   public static class BACnetConstructedDataEventAlgorithmInhibitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean eventAlgorithmInhibit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataEventAlgorithmInhibitBuilderImpl(
-        BACnetApplicationTagBoolean eventAlgorithmInhibit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean eventAlgorithmInhibit) {
       this.eventAlgorithmInhibit = eventAlgorithmInhibit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEventAlgorithmInhibit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEventAlgorithmInhibit bACnetConstructedDataEventAlgorithmInhibit =
           new BACnetConstructedDataEventAlgorithmInhibit(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              eventAlgorithmInhibit,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, eventAlgorithmInhibit);
       return bACnetConstructedDataEventAlgorithmInhibit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventAlgorithmInhibitRef.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventAlgorithmInhibitRef.java
index a3c0608bfbf..5f2ea3ad5ec 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventAlgorithmInhibitRef.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventAlgorithmInhibitRef.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetObjectPropertyReference eventAlgorithmInhibitRef;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEventAlgorithmInhibitRef(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetObjectPropertyReference eventAlgorithmInhibitRef,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetObjectPropertyReference eventAlgorithmInhibitRef) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.eventAlgorithmInhibitRef = eventAlgorithmInhibitRef;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetObjectPropertyReference getEventAlgorithmInhibitRef() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEventAlgorithmInhibitRef");
     // Create the instance
-    return new BACnetConstructedDataEventAlgorithmInhibitRefBuilderImpl(
-        eventAlgorithmInhibitRef, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEventAlgorithmInhibitRefBuilderImpl(eventAlgorithmInhibitRef);
   }
 
   public static class BACnetConstructedDataEventAlgorithmInhibitRefBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetObjectPropertyReference eventAlgorithmInhibitRef;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataEventAlgorithmInhibitRefBuilderImpl(
-        BACnetObjectPropertyReference eventAlgorithmInhibitRef,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetObjectPropertyReference eventAlgorithmInhibitRef) {
       this.eventAlgorithmInhibitRef = eventAlgorithmInhibitRef;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEventAlgorithmInhibitRef build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEventAlgorithmInhibitRef bACnetConstructedDataEventAlgorithmInhibitRef =
           new BACnetConstructedDataEventAlgorithmInhibitRef(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              eventAlgorithmInhibitRef,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, eventAlgorithmInhibitRef);
       return bACnetConstructedDataEventAlgorithmInhibitRef;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventDetectionEnable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventDetectionEnable.java
index ba512d4d602..0b77415b622 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventDetectionEnable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventDetectionEnable.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean eventDetectionEnable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEventDetectionEnable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean eventDetectionEnable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean eventDetectionEnable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.eventDetectionEnable = eventDetectionEnable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getEventDetectionEnable() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEventDetectionEnable");
     // Create the instance
-    return new BACnetConstructedDataEventDetectionEnableBuilderImpl(
-        eventDetectionEnable, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEventDetectionEnableBuilderImpl(eventDetectionEnable);
   }
 
   public static class BACnetConstructedDataEventDetectionEnableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean eventDetectionEnable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataEventDetectionEnableBuilderImpl(
-        BACnetApplicationTagBoolean eventDetectionEnable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean eventDetectionEnable) {
       this.eventDetectionEnable = eventDetectionEnable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEventDetectionEnable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEventDetectionEnable bACnetConstructedDataEventDetectionEnable =
           new BACnetConstructedDataEventDetectionEnable(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              eventDetectionEnable,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, eventDetectionEnable);
       return bACnetConstructedDataEventDetectionEnable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventEnable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventEnable.java
index 9fb63dffc44..c56e9cac565 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventEnable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventEnable.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetEventTransitionBitsTagged eventEnable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEventEnable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetEventTransitionBitsTagged eventEnable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetEventTransitionBitsTagged eventEnable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.eventEnable = eventEnable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetEventTransitionBitsTagged getEventEnable() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEventEnable");
     // Create the instance
-    return new BACnetConstructedDataEventEnableBuilderImpl(
-        eventEnable, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEventEnableBuilderImpl(eventEnable);
   }
 
   public static class BACnetConstructedDataEventEnableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetEventTransitionBitsTagged eventEnable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataEventEnableBuilderImpl(
-        BACnetEventTransitionBitsTagged eventEnable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetEventTransitionBitsTagged eventEnable) {
       this.eventEnable = eventEnable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEventEnable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEventEnable bACnetConstructedDataEventEnable =
           new BACnetConstructedDataEventEnable(
-              openingTag, peekedTagHeader, closingTag, eventEnable, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, eventEnable);
       return bACnetConstructedDataEventEnable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventEnrollmentAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventEnrollmentAll.java
index d4f4cbaf13e..e32b8dfa318 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventEnrollmentAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventEnrollmentAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEventEnrollmentAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEventEnrollmentAll");
     // Create the instance
-    return new BACnetConstructedDataEventEnrollmentAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEventEnrollmentAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataEventEnrollmentAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataEventEnrollmentAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataEventEnrollmentAllBuilderImpl() {}
 
     public BACnetConstructedDataEventEnrollmentAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEventEnrollmentAll bACnetConstructedDataEventEnrollmentAll =
-          new BACnetConstructedDataEventEnrollmentAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataEventEnrollmentAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataEventEnrollmentAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventLogAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventLogAll.java
index 699409b4b59..bab0cbb9d56 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventLogAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventLogAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEventLogAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEventLogAll");
     // Create the instance
-    return new BACnetConstructedDataEventLogAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEventLogAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataEventLogAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataEventLogAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataEventLogAllBuilderImpl() {}
 
     public BACnetConstructedDataEventLogAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEventLogAll bACnetConstructedDataEventLogAll =
-          new BACnetConstructedDataEventLogAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataEventLogAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataEventLogAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventLogLogBuffer.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventLogLogBuffer.java
index fcda3226f09..c19c1c40413 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventLogLogBuffer.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventLogLogBuffer.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetEventLogRecord> floorText;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEventLogLogBuffer(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetEventLogRecord> floorText,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetEventLogRecord> floorText) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.floorText = floorText;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetEventLogRecord> getFloorText() {
@@ -127,34 +119,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEventLogLogBuffer");
     // Create the instance
-    return new BACnetConstructedDataEventLogLogBufferBuilderImpl(
-        floorText, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEventLogLogBufferBuilderImpl(floorText);
   }
 
   public static class BACnetConstructedDataEventLogLogBufferBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetEventLogRecord> floorText;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataEventLogLogBufferBuilderImpl(
-        List<BACnetEventLogRecord> floorText,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataEventLogLogBufferBuilderImpl(List<BACnetEventLogRecord> floorText) {
       this.floorText = floorText;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEventLogLogBuffer build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEventLogLogBuffer bACnetConstructedDataEventLogLogBuffer =
           new BACnetConstructedDataEventLogLogBuffer(
-              openingTag, peekedTagHeader, closingTag, floorText, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, floorText);
       return bACnetConstructedDataEventLogLogBuffer;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventMessageTexts.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventMessageTexts.java
index cf3657e602a..a4353910d34 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventMessageTexts.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventMessageTexts.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetOptionalCharacterString> eventMessageTexts;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEventMessageTexts(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetOptionalCharacterString> eventMessageTexts,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetOptionalCharacterString> eventMessageTexts) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.eventMessageTexts = eventMessageTexts;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -112,11 +104,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (eventMessageTexts)
     writeComplexTypeArrayField("eventMessageTexts", eventMessageTexts, writeBuffer);
@@ -223,42 +211,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataEventMessageTexts");
     // Create the instance
     return new BACnetConstructedDataEventMessageTextsBuilderImpl(
-        numberOfDataElements, eventMessageTexts, tagNumber, arrayIndexArgument);
+        numberOfDataElements, eventMessageTexts);
   }
 
   public static class BACnetConstructedDataEventMessageTextsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetOptionalCharacterString> eventMessageTexts;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataEventMessageTextsBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetOptionalCharacterString> eventMessageTexts,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetOptionalCharacterString> eventMessageTexts) {
       this.numberOfDataElements = numberOfDataElements;
       this.eventMessageTexts = eventMessageTexts;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEventMessageTexts build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEventMessageTexts bACnetConstructedDataEventMessageTexts =
           new BACnetConstructedDataEventMessageTexts(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              eventMessageTexts,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, eventMessageTexts);
       return bACnetConstructedDataEventMessageTexts;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventMessageTextsConfig.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventMessageTextsConfig.java
index 3baf0af6df7..10f6274b8b7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventMessageTextsConfig.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventMessageTextsConfig.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetOptionalCharacterString> eventMessageTextsConfig;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEventMessageTextsConfig(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetOptionalCharacterString> eventMessageTextsConfig,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetOptionalCharacterString> eventMessageTextsConfig) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.eventMessageTextsConfig = eventMessageTextsConfig;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -118,11 +110,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (eventMessageTextsConfig)
     writeComplexTypeArrayField("eventMessageTextsConfig", eventMessageTextsConfig, writeBuffer);
@@ -229,42 +217,30 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataEventMessageTextsConfig");
     // Create the instance
     return new BACnetConstructedDataEventMessageTextsConfigBuilderImpl(
-        numberOfDataElements, eventMessageTextsConfig, tagNumber, arrayIndexArgument);
+        numberOfDataElements, eventMessageTextsConfig);
   }
 
   public static class BACnetConstructedDataEventMessageTextsConfigBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetOptionalCharacterString> eventMessageTextsConfig;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataEventMessageTextsConfigBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetOptionalCharacterString> eventMessageTextsConfig,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetOptionalCharacterString> eventMessageTextsConfig) {
       this.numberOfDataElements = numberOfDataElements;
       this.eventMessageTextsConfig = eventMessageTextsConfig;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEventMessageTextsConfig build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEventMessageTextsConfig bACnetConstructedDataEventMessageTextsConfig =
           new BACnetConstructedDataEventMessageTextsConfig(
               openingTag,
               peekedTagHeader,
               closingTag,
               numberOfDataElements,
-              eventMessageTextsConfig,
-              tagNumber,
-              arrayIndexArgument);
+              eventMessageTextsConfig);
       return bACnetConstructedDataEventMessageTextsConfig;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventParameters.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventParameters.java
index 25ce07bb44f..2e2945d13ae 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventParameters.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventParameters.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetEventParameter eventParameter;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEventParameters(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetEventParameter eventParameter,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetEventParameter eventParameter) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.eventParameter = eventParameter;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetEventParameter getEventParameter() {
@@ -130,39 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEventParameters");
     // Create the instance
-    return new BACnetConstructedDataEventParametersBuilderImpl(
-        eventParameter, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEventParametersBuilderImpl(eventParameter);
   }
 
   public static class BACnetConstructedDataEventParametersBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetEventParameter eventParameter;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataEventParametersBuilderImpl(
-        BACnetEventParameter eventParameter,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataEventParametersBuilderImpl(BACnetEventParameter eventParameter) {
       this.eventParameter = eventParameter;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEventParameters build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEventParameters bACnetConstructedDataEventParameters =
           new BACnetConstructedDataEventParameters(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              eventParameter,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, eventParameter);
       return bACnetConstructedDataEventParameters;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventState.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventState.java
index 9f013ee77b2..95cab5f2aa8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventState.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventState.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetEventStateTagged eventState;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEventState(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetEventStateTagged eventState,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetEventStateTagged eventState) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.eventState = eventState;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetEventStateTagged getEventState() {
@@ -134,34 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEventState");
     // Create the instance
-    return new BACnetConstructedDataEventStateBuilderImpl(
-        eventState, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEventStateBuilderImpl(eventState);
   }
 
   public static class BACnetConstructedDataEventStateBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetEventStateTagged eventState;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataEventStateBuilderImpl(
-        BACnetEventStateTagged eventState,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataEventStateBuilderImpl(BACnetEventStateTagged eventState) {
       this.eventState = eventState;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEventState build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEventState bACnetConstructedDataEventState =
-          new BACnetConstructedDataEventState(
-              openingTag, peekedTagHeader, closingTag, eventState, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataEventState(openingTag, peekedTagHeader, closingTag, eventState);
       return bACnetConstructedDataEventState;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventTimeStamps.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventTimeStamps.java
index c10511de92c..6e42e8fd6ec 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventTimeStamps.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventTimeStamps.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetTimeStamp> eventTimeStamps;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEventTimeStamps(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetTimeStamp> eventTimeStamps,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetTimeStamp> eventTimeStamps) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.eventTimeStamps = eventTimeStamps;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -111,11 +103,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (eventTimeStamps)
     writeComplexTypeArrayField("eventTimeStamps", eventTimeStamps, writeBuffer);
@@ -222,42 +210,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataEventTimeStamps");
     // Create the instance
     return new BACnetConstructedDataEventTimeStampsBuilderImpl(
-        numberOfDataElements, eventTimeStamps, tagNumber, arrayIndexArgument);
+        numberOfDataElements, eventTimeStamps);
   }
 
   public static class BACnetConstructedDataEventTimeStampsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetTimeStamp> eventTimeStamps;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataEventTimeStampsBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetTimeStamp> eventTimeStamps,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetTimeStamp> eventTimeStamps) {
       this.numberOfDataElements = numberOfDataElements;
       this.eventTimeStamps = eventTimeStamps;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEventTimeStamps build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEventTimeStamps bACnetConstructedDataEventTimeStamps =
           new BACnetConstructedDataEventTimeStamps(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              eventTimeStamps,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, eventTimeStamps);
       return bACnetConstructedDataEventTimeStamps;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventType.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventType.java
index 2864b6e19de..915994133f5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventType.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataEventType.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetEventTypeTagged eventType;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataEventType(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetEventTypeTagged eventType,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetEventTypeTagged eventType) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.eventType = eventType;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetEventTypeTagged getEventType() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataEventType");
     // Create the instance
-    return new BACnetConstructedDataEventTypeBuilderImpl(eventType, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataEventTypeBuilderImpl(eventType);
   }
 
   public static class BACnetConstructedDataEventTypeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetEventTypeTagged eventType;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataEventTypeBuilderImpl(
-        BACnetEventTypeTagged eventType,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataEventTypeBuilderImpl(BACnetEventTypeTagged eventType) {
       this.eventType = eventType;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataEventType build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataEventType bACnetConstructedDataEventType =
-          new BACnetConstructedDataEventType(
-              openingTag, peekedTagHeader, closingTag, eventType, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataEventType(openingTag, peekedTagHeader, closingTag, eventType);
       return bACnetConstructedDataEventType;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExceptionSchedule.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExceptionSchedule.java
index f03be335ddd..37e323ee4c4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExceptionSchedule.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExceptionSchedule.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetSpecialEvent> exceptionSchedule;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataExceptionSchedule(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetSpecialEvent> exceptionSchedule,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetSpecialEvent> exceptionSchedule) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.exceptionSchedule = exceptionSchedule;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (exceptionSchedule)
     writeComplexTypeArrayField("exceptionSchedule", exceptionSchedule, writeBuffer);
@@ -171,42 +159,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataExceptionSchedule");
     // Create the instance
     return new BACnetConstructedDataExceptionScheduleBuilderImpl(
-        numberOfDataElements, exceptionSchedule, tagNumber, arrayIndexArgument);
+        numberOfDataElements, exceptionSchedule);
   }
 
   public static class BACnetConstructedDataExceptionScheduleBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetSpecialEvent> exceptionSchedule;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataExceptionScheduleBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetSpecialEvent> exceptionSchedule,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetSpecialEvent> exceptionSchedule) {
       this.numberOfDataElements = numberOfDataElements;
       this.exceptionSchedule = exceptionSchedule;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataExceptionSchedule build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataExceptionSchedule bACnetConstructedDataExceptionSchedule =
           new BACnetConstructedDataExceptionSchedule(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              exceptionSchedule,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, exceptionSchedule);
       return bACnetConstructedDataExceptionSchedule;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExecutionDelay.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExecutionDelay.java
index 912b4250df2..60a1c463f3d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExecutionDelay.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExecutionDelay.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagUnsignedInteger> executionDelay;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataExecutionDelay(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagUnsignedInteger> executionDelay,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagUnsignedInteger> executionDelay) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.executionDelay = executionDelay;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (executionDelay)
     writeComplexTypeArrayField("executionDelay", executionDelay, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataExecutionDelay");
     // Create the instance
-    return new BACnetConstructedDataExecutionDelayBuilderImpl(
-        numberOfDataElements, executionDelay, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataExecutionDelayBuilderImpl(numberOfDataElements, executionDelay);
   }
 
   public static class BACnetConstructedDataExecutionDelayBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagUnsignedInteger> executionDelay;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataExecutionDelayBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagUnsignedInteger> executionDelay,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagUnsignedInteger> executionDelay) {
       this.numberOfDataElements = numberOfDataElements;
       this.executionDelay = executionDelay;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataExecutionDelay build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataExecutionDelay bACnetConstructedDataExecutionDelay =
           new BACnetConstructedDataExecutionDelay(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              executionDelay,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, executionDelay);
       return bACnetConstructedDataExecutionDelay;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExitPoints.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExitPoints.java
index 2ca4b28e0c3..9347aabd8e2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExitPoints.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExitPoints.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetDeviceObjectReference> exitPoints;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataExitPoints(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetDeviceObjectReference> exitPoints,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDeviceObjectReference> exitPoints) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.exitPoints = exitPoints;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetDeviceObjectReference> getExitPoints() {
@@ -126,34 +118,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataExitPoints");
     // Create the instance
-    return new BACnetConstructedDataExitPointsBuilderImpl(
-        exitPoints, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataExitPointsBuilderImpl(exitPoints);
   }
 
   public static class BACnetConstructedDataExitPointsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetDeviceObjectReference> exitPoints;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataExitPointsBuilderImpl(
-        List<BACnetDeviceObjectReference> exitPoints,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDeviceObjectReference> exitPoints) {
       this.exitPoints = exitPoints;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataExitPoints build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataExitPoints bACnetConstructedDataExitPoints =
-          new BACnetConstructedDataExitPoints(
-              openingTag, peekedTagHeader, closingTag, exitPoints, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataExitPoints(openingTag, peekedTagHeader, closingTag, exitPoints);
       return bACnetConstructedDataExitPoints;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExpectedShedLevel.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExpectedShedLevel.java
index 839c053f910..a8bfd8ba495 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExpectedShedLevel.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExpectedShedLevel.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetShedLevel expectedShedLevel;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataExpectedShedLevel(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetShedLevel expectedShedLevel,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetShedLevel expectedShedLevel) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.expectedShedLevel = expectedShedLevel;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetShedLevel getExpectedShedLevel() {
@@ -131,39 +123,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataExpectedShedLevel");
     // Create the instance
-    return new BACnetConstructedDataExpectedShedLevelBuilderImpl(
-        expectedShedLevel, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataExpectedShedLevelBuilderImpl(expectedShedLevel);
   }
 
   public static class BACnetConstructedDataExpectedShedLevelBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetShedLevel expectedShedLevel;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataExpectedShedLevelBuilderImpl(
-        BACnetShedLevel expectedShedLevel,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataExpectedShedLevelBuilderImpl(BACnetShedLevel expectedShedLevel) {
       this.expectedShedLevel = expectedShedLevel;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataExpectedShedLevel build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataExpectedShedLevel bACnetConstructedDataExpectedShedLevel =
           new BACnetConstructedDataExpectedShedLevel(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              expectedShedLevel,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, expectedShedLevel);
       return bACnetConstructedDataExpectedShedLevel;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExpirationTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExpirationTime.java
index baa86c58a3d..0f7bcc76d9f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExpirationTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExpirationTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime expirationTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataExpirationTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime expirationTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime expirationTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.expirationTime = expirationTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getExpirationTime() {
@@ -130,39 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataExpirationTime");
     // Create the instance
-    return new BACnetConstructedDataExpirationTimeBuilderImpl(
-        expirationTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataExpirationTimeBuilderImpl(expirationTime);
   }
 
   public static class BACnetConstructedDataExpirationTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime expirationTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataExpirationTimeBuilderImpl(
-        BACnetDateTime expirationTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataExpirationTimeBuilderImpl(BACnetDateTime expirationTime) {
       this.expirationTime = expirationTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataExpirationTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataExpirationTime bACnetConstructedDataExpirationTime =
           new BACnetConstructedDataExpirationTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              expirationTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, expirationTime);
       return bACnetConstructedDataExpirationTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExtendedTimeEnable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExtendedTimeEnable.java
index 89f0c925b08..a73cc306ffd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExtendedTimeEnable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataExtendedTimeEnable.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean extendedTimeEnable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataExtendedTimeEnable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean extendedTimeEnable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean extendedTimeEnable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.extendedTimeEnable = extendedTimeEnable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getExtendedTimeEnable() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataExtendedTimeEnable");
     // Create the instance
-    return new BACnetConstructedDataExtendedTimeEnableBuilderImpl(
-        extendedTimeEnable, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataExtendedTimeEnableBuilderImpl(extendedTimeEnable);
   }
 
   public static class BACnetConstructedDataExtendedTimeEnableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean extendedTimeEnable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataExtendedTimeEnableBuilderImpl(
-        BACnetApplicationTagBoolean extendedTimeEnable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean extendedTimeEnable) {
       this.extendedTimeEnable = extendedTimeEnable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataExtendedTimeEnable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataExtendedTimeEnable bACnetConstructedDataExtendedTimeEnable =
           new BACnetConstructedDataExtendedTimeEnable(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              extendedTimeEnable,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, extendedTimeEnable);
       return bACnetConstructedDataExtendedTimeEnable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFDBBMDAddress.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFDBBMDAddress.java
index 96eb3886eec..b1933d81338 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFDBBMDAddress.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFDBBMDAddress.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetHostNPort fDBBMDAddress;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFDBBMDAddress(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetHostNPort fDBBMDAddress,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetHostNPort fDBBMDAddress) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.fDBBMDAddress = fDBBMDAddress;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetHostNPort getFDBBMDAddress() {
@@ -130,39 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFDBBMDAddress");
     // Create the instance
-    return new BACnetConstructedDataFDBBMDAddressBuilderImpl(
-        fDBBMDAddress, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFDBBMDAddressBuilderImpl(fDBBMDAddress);
   }
 
   public static class BACnetConstructedDataFDBBMDAddressBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetHostNPort fDBBMDAddress;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataFDBBMDAddressBuilderImpl(
-        BACnetHostNPort fDBBMDAddress,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataFDBBMDAddressBuilderImpl(BACnetHostNPort fDBBMDAddress) {
       this.fDBBMDAddress = fDBBMDAddress;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFDBBMDAddress build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFDBBMDAddress bACnetConstructedDataFDBBMDAddress =
           new BACnetConstructedDataFDBBMDAddress(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              fDBBMDAddress,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, fDBBMDAddress);
       return bACnetConstructedDataFDBBMDAddress;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFDSubscriptionLifetime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFDSubscriptionLifetime.java
index f826d32a3b8..8a2e5c3e6a8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFDSubscriptionLifetime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFDSubscriptionLifetime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger fdSubscriptionLifetime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFDSubscriptionLifetime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger fdSubscriptionLifetime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger fdSubscriptionLifetime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.fdSubscriptionLifetime = fdSubscriptionLifetime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getFdSubscriptionLifetime() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFDSubscriptionLifetime");
     // Create the instance
-    return new BACnetConstructedDataFDSubscriptionLifetimeBuilderImpl(
-        fdSubscriptionLifetime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFDSubscriptionLifetimeBuilderImpl(fdSubscriptionLifetime);
   }
 
   public static class BACnetConstructedDataFDSubscriptionLifetimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger fdSubscriptionLifetime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataFDSubscriptionLifetimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger fdSubscriptionLifetime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger fdSubscriptionLifetime) {
       this.fdSubscriptionLifetime = fdSubscriptionLifetime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFDSubscriptionLifetime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFDSubscriptionLifetime bACnetConstructedDataFDSubscriptionLifetime =
           new BACnetConstructedDataFDSubscriptionLifetime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              fdSubscriptionLifetime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, fdSubscriptionLifetime);
       return bACnetConstructedDataFDSubscriptionLifetime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFailedAttemptEvents.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFailedAttemptEvents.java
index a27cb984733..2dd45feefbd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFailedAttemptEvents.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFailedAttemptEvents.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetAccessEventTagged> failedAttemptEvents;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFailedAttemptEvents(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetAccessEventTagged> failedAttemptEvents,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetAccessEventTagged> failedAttemptEvents) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.failedAttemptEvents = failedAttemptEvents;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetAccessEventTagged> getFailedAttemptEvents() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFailedAttemptEvents");
     // Create the instance
-    return new BACnetConstructedDataFailedAttemptEventsBuilderImpl(
-        failedAttemptEvents, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFailedAttemptEventsBuilderImpl(failedAttemptEvents);
   }
 
   public static class BACnetConstructedDataFailedAttemptEventsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetAccessEventTagged> failedAttemptEvents;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataFailedAttemptEventsBuilderImpl(
-        List<BACnetAccessEventTagged> failedAttemptEvents,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetAccessEventTagged> failedAttemptEvents) {
       this.failedAttemptEvents = failedAttemptEvents;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFailedAttemptEvents build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFailedAttemptEvents bACnetConstructedDataFailedAttemptEvents =
           new BACnetConstructedDataFailedAttemptEvents(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              failedAttemptEvents,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, failedAttemptEvents);
       return bACnetConstructedDataFailedAttemptEvents;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFailedAttempts.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFailedAttempts.java
index 4d114dca133..9ffaf240e28 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFailedAttempts.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFailedAttempts.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger failedAttempts;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFailedAttempts(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger failedAttempts,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger failedAttempts) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.failedAttempts = failedAttempts;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getFailedAttempts() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFailedAttempts");
     // Create the instance
-    return new BACnetConstructedDataFailedAttemptsBuilderImpl(
-        failedAttempts, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFailedAttemptsBuilderImpl(failedAttempts);
   }
 
   public static class BACnetConstructedDataFailedAttemptsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger failedAttempts;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataFailedAttemptsBuilderImpl(
-        BACnetApplicationTagUnsignedInteger failedAttempts,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger failedAttempts) {
       this.failedAttempts = failedAttempts;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFailedAttempts build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFailedAttempts bACnetConstructedDataFailedAttempts =
           new BACnetConstructedDataFailedAttempts(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              failedAttempts,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, failedAttempts);
       return bACnetConstructedDataFailedAttempts;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFailedAttemptsTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFailedAttemptsTime.java
index c96fd1d5932..3f9f8d72b3b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFailedAttemptsTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFailedAttemptsTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger failedAttemptsTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFailedAttemptsTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger failedAttemptsTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger failedAttemptsTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.failedAttemptsTime = failedAttemptsTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getFailedAttemptsTime() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFailedAttemptsTime");
     // Create the instance
-    return new BACnetConstructedDataFailedAttemptsTimeBuilderImpl(
-        failedAttemptsTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFailedAttemptsTimeBuilderImpl(failedAttemptsTime);
   }
 
   public static class BACnetConstructedDataFailedAttemptsTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger failedAttemptsTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataFailedAttemptsTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger failedAttemptsTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger failedAttemptsTime) {
       this.failedAttemptsTime = failedAttemptsTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFailedAttemptsTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFailedAttemptsTime bACnetConstructedDataFailedAttemptsTime =
           new BACnetConstructedDataFailedAttemptsTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              failedAttemptsTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, failedAttemptsTime);
       return bACnetConstructedDataFailedAttemptsTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultHighLimit.java
index 5838a59639c..069dd307a72 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultHighLimit.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger faultHighLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFaultHighLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger faultHighLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger faultHighLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultHighLimit = faultHighLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getFaultHighLimit() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFaultHighLimit");
     // Create the instance
-    return new BACnetConstructedDataFaultHighLimitBuilderImpl(
-        faultHighLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFaultHighLimitBuilderImpl(faultHighLimit);
   }
 
   public static class BACnetConstructedDataFaultHighLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger faultHighLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataFaultHighLimitBuilderImpl(
-        BACnetApplicationTagUnsignedInteger faultHighLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger faultHighLimit) {
       this.faultHighLimit = faultHighLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFaultHighLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFaultHighLimit bACnetConstructedDataFaultHighLimit =
           new BACnetConstructedDataFaultHighLimit(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              faultHighLimit,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, faultHighLimit);
       return bACnetConstructedDataFaultHighLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultLowLimit.java
index c476842d9a7..e59fa070ee0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultLowLimit.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal faultLowLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFaultLowLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal faultLowLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal faultLowLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultLowLimit = faultLowLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getFaultLowLimit() {
@@ -132,39 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFaultLowLimit");
     // Create the instance
-    return new BACnetConstructedDataFaultLowLimitBuilderImpl(
-        faultLowLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFaultLowLimitBuilderImpl(faultLowLimit);
   }
 
   public static class BACnetConstructedDataFaultLowLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal faultLowLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataFaultLowLimitBuilderImpl(
-        BACnetApplicationTagReal faultLowLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataFaultLowLimitBuilderImpl(BACnetApplicationTagReal faultLowLimit) {
       this.faultLowLimit = faultLowLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFaultLowLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFaultLowLimit bACnetConstructedDataFaultLowLimit =
           new BACnetConstructedDataFaultLowLimit(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              faultLowLimit,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, faultLowLimit);
       return bACnetConstructedDataFaultLowLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultParameters.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultParameters.java
index 8c025a59c1f..9d33480cc45 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultParameters.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultParameters.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetFaultParameter faultParameters;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFaultParameters(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetFaultParameter faultParameters,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetFaultParameter faultParameters) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultParameters = faultParameters;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetFaultParameter getFaultParameters() {
@@ -130,39 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFaultParameters");
     // Create the instance
-    return new BACnetConstructedDataFaultParametersBuilderImpl(
-        faultParameters, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFaultParametersBuilderImpl(faultParameters);
   }
 
   public static class BACnetConstructedDataFaultParametersBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetFaultParameter faultParameters;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataFaultParametersBuilderImpl(
-        BACnetFaultParameter faultParameters,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataFaultParametersBuilderImpl(BACnetFaultParameter faultParameters) {
       this.faultParameters = faultParameters;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFaultParameters build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFaultParameters bACnetConstructedDataFaultParameters =
           new BACnetConstructedDataFaultParameters(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              faultParameters,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, faultParameters);
       return bACnetConstructedDataFaultParameters;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultSignals.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultSignals.java
index 75da9bf99f1..9c6c21d81be 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultSignals.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultSignals.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetLiftFaultTagged> faultSignals;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFaultSignals(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetLiftFaultTagged> faultSignals,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLiftFaultTagged> faultSignals) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultSignals = faultSignals;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetLiftFaultTagged> getFaultSignals() {
@@ -130,34 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFaultSignals");
     // Create the instance
-    return new BACnetConstructedDataFaultSignalsBuilderImpl(
-        faultSignals, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFaultSignalsBuilderImpl(faultSignals);
   }
 
   public static class BACnetConstructedDataFaultSignalsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetLiftFaultTagged> faultSignals;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataFaultSignalsBuilderImpl(
-        List<BACnetLiftFaultTagged> faultSignals,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataFaultSignalsBuilderImpl(List<BACnetLiftFaultTagged> faultSignals) {
       this.faultSignals = faultSignals;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFaultSignals build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFaultSignals bACnetConstructedDataFaultSignals =
           new BACnetConstructedDataFaultSignals(
-              openingTag, peekedTagHeader, closingTag, faultSignals, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, faultSignals);
       return bACnetConstructedDataFaultSignals;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultType.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultType.java
index 4e315f5f9f6..6224628756e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultType.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultType.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetFaultTypeTagged faultType;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFaultType(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetFaultTypeTagged faultType,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetFaultTypeTagged faultType) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultType = faultType;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetFaultTypeTagged getFaultType() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFaultType");
     // Create the instance
-    return new BACnetConstructedDataFaultTypeBuilderImpl(faultType, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFaultTypeBuilderImpl(faultType);
   }
 
   public static class BACnetConstructedDataFaultTypeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetFaultTypeTagged faultType;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataFaultTypeBuilderImpl(
-        BACnetFaultTypeTagged faultType,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataFaultTypeBuilderImpl(BACnetFaultTypeTagged faultType) {
       this.faultType = faultType;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFaultType build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFaultType bACnetConstructedDataFaultType =
-          new BACnetConstructedDataFaultType(
-              openingTag, peekedTagHeader, closingTag, faultType, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataFaultType(openingTag, peekedTagHeader, closingTag, faultType);
       return bACnetConstructedDataFaultType;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultValues.java
index 611f2ddeeec..545c56265d1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFaultValues.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetLifeSafetyStateTagged> faultValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFaultValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetLifeSafetyStateTagged> faultValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLifeSafetyStateTagged> faultValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.faultValues = faultValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (faultValues)
     writeComplexTypeArrayField("faultValues", faultValues, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFaultValues");
     // Create the instance
-    return new BACnetConstructedDataFaultValuesBuilderImpl(
-        numberOfDataElements, faultValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFaultValuesBuilderImpl(numberOfDataElements, faultValues);
   }
 
   public static class BACnetConstructedDataFaultValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetLifeSafetyStateTagged> faultValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataFaultValuesBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetLifeSafetyStateTagged> faultValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetLifeSafetyStateTagged> faultValues) {
       this.numberOfDataElements = numberOfDataElements;
       this.faultValues = faultValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFaultValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFaultValues bACnetConstructedDataFaultValues =
           new BACnetConstructedDataFaultValues(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              faultValues,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, faultValues);
       return bACnetConstructedDataFaultValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileAccessMethod.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileAccessMethod.java
index 0d2c1923947..2f8d271d1a1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileAccessMethod.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileAccessMethod.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetFileAccessMethodTagged fileAccessMethod;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFileAccessMethod(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetFileAccessMethodTagged fileAccessMethod,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetFileAccessMethodTagged fileAccessMethod) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.fileAccessMethod = fileAccessMethod;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetFileAccessMethodTagged getFileAccessMethod() {
@@ -135,39 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFileAccessMethod");
     // Create the instance
-    return new BACnetConstructedDataFileAccessMethodBuilderImpl(
-        fileAccessMethod, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFileAccessMethodBuilderImpl(fileAccessMethod);
   }
 
   public static class BACnetConstructedDataFileAccessMethodBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetFileAccessMethodTagged fileAccessMethod;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataFileAccessMethodBuilderImpl(
-        BACnetFileAccessMethodTagged fileAccessMethod,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetFileAccessMethodTagged fileAccessMethod) {
       this.fileAccessMethod = fileAccessMethod;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFileAccessMethod build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFileAccessMethod bACnetConstructedDataFileAccessMethod =
           new BACnetConstructedDataFileAccessMethod(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              fileAccessMethod,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, fileAccessMethod);
       return bACnetConstructedDataFileAccessMethod;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileAll.java
index 5ab59ad5065..d633d0982c6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFileAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFileAll");
     // Create the instance
-    return new BACnetConstructedDataFileAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFileAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataFileAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataFileAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataFileAllBuilderImpl() {}
 
     public BACnetConstructedDataFileAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFileAll bACnetConstructedDataFileAll =
-          new BACnetConstructedDataFileAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataFileAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataFileAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileRecordCount.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileRecordCount.java
index ff9aa2b46a5..b5ef134a667 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileRecordCount.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileRecordCount.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger recordCount;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFileRecordCount(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger recordCount,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger recordCount) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.recordCount = recordCount;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getRecordCount() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFileRecordCount");
     // Create the instance
-    return new BACnetConstructedDataFileRecordCountBuilderImpl(
-        recordCount, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFileRecordCountBuilderImpl(recordCount);
   }
 
   public static class BACnetConstructedDataFileRecordCountBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger recordCount;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataFileRecordCountBuilderImpl(
-        BACnetApplicationTagUnsignedInteger recordCount,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger recordCount) {
       this.recordCount = recordCount;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFileRecordCount build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFileRecordCount bACnetConstructedDataFileRecordCount =
           new BACnetConstructedDataFileRecordCount(
-              openingTag, peekedTagHeader, closingTag, recordCount, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, recordCount);
       return bACnetConstructedDataFileRecordCount;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileSize.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileSize.java
index 75b26e1cb38..7e8c9964a16 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileSize.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileSize.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger fileSize;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFileSize(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger fileSize,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger fileSize) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.fileSize = fileSize;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getFileSize() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFileSize");
     // Create the instance
-    return new BACnetConstructedDataFileSizeBuilderImpl(fileSize, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFileSizeBuilderImpl(fileSize);
   }
 
   public static class BACnetConstructedDataFileSizeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger fileSize;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataFileSizeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger fileSize,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataFileSizeBuilderImpl(BACnetApplicationTagUnsignedInteger fileSize) {
       this.fileSize = fileSize;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFileSize build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFileSize bACnetConstructedDataFileSize =
-          new BACnetConstructedDataFileSize(
-              openingTag, peekedTagHeader, closingTag, fileSize, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataFileSize(openingTag, peekedTagHeader, closingTag, fileSize);
       return bACnetConstructedDataFileSize;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileType.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileType.java
index 489faaa1390..8670728651d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileType.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFileType.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString fileType;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFileType(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString fileType,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString fileType) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.fileType = fileType;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getFileType() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFileType");
     // Create the instance
-    return new BACnetConstructedDataFileTypeBuilderImpl(fileType, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFileTypeBuilderImpl(fileType);
   }
 
   public static class BACnetConstructedDataFileTypeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString fileType;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataFileTypeBuilderImpl(
-        BACnetApplicationTagCharacterString fileType,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataFileTypeBuilderImpl(BACnetApplicationTagCharacterString fileType) {
       this.fileType = fileType;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFileType build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFileType bACnetConstructedDataFileType =
-          new BACnetConstructedDataFileType(
-              openingTag, peekedTagHeader, closingTag, fileType, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataFileType(openingTag, peekedTagHeader, closingTag, fileType);
       return bACnetConstructedDataFileType;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFirmwareRevision.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFirmwareRevision.java
index e6da37f6694..d581f77cf97 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFirmwareRevision.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFirmwareRevision.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString firmwareRevision;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFirmwareRevision(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString firmwareRevision,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString firmwareRevision) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.firmwareRevision = firmwareRevision;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getFirmwareRevision() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFirmwareRevision");
     // Create the instance
-    return new BACnetConstructedDataFirmwareRevisionBuilderImpl(
-        firmwareRevision, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFirmwareRevisionBuilderImpl(firmwareRevision);
   }
 
   public static class BACnetConstructedDataFirmwareRevisionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString firmwareRevision;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataFirmwareRevisionBuilderImpl(
-        BACnetApplicationTagCharacterString firmwareRevision,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString firmwareRevision) {
       this.firmwareRevision = firmwareRevision;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFirmwareRevision build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFirmwareRevision bACnetConstructedDataFirmwareRevision =
           new BACnetConstructedDataFirmwareRevision(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              firmwareRevision,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, firmwareRevision);
       return bACnetConstructedDataFirmwareRevision;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFloorText.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFloorText.java
index 02b5c5e95d3..ca6b878485e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFloorText.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFloorText.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagCharacterString> floorText;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFloorText(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagCharacterString> floorText,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagCharacterString> floorText) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.floorText = floorText;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (floorText)
     writeComplexTypeArrayField("floorText", floorText, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFloorText");
     // Create the instance
-    return new BACnetConstructedDataFloorTextBuilderImpl(
-        numberOfDataElements, floorText, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFloorTextBuilderImpl(numberOfDataElements, floorText);
   }
 
   public static class BACnetConstructedDataFloorTextBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagCharacterString> floorText;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataFloorTextBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagCharacterString> floorText,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagCharacterString> floorText) {
       this.numberOfDataElements = numberOfDataElements;
       this.floorText = floorText;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFloorText build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFloorText bACnetConstructedDataFloorText =
           new BACnetConstructedDataFloorText(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              floorText,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, floorText);
       return bACnetConstructedDataFloorText;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFullDutyBaseline.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFullDutyBaseline.java
index 22ff5f26ccf..cf2a9fdb49f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFullDutyBaseline.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataFullDutyBaseline.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal fullDutyBaseLine;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataFullDutyBaseline(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal fullDutyBaseLine,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal fullDutyBaseLine) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.fullDutyBaseLine = fullDutyBaseLine;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getFullDutyBaseLine() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataFullDutyBaseline");
     // Create the instance
-    return new BACnetConstructedDataFullDutyBaselineBuilderImpl(
-        fullDutyBaseLine, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataFullDutyBaselineBuilderImpl(fullDutyBaseLine);
   }
 
   public static class BACnetConstructedDataFullDutyBaselineBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal fullDutyBaseLine;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataFullDutyBaselineBuilderImpl(
-        BACnetApplicationTagReal fullDutyBaseLine,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal fullDutyBaseLine) {
       this.fullDutyBaseLine = fullDutyBaseLine;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataFullDutyBaseline build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataFullDutyBaseline bACnetConstructedDataFullDutyBaseline =
           new BACnetConstructedDataFullDutyBaseline(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              fullDutyBaseLine,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, fullDutyBaseLine);
       return bACnetConstructedDataFullDutyBaseline;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalGroupAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalGroupAll.java
index 5637c0bba78..0d3f1ea5563 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalGroupAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalGroupAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataGlobalGroupAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataGlobalGroupAll");
     // Create the instance
-    return new BACnetConstructedDataGlobalGroupAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataGlobalGroupAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataGlobalGroupAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataGlobalGroupAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataGlobalGroupAllBuilderImpl() {}
 
     public BACnetConstructedDataGlobalGroupAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataGlobalGroupAll bACnetConstructedDataGlobalGroupAll =
-          new BACnetConstructedDataGlobalGroupAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataGlobalGroupAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataGlobalGroupAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalGroupGroupMembers.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalGroupGroupMembers.java
index 2e1dd58b8a6..5b2bcbf590b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalGroupGroupMembers.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalGroupGroupMembers.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetDeviceObjectPropertyReference> groupMembers;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataGlobalGroupGroupMembers(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetDeviceObjectPropertyReference> groupMembers,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDeviceObjectPropertyReference> groupMembers) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.groupMembers = groupMembers;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (groupMembers)
     writeComplexTypeArrayField("groupMembers", groupMembers, writeBuffer);
@@ -172,42 +160,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataGlobalGroupGroupMembers");
     // Create the instance
     return new BACnetConstructedDataGlobalGroupGroupMembersBuilderImpl(
-        numberOfDataElements, groupMembers, tagNumber, arrayIndexArgument);
+        numberOfDataElements, groupMembers);
   }
 
   public static class BACnetConstructedDataGlobalGroupGroupMembersBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetDeviceObjectPropertyReference> groupMembers;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataGlobalGroupGroupMembersBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetDeviceObjectPropertyReference> groupMembers,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDeviceObjectPropertyReference> groupMembers) {
       this.numberOfDataElements = numberOfDataElements;
       this.groupMembers = groupMembers;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataGlobalGroupGroupMembers build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataGlobalGroupGroupMembers bACnetConstructedDataGlobalGroupGroupMembers =
           new BACnetConstructedDataGlobalGroupGroupMembers(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              groupMembers,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, groupMembers);
       return bACnetConstructedDataGlobalGroupGroupMembers;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalGroupPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalGroupPresentValue.java
index 501858e1bfe..3cf0e9773e0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalGroupPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalGroupPresentValue.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetPropertyAccessResult> presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataGlobalGroupPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetPropertyAccessResult> presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetPropertyAccessResult> presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (presentValue)
     writeComplexTypeArrayField("presentValue", presentValue, writeBuffer);
@@ -171,42 +159,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataGlobalGroupPresentValue");
     // Create the instance
     return new BACnetConstructedDataGlobalGroupPresentValueBuilderImpl(
-        numberOfDataElements, presentValue, tagNumber, arrayIndexArgument);
+        numberOfDataElements, presentValue);
   }
 
   public static class BACnetConstructedDataGlobalGroupPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetPropertyAccessResult> presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataGlobalGroupPresentValueBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetPropertyAccessResult> presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetPropertyAccessResult> presentValue) {
       this.numberOfDataElements = numberOfDataElements;
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataGlobalGroupPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataGlobalGroupPresentValue bACnetConstructedDataGlobalGroupPresentValue =
           new BACnetConstructedDataGlobalGroupPresentValue(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              presentValue,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, presentValue);
       return bACnetConstructedDataGlobalGroupPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalIdentifier.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalIdentifier.java
index ccd2c09e66b..24035542507 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalIdentifier.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGlobalIdentifier.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger globalIdentifier;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataGlobalIdentifier(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger globalIdentifier,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger globalIdentifier) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.globalIdentifier = globalIdentifier;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getGlobalIdentifier() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataGlobalIdentifier");
     // Create the instance
-    return new BACnetConstructedDataGlobalIdentifierBuilderImpl(
-        globalIdentifier, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataGlobalIdentifierBuilderImpl(globalIdentifier);
   }
 
   public static class BACnetConstructedDataGlobalIdentifierBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger globalIdentifier;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataGlobalIdentifierBuilderImpl(
-        BACnetApplicationTagUnsignedInteger globalIdentifier,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger globalIdentifier) {
       this.globalIdentifier = globalIdentifier;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataGlobalIdentifier build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataGlobalIdentifier bACnetConstructedDataGlobalIdentifier =
           new BACnetConstructedDataGlobalIdentifier(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              globalIdentifier,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, globalIdentifier);
       return bACnetConstructedDataGlobalIdentifier;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupAll.java
index b92c71dd47e..1d794dc20e8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataGroupAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataGroupAll");
     // Create the instance
-    return new BACnetConstructedDataGroupAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataGroupAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataGroupAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataGroupAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataGroupAllBuilderImpl() {}
 
     public BACnetConstructedDataGroupAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataGroupAll bACnetConstructedDataGroupAll =
-          new BACnetConstructedDataGroupAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataGroupAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataGroupAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupID.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupID.java
index d08aeb6c41c..17aa7053dfd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupID.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupID.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger groupId;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataGroupID(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger groupId,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger groupId) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.groupId = groupId;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getGroupId() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataGroupID");
     // Create the instance
-    return new BACnetConstructedDataGroupIDBuilderImpl(groupId, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataGroupIDBuilderImpl(groupId);
   }
 
   public static class BACnetConstructedDataGroupIDBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger groupId;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataGroupIDBuilderImpl(
-        BACnetApplicationTagUnsignedInteger groupId,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataGroupIDBuilderImpl(BACnetApplicationTagUnsignedInteger groupId) {
       this.groupId = groupId;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataGroupID build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataGroupID bACnetConstructedDataGroupID =
-          new BACnetConstructedDataGroupID(
-              openingTag, peekedTagHeader, closingTag, groupId, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataGroupID(openingTag, peekedTagHeader, closingTag, groupId);
       return bACnetConstructedDataGroupID;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupMemberNames.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupMemberNames.java
index ebec99192ad..15ee2ac65b5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupMemberNames.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupMemberNames.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagCharacterString> groupMemberNames;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataGroupMemberNames(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagCharacterString> groupMemberNames,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagCharacterString> groupMemberNames) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.groupMemberNames = groupMemberNames;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (groupMemberNames)
     writeComplexTypeArrayField("groupMemberNames", groupMemberNames, writeBuffer);
@@ -175,42 +163,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataGroupMemberNames");
     // Create the instance
     return new BACnetConstructedDataGroupMemberNamesBuilderImpl(
-        numberOfDataElements, groupMemberNames, tagNumber, arrayIndexArgument);
+        numberOfDataElements, groupMemberNames);
   }
 
   public static class BACnetConstructedDataGroupMemberNamesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagCharacterString> groupMemberNames;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataGroupMemberNamesBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagCharacterString> groupMemberNames,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagCharacterString> groupMemberNames) {
       this.numberOfDataElements = numberOfDataElements;
       this.groupMemberNames = groupMemberNames;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataGroupMemberNames build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataGroupMemberNames bACnetConstructedDataGroupMemberNames =
           new BACnetConstructedDataGroupMemberNames(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              groupMemberNames,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, groupMemberNames);
       return bACnetConstructedDataGroupMemberNames;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupMembers.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupMembers.java
index 776d42667b2..f89b97543b1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupMembers.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupMembers.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagObjectIdentifier> groupMembers;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataGroupMembers(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagObjectIdentifier> groupMembers,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagObjectIdentifier> groupMembers) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.groupMembers = groupMembers;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (groupMembers)
     writeComplexTypeArrayField("groupMembers", groupMembers, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataGroupMembers");
     // Create the instance
-    return new BACnetConstructedDataGroupMembersBuilderImpl(
-        numberOfDataElements, groupMembers, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataGroupMembersBuilderImpl(numberOfDataElements, groupMembers);
   }
 
   public static class BACnetConstructedDataGroupMembersBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagObjectIdentifier> groupMembers;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataGroupMembersBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagObjectIdentifier> groupMembers,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagObjectIdentifier> groupMembers) {
       this.numberOfDataElements = numberOfDataElements;
       this.groupMembers = groupMembers;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataGroupMembers build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataGroupMembers bACnetConstructedDataGroupMembers =
           new BACnetConstructedDataGroupMembers(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              groupMembers,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, groupMembers);
       return bACnetConstructedDataGroupMembers;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupMode.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupMode.java
index 13c82e7f431..a9db48cef71 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupMode.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupMode.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLiftGroupModeTagged groupMode;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataGroupMode(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLiftGroupModeTagged groupMode,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLiftGroupModeTagged groupMode) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.groupMode = groupMode;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLiftGroupModeTagged getGroupMode() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataGroupMode");
     // Create the instance
-    return new BACnetConstructedDataGroupModeBuilderImpl(groupMode, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataGroupModeBuilderImpl(groupMode);
   }
 
   public static class BACnetConstructedDataGroupModeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLiftGroupModeTagged groupMode;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataGroupModeBuilderImpl(
-        BACnetLiftGroupModeTagged groupMode,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataGroupModeBuilderImpl(BACnetLiftGroupModeTagged groupMode) {
       this.groupMode = groupMode;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataGroupMode build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataGroupMode bACnetConstructedDataGroupMode =
-          new BACnetConstructedDataGroupMode(
-              openingTag, peekedTagHeader, closingTag, groupMode, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataGroupMode(openingTag, peekedTagHeader, closingTag, groupMode);
       return bACnetConstructedDataGroupMode;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupPresentValue.java
index a591f776072..bd497172573 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataGroupPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetReadAccessResult> presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataGroupPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetReadAccessResult> presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetReadAccessResult> presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetReadAccessResult> getPresentValue() {
@@ -127,34 +119,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataGroupPresentValue");
     // Create the instance
-    return new BACnetConstructedDataGroupPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataGroupPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataGroupPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetReadAccessResult> presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataGroupPresentValueBuilderImpl(
-        List<BACnetReadAccessResult> presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetReadAccessResult> presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataGroupPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataGroupPresentValue bACnetConstructedDataGroupPresentValue =
           new BACnetConstructedDataGroupPresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataGroupPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataHighLimit.java
index c127bd20571..91bb5f1097c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataHighLimit.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal highLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataHighLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal highLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal highLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.highLimit = highLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getHighLimit() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataHighLimit");
     // Create the instance
-    return new BACnetConstructedDataHighLimitBuilderImpl(highLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataHighLimitBuilderImpl(highLimit);
   }
 
   public static class BACnetConstructedDataHighLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal highLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataHighLimitBuilderImpl(
-        BACnetApplicationTagReal highLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataHighLimitBuilderImpl(BACnetApplicationTagReal highLimit) {
       this.highLimit = highLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataHighLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataHighLimit bACnetConstructedDataHighLimit =
-          new BACnetConstructedDataHighLimit(
-              openingTag, peekedTagHeader, closingTag, highLimit, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataHighLimit(openingTag, peekedTagHeader, closingTag, highLimit);
       return bACnetConstructedDataHighLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataHigherDeck.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataHigherDeck.java
index 55cb4ad776f..dcb43ae95ac 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataHigherDeck.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataHigherDeck.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagObjectIdentifier higherDeck;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataHigherDeck(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagObjectIdentifier higherDeck,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagObjectIdentifier higherDeck) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.higherDeck = higherDeck;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagObjectIdentifier getHigherDeck() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataHigherDeck");
     // Create the instance
-    return new BACnetConstructedDataHigherDeckBuilderImpl(
-        higherDeck, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataHigherDeckBuilderImpl(higherDeck);
   }
 
   public static class BACnetConstructedDataHigherDeckBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagObjectIdentifier higherDeck;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataHigherDeckBuilderImpl(
-        BACnetApplicationTagObjectIdentifier higherDeck,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagObjectIdentifier higherDeck) {
       this.higherDeck = higherDeck;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataHigherDeck build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataHigherDeck bACnetConstructedDataHigherDeck =
-          new BACnetConstructedDataHigherDeck(
-              openingTag, peekedTagHeader, closingTag, higherDeck, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataHigherDeck(openingTag, peekedTagHeader, closingTag, higherDeck);
       return bACnetConstructedDataHigherDeck;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPAddress.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPAddress.java
index cd9ff8e1ca2..2d06d223453 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPAddress.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPAddress.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagOctetString ipAddress;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPAddress(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagOctetString ipAddress,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagOctetString ipAddress) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipAddress = ipAddress;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagOctetString getIpAddress() {
@@ -133,33 +125,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPAddress");
     // Create the instance
-    return new BACnetConstructedDataIPAddressBuilderImpl(ipAddress, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPAddressBuilderImpl(ipAddress);
   }
 
   public static class BACnetConstructedDataIPAddressBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagOctetString ipAddress;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataIPAddressBuilderImpl(
-        BACnetApplicationTagOctetString ipAddress,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataIPAddressBuilderImpl(BACnetApplicationTagOctetString ipAddress) {
       this.ipAddress = ipAddress;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPAddress build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPAddress bACnetConstructedDataIPAddress =
-          new BACnetConstructedDataIPAddress(
-              openingTag, peekedTagHeader, closingTag, ipAddress, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataIPAddress(openingTag, peekedTagHeader, closingTag, ipAddress);
       return bACnetConstructedDataIPAddress;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPEnable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPEnable.java
index 88de86fc1f3..1d4139cd69c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPEnable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPEnable.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean ipDhcpEnable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPDHCPEnable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean ipDhcpEnable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean ipDhcpEnable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipDhcpEnable = ipDhcpEnable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getIpDhcpEnable() {
@@ -132,34 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPDHCPEnable");
     // Create the instance
-    return new BACnetConstructedDataIPDHCPEnableBuilderImpl(
-        ipDhcpEnable, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPDHCPEnableBuilderImpl(ipDhcpEnable);
   }
 
   public static class BACnetConstructedDataIPDHCPEnableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean ipDhcpEnable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataIPDHCPEnableBuilderImpl(
-        BACnetApplicationTagBoolean ipDhcpEnable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataIPDHCPEnableBuilderImpl(BACnetApplicationTagBoolean ipDhcpEnable) {
       this.ipDhcpEnable = ipDhcpEnable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPDHCPEnable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPDHCPEnable bACnetConstructedDataIPDHCPEnable =
           new BACnetConstructedDataIPDHCPEnable(
-              openingTag, peekedTagHeader, closingTag, ipDhcpEnable, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, ipDhcpEnable);
       return bACnetConstructedDataIPDHCPEnable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPLeaseTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPLeaseTime.java
index b0419f2a803..9604d41d613 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPLeaseTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPLeaseTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger ipDhcpLeaseTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPDHCPLeaseTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger ipDhcpLeaseTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger ipDhcpLeaseTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipDhcpLeaseTime = ipDhcpLeaseTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getIpDhcpLeaseTime() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPDHCPLeaseTime");
     // Create the instance
-    return new BACnetConstructedDataIPDHCPLeaseTimeBuilderImpl(
-        ipDhcpLeaseTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPDHCPLeaseTimeBuilderImpl(ipDhcpLeaseTime);
   }
 
   public static class BACnetConstructedDataIPDHCPLeaseTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger ipDhcpLeaseTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIPDHCPLeaseTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger ipDhcpLeaseTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger ipDhcpLeaseTime) {
       this.ipDhcpLeaseTime = ipDhcpLeaseTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPDHCPLeaseTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPDHCPLeaseTime bACnetConstructedDataIPDHCPLeaseTime =
           new BACnetConstructedDataIPDHCPLeaseTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              ipDhcpLeaseTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, ipDhcpLeaseTime);
       return bACnetConstructedDataIPDHCPLeaseTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPLeaseTimeRemaining.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPLeaseTimeRemaining.java
index 52ca350d729..e88e382cc39 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPLeaseTimeRemaining.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPLeaseTimeRemaining.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger ipDhcpLeaseTimeRemaining;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPDHCPLeaseTimeRemaining(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger ipDhcpLeaseTimeRemaining,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger ipDhcpLeaseTimeRemaining) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipDhcpLeaseTimeRemaining = ipDhcpLeaseTimeRemaining;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getIpDhcpLeaseTimeRemaining() {
@@ -137,39 +129,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPDHCPLeaseTimeRemaining");
     // Create the instance
-    return new BACnetConstructedDataIPDHCPLeaseTimeRemainingBuilderImpl(
-        ipDhcpLeaseTimeRemaining, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPDHCPLeaseTimeRemainingBuilderImpl(ipDhcpLeaseTimeRemaining);
   }
 
   public static class BACnetConstructedDataIPDHCPLeaseTimeRemainingBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger ipDhcpLeaseTimeRemaining;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIPDHCPLeaseTimeRemainingBuilderImpl(
-        BACnetApplicationTagUnsignedInteger ipDhcpLeaseTimeRemaining,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger ipDhcpLeaseTimeRemaining) {
       this.ipDhcpLeaseTimeRemaining = ipDhcpLeaseTimeRemaining;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPDHCPLeaseTimeRemaining build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPDHCPLeaseTimeRemaining bACnetConstructedDataIPDHCPLeaseTimeRemaining =
           new BACnetConstructedDataIPDHCPLeaseTimeRemaining(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              ipDhcpLeaseTimeRemaining,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, ipDhcpLeaseTimeRemaining);
       return bACnetConstructedDataIPDHCPLeaseTimeRemaining;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPServer.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPServer.java
index 76b5d67b43f..0c55ce913a8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPServer.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDHCPServer.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagOctetString dhcpServer;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPDHCPServer(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagOctetString dhcpServer,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagOctetString dhcpServer) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.dhcpServer = dhcpServer;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagOctetString getDhcpServer() {
@@ -133,34 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPDHCPServer");
     // Create the instance
-    return new BACnetConstructedDataIPDHCPServerBuilderImpl(
-        dhcpServer, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPDHCPServerBuilderImpl(dhcpServer);
   }
 
   public static class BACnetConstructedDataIPDHCPServerBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagOctetString dhcpServer;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIPDHCPServerBuilderImpl(
-        BACnetApplicationTagOctetString dhcpServer,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagOctetString dhcpServer) {
       this.dhcpServer = dhcpServer;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPDHCPServer build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPDHCPServer bACnetConstructedDataIPDHCPServer =
           new BACnetConstructedDataIPDHCPServer(
-              openingTag, peekedTagHeader, closingTag, dhcpServer, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, dhcpServer);
       return bACnetConstructedDataIPDHCPServer;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDNSServer.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDNSServer.java
index e7c3796254c..938b6acef3e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDNSServer.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDNSServer.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagOctetString> ipDnsServer;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPDNSServer(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagOctetString> ipDnsServer,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagOctetString> ipDnsServer) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.ipDnsServer = ipDnsServer;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (ipDnsServer)
     writeComplexTypeArrayField("ipDnsServer", ipDnsServer, writeBuffer);
@@ -172,43 +160,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPDNSServer");
     // Create the instance
-    return new BACnetConstructedDataIPDNSServerBuilderImpl(
-        numberOfDataElements, ipDnsServer, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPDNSServerBuilderImpl(numberOfDataElements, ipDnsServer);
   }
 
   public static class BACnetConstructedDataIPDNSServerBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagOctetString> ipDnsServer;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIPDNSServerBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagOctetString> ipDnsServer,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagOctetString> ipDnsServer) {
       this.numberOfDataElements = numberOfDataElements;
       this.ipDnsServer = ipDnsServer;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPDNSServer build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPDNSServer bACnetConstructedDataIPDNSServer =
           new BACnetConstructedDataIPDNSServer(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              ipDnsServer,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, ipDnsServer);
       return bACnetConstructedDataIPDNSServer;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDefaultGateway.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDefaultGateway.java
index 5c47bc2da9f..f6f30dd9be9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDefaultGateway.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPDefaultGateway.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagOctetString ipDefaultGateway;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPDefaultGateway(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagOctetString ipDefaultGateway,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagOctetString ipDefaultGateway) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipDefaultGateway = ipDefaultGateway;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagOctetString getIpDefaultGateway() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPDefaultGateway");
     // Create the instance
-    return new BACnetConstructedDataIPDefaultGatewayBuilderImpl(
-        ipDefaultGateway, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPDefaultGatewayBuilderImpl(ipDefaultGateway);
   }
 
   public static class BACnetConstructedDataIPDefaultGatewayBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagOctetString ipDefaultGateway;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIPDefaultGatewayBuilderImpl(
-        BACnetApplicationTagOctetString ipDefaultGateway,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagOctetString ipDefaultGateway) {
       this.ipDefaultGateway = ipDefaultGateway;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPDefaultGateway build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPDefaultGateway bACnetConstructedDataIPDefaultGateway =
           new BACnetConstructedDataIPDefaultGateway(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              ipDefaultGateway,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, ipDefaultGateway);
       return bACnetConstructedDataIPDefaultGateway;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPSubnetMask.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPSubnetMask.java
index bf7fe4aab35..14ad42686ee 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPSubnetMask.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPSubnetMask.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagOctetString ipSubnetMask;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPSubnetMask(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagOctetString ipSubnetMask,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagOctetString ipSubnetMask) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipSubnetMask = ipSubnetMask;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagOctetString getIpSubnetMask() {
@@ -133,34 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPSubnetMask");
     // Create the instance
-    return new BACnetConstructedDataIPSubnetMaskBuilderImpl(
-        ipSubnetMask, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPSubnetMaskBuilderImpl(ipSubnetMask);
   }
 
   public static class BACnetConstructedDataIPSubnetMaskBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagOctetString ipSubnetMask;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIPSubnetMaskBuilderImpl(
-        BACnetApplicationTagOctetString ipSubnetMask,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagOctetString ipSubnetMask) {
       this.ipSubnetMask = ipSubnetMask;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPSubnetMask build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPSubnetMask bACnetConstructedDataIPSubnetMask =
           new BACnetConstructedDataIPSubnetMask(
-              openingTag, peekedTagHeader, closingTag, ipSubnetMask, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, ipSubnetMask);
       return bACnetConstructedDataIPSubnetMask;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6Address.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6Address.java
index 3a802aabab7..b7f4ef366b9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6Address.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6Address.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagOctetString ipv6Address;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPv6Address(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagOctetString ipv6Address,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagOctetString ipv6Address) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipv6Address = ipv6Address;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagOctetString getIpv6Address() {
@@ -133,34 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPv6Address");
     // Create the instance
-    return new BACnetConstructedDataIPv6AddressBuilderImpl(
-        ipv6Address, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPv6AddressBuilderImpl(ipv6Address);
   }
 
   public static class BACnetConstructedDataIPv6AddressBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagOctetString ipv6Address;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIPv6AddressBuilderImpl(
-        BACnetApplicationTagOctetString ipv6Address,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagOctetString ipv6Address) {
       this.ipv6Address = ipv6Address;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPv6Address build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPv6Address bACnetConstructedDataIPv6Address =
           new BACnetConstructedDataIPv6Address(
-              openingTag, peekedTagHeader, closingTag, ipv6Address, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, ipv6Address);
       return bACnetConstructedDataIPv6Address;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6AutoAddressingEnable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6AutoAddressingEnable.java
index 2f9fdeebf26..e0fbf2c5556 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6AutoAddressingEnable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6AutoAddressingEnable.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean autoAddressingEnable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPv6AutoAddressingEnable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean autoAddressingEnable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean autoAddressingEnable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.autoAddressingEnable = autoAddressingEnable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getAutoAddressingEnable() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPv6AutoAddressingEnable");
     // Create the instance
-    return new BACnetConstructedDataIPv6AutoAddressingEnableBuilderImpl(
-        autoAddressingEnable, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPv6AutoAddressingEnableBuilderImpl(autoAddressingEnable);
   }
 
   public static class BACnetConstructedDataIPv6AutoAddressingEnableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean autoAddressingEnable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIPv6AutoAddressingEnableBuilderImpl(
-        BACnetApplicationTagBoolean autoAddressingEnable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean autoAddressingEnable) {
       this.autoAddressingEnable = autoAddressingEnable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPv6AutoAddressingEnable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPv6AutoAddressingEnable bACnetConstructedDataIPv6AutoAddressingEnable =
           new BACnetConstructedDataIPv6AutoAddressingEnable(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              autoAddressingEnable,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, autoAddressingEnable);
       return bACnetConstructedDataIPv6AutoAddressingEnable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DHCPLeaseTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DHCPLeaseTime.java
index 54f0acc7196..845da734b52 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DHCPLeaseTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DHCPLeaseTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger ipv6DhcpLeaseTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPv6DHCPLeaseTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger ipv6DhcpLeaseTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger ipv6DhcpLeaseTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipv6DhcpLeaseTime = ipv6DhcpLeaseTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getIpv6DhcpLeaseTime() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPv6DHCPLeaseTime");
     // Create the instance
-    return new BACnetConstructedDataIPv6DHCPLeaseTimeBuilderImpl(
-        ipv6DhcpLeaseTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPv6DHCPLeaseTimeBuilderImpl(ipv6DhcpLeaseTime);
   }
 
   public static class BACnetConstructedDataIPv6DHCPLeaseTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger ipv6DhcpLeaseTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIPv6DHCPLeaseTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger ipv6DhcpLeaseTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger ipv6DhcpLeaseTime) {
       this.ipv6DhcpLeaseTime = ipv6DhcpLeaseTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPv6DHCPLeaseTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPv6DHCPLeaseTime bACnetConstructedDataIPv6DHCPLeaseTime =
           new BACnetConstructedDataIPv6DHCPLeaseTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              ipv6DhcpLeaseTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, ipv6DhcpLeaseTime);
       return bACnetConstructedDataIPv6DHCPLeaseTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DHCPLeaseTimeRemaining.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DHCPLeaseTimeRemaining.java
index 992da8616f9..60ae0da9e59 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DHCPLeaseTimeRemaining.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DHCPLeaseTimeRemaining.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger ipv6DhcpLeaseTimeRemaining;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPv6DHCPLeaseTimeRemaining(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger ipv6DhcpLeaseTimeRemaining,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger ipv6DhcpLeaseTimeRemaining) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipv6DhcpLeaseTimeRemaining = ipv6DhcpLeaseTimeRemaining;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getIpv6DhcpLeaseTimeRemaining() {
@@ -138,39 +130,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataIPv6DHCPLeaseTimeRemaining");
     // Create the instance
     return new BACnetConstructedDataIPv6DHCPLeaseTimeRemainingBuilderImpl(
-        ipv6DhcpLeaseTimeRemaining, tagNumber, arrayIndexArgument);
+        ipv6DhcpLeaseTimeRemaining);
   }
 
   public static class BACnetConstructedDataIPv6DHCPLeaseTimeRemainingBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger ipv6DhcpLeaseTimeRemaining;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIPv6DHCPLeaseTimeRemainingBuilderImpl(
-        BACnetApplicationTagUnsignedInteger ipv6DhcpLeaseTimeRemaining,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger ipv6DhcpLeaseTimeRemaining) {
       this.ipv6DhcpLeaseTimeRemaining = ipv6DhcpLeaseTimeRemaining;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPv6DHCPLeaseTimeRemaining build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPv6DHCPLeaseTimeRemaining
           bACnetConstructedDataIPv6DHCPLeaseTimeRemaining =
               new BACnetConstructedDataIPv6DHCPLeaseTimeRemaining(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  ipv6DhcpLeaseTimeRemaining,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, ipv6DhcpLeaseTimeRemaining);
       return bACnetConstructedDataIPv6DHCPLeaseTimeRemaining;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DHCPServer.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DHCPServer.java
index 4f40142bc85..4cdb8aeb2e6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DHCPServer.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DHCPServer.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagOctetString dhcpServer;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPv6DHCPServer(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagOctetString dhcpServer,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagOctetString dhcpServer) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.dhcpServer = dhcpServer;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagOctetString getDhcpServer() {
@@ -133,34 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPv6DHCPServer");
     // Create the instance
-    return new BACnetConstructedDataIPv6DHCPServerBuilderImpl(
-        dhcpServer, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPv6DHCPServerBuilderImpl(dhcpServer);
   }
 
   public static class BACnetConstructedDataIPv6DHCPServerBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagOctetString dhcpServer;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIPv6DHCPServerBuilderImpl(
-        BACnetApplicationTagOctetString dhcpServer,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagOctetString dhcpServer) {
       this.dhcpServer = dhcpServer;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPv6DHCPServer build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPv6DHCPServer bACnetConstructedDataIPv6DHCPServer =
           new BACnetConstructedDataIPv6DHCPServer(
-              openingTag, peekedTagHeader, closingTag, dhcpServer, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, dhcpServer);
       return bACnetConstructedDataIPv6DHCPServer;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DNSServer.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DNSServer.java
index 566bbf405bc..1f377f40296 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DNSServer.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DNSServer.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagOctetString> ipv6DnsServer;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPv6DNSServer(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagOctetString> ipv6DnsServer,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagOctetString> ipv6DnsServer) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.ipv6DnsServer = ipv6DnsServer;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (ipv6DnsServer)
     writeComplexTypeArrayField("ipv6DnsServer", ipv6DnsServer, writeBuffer);
@@ -172,43 +160,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPv6DNSServer");
     // Create the instance
-    return new BACnetConstructedDataIPv6DNSServerBuilderImpl(
-        numberOfDataElements, ipv6DnsServer, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPv6DNSServerBuilderImpl(numberOfDataElements, ipv6DnsServer);
   }
 
   public static class BACnetConstructedDataIPv6DNSServerBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagOctetString> ipv6DnsServer;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIPv6DNSServerBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagOctetString> ipv6DnsServer,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagOctetString> ipv6DnsServer) {
       this.numberOfDataElements = numberOfDataElements;
       this.ipv6DnsServer = ipv6DnsServer;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPv6DNSServer build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPv6DNSServer bACnetConstructedDataIPv6DNSServer =
           new BACnetConstructedDataIPv6DNSServer(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              ipv6DnsServer,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, ipv6DnsServer);
       return bACnetConstructedDataIPv6DNSServer;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DefaultGateway.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DefaultGateway.java
index 5cd78e00731..c96a7035135 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DefaultGateway.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6DefaultGateway.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagOctetString ipv6DefaultGateway;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPv6DefaultGateway(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagOctetString ipv6DefaultGateway,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagOctetString ipv6DefaultGateway) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipv6DefaultGateway = ipv6DefaultGateway;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagOctetString getIpv6DefaultGateway() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPv6DefaultGateway");
     // Create the instance
-    return new BACnetConstructedDataIPv6DefaultGatewayBuilderImpl(
-        ipv6DefaultGateway, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPv6DefaultGatewayBuilderImpl(ipv6DefaultGateway);
   }
 
   public static class BACnetConstructedDataIPv6DefaultGatewayBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagOctetString ipv6DefaultGateway;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIPv6DefaultGatewayBuilderImpl(
-        BACnetApplicationTagOctetString ipv6DefaultGateway,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagOctetString ipv6DefaultGateway) {
       this.ipv6DefaultGateway = ipv6DefaultGateway;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPv6DefaultGateway build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPv6DefaultGateway bACnetConstructedDataIPv6DefaultGateway =
           new BACnetConstructedDataIPv6DefaultGateway(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              ipv6DefaultGateway,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, ipv6DefaultGateway);
       return bACnetConstructedDataIPv6DefaultGateway;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6PrefixLength.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6PrefixLength.java
index ec125e506c0..8060809e40b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6PrefixLength.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6PrefixLength.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger ipv6PrefixLength;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPv6PrefixLength(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger ipv6PrefixLength,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger ipv6PrefixLength) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipv6PrefixLength = ipv6PrefixLength;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getIpv6PrefixLength() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPv6PrefixLength");
     // Create the instance
-    return new BACnetConstructedDataIPv6PrefixLengthBuilderImpl(
-        ipv6PrefixLength, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPv6PrefixLengthBuilderImpl(ipv6PrefixLength);
   }
 
   public static class BACnetConstructedDataIPv6PrefixLengthBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger ipv6PrefixLength;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIPv6PrefixLengthBuilderImpl(
-        BACnetApplicationTagUnsignedInteger ipv6PrefixLength,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger ipv6PrefixLength) {
       this.ipv6PrefixLength = ipv6PrefixLength;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPv6PrefixLength build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPv6PrefixLength bACnetConstructedDataIPv6PrefixLength =
           new BACnetConstructedDataIPv6PrefixLength(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              ipv6PrefixLength,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, ipv6PrefixLength);
       return bACnetConstructedDataIPv6PrefixLength;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6ZoneIndex.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6ZoneIndex.java
index 4eb19e44043..5df6d5c208b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6ZoneIndex.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIPv6ZoneIndex.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString ipv6ZoneIndex;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIPv6ZoneIndex(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString ipv6ZoneIndex,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString ipv6ZoneIndex) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.ipv6ZoneIndex = ipv6ZoneIndex;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getIpv6ZoneIndex() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIPv6ZoneIndex");
     // Create the instance
-    return new BACnetConstructedDataIPv6ZoneIndexBuilderImpl(
-        ipv6ZoneIndex, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIPv6ZoneIndexBuilderImpl(ipv6ZoneIndex);
   }
 
   public static class BACnetConstructedDataIPv6ZoneIndexBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString ipv6ZoneIndex;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIPv6ZoneIndexBuilderImpl(
-        BACnetApplicationTagCharacterString ipv6ZoneIndex,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString ipv6ZoneIndex) {
       this.ipv6ZoneIndex = ipv6ZoneIndex;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIPv6ZoneIndex build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIPv6ZoneIndex bACnetConstructedDataIPv6ZoneIndex =
           new BACnetConstructedDataIPv6ZoneIndex(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              ipv6ZoneIndex,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, ipv6ZoneIndex);
       return bACnetConstructedDataIPv6ZoneIndex;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInProcess.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInProcess.java
index 6d634bd0764..c940d5a9e66 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInProcess.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInProcess.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean inProcess;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataInProcess(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean inProcess,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean inProcess) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.inProcess = inProcess;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getInProcess() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataInProcess");
     // Create the instance
-    return new BACnetConstructedDataInProcessBuilderImpl(inProcess, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataInProcessBuilderImpl(inProcess);
   }
 
   public static class BACnetConstructedDataInProcessBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean inProcess;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataInProcessBuilderImpl(
-        BACnetApplicationTagBoolean inProcess,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataInProcessBuilderImpl(BACnetApplicationTagBoolean inProcess) {
       this.inProcess = inProcess;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataInProcess build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataInProcess bACnetConstructedDataInProcess =
-          new BACnetConstructedDataInProcess(
-              openingTag, peekedTagHeader, closingTag, inProcess, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataInProcess(openingTag, peekedTagHeader, closingTag, inProcess);
       return bACnetConstructedDataInProcess;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInProgress.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInProgress.java
index 74262bb5954..cc7d853bcbf 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInProgress.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInProgress.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLightingInProgressTagged inProgress;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataInProgress(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLightingInProgressTagged inProgress,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLightingInProgressTagged inProgress) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.inProgress = inProgress;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLightingInProgressTagged getInProgress() {
@@ -134,34 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataInProgress");
     // Create the instance
-    return new BACnetConstructedDataInProgressBuilderImpl(
-        inProgress, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataInProgressBuilderImpl(inProgress);
   }
 
   public static class BACnetConstructedDataInProgressBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLightingInProgressTagged inProgress;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataInProgressBuilderImpl(
-        BACnetLightingInProgressTagged inProgress,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataInProgressBuilderImpl(BACnetLightingInProgressTagged inProgress) {
       this.inProgress = inProgress;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataInProgress build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataInProgress bACnetConstructedDataInProgress =
-          new BACnetConstructedDataInProgress(
-              openingTag, peekedTagHeader, closingTag, inProgress, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataInProgress(openingTag, peekedTagHeader, closingTag, inProgress);
       return bACnetConstructedDataInProgress;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInactiveText.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInactiveText.java
index f4c91cd0fa1..1ed1256f8a7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInactiveText.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInactiveText.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString inactiveText;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataInactiveText(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString inactiveText,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString inactiveText) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.inactiveText = inactiveText;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getInactiveText() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataInactiveText");
     // Create the instance
-    return new BACnetConstructedDataInactiveTextBuilderImpl(
-        inactiveText, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataInactiveTextBuilderImpl(inactiveText);
   }
 
   public static class BACnetConstructedDataInactiveTextBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString inactiveText;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataInactiveTextBuilderImpl(
-        BACnetApplicationTagCharacterString inactiveText,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString inactiveText) {
       this.inactiveText = inactiveText;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataInactiveText build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataInactiveText bACnetConstructedDataInactiveText =
           new BACnetConstructedDataInactiveText(
-              openingTag, peekedTagHeader, closingTag, inactiveText, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, inactiveText);
       return bACnetConstructedDataInactiveText;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInitialTimeout.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInitialTimeout.java
index 3358bcdbd4f..04af8a79ecc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInitialTimeout.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInitialTimeout.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger initialTimeout;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataInitialTimeout(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger initialTimeout,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger initialTimeout) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.initialTimeout = initialTimeout;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getInitialTimeout() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataInitialTimeout");
     // Create the instance
-    return new BACnetConstructedDataInitialTimeoutBuilderImpl(
-        initialTimeout, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataInitialTimeoutBuilderImpl(initialTimeout);
   }
 
   public static class BACnetConstructedDataInitialTimeoutBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger initialTimeout;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataInitialTimeoutBuilderImpl(
-        BACnetApplicationTagUnsignedInteger initialTimeout,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger initialTimeout) {
       this.initialTimeout = initialTimeout;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataInitialTimeout build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataInitialTimeout bACnetConstructedDataInitialTimeout =
           new BACnetConstructedDataInitialTimeout(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              initialTimeout,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, initialTimeout);
       return bACnetConstructedDataInitialTimeout;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInputReference.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInputReference.java
index 23bf427ed00..e0788620d37 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInputReference.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInputReference.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetObjectPropertyReference inputReference;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataInputReference(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetObjectPropertyReference inputReference,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetObjectPropertyReference inputReference) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.inputReference = inputReference;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetObjectPropertyReference getInputReference() {
@@ -130,39 +122,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataInputReference");
     // Create the instance
-    return new BACnetConstructedDataInputReferenceBuilderImpl(
-        inputReference, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataInputReferenceBuilderImpl(inputReference);
   }
 
   public static class BACnetConstructedDataInputReferenceBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetObjectPropertyReference inputReference;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataInputReferenceBuilderImpl(
-        BACnetObjectPropertyReference inputReference,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetObjectPropertyReference inputReference) {
       this.inputReference = inputReference;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataInputReference build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataInputReference bACnetConstructedDataInputReference =
           new BACnetConstructedDataInputReference(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              inputReference,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, inputReference);
       return bACnetConstructedDataInputReference;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInstallationID.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInstallationID.java
index 3c101ea776e..bde17f45fe0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInstallationID.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInstallationID.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger installationId;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataInstallationID(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger installationId,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger installationId) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.installationId = installationId;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getInstallationId() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataInstallationID");
     // Create the instance
-    return new BACnetConstructedDataInstallationIDBuilderImpl(
-        installationId, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataInstallationIDBuilderImpl(installationId);
   }
 
   public static class BACnetConstructedDataInstallationIDBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger installationId;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataInstallationIDBuilderImpl(
-        BACnetApplicationTagUnsignedInteger installationId,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger installationId) {
       this.installationId = installationId;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataInstallationID build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataInstallationID bACnetConstructedDataInstallationID =
           new BACnetConstructedDataInstallationID(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              installationId,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, installationId);
       return bACnetConstructedDataInstallationID;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInstanceOf.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInstanceOf.java
index 03cb3857bef..96046a37ad9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInstanceOf.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInstanceOf.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString instanceOf;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataInstanceOf(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString instanceOf,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString instanceOf) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.instanceOf = instanceOf;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getInstanceOf() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataInstanceOf");
     // Create the instance
-    return new BACnetConstructedDataInstanceOfBuilderImpl(
-        instanceOf, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataInstanceOfBuilderImpl(instanceOf);
   }
 
   public static class BACnetConstructedDataInstanceOfBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString instanceOf;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataInstanceOfBuilderImpl(
-        BACnetApplicationTagCharacterString instanceOf,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString instanceOf) {
       this.instanceOf = instanceOf;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataInstanceOf build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataInstanceOf bACnetConstructedDataInstanceOf =
-          new BACnetConstructedDataInstanceOf(
-              openingTag, peekedTagHeader, closingTag, instanceOf, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataInstanceOf(openingTag, peekedTagHeader, closingTag, instanceOf);
       return bACnetConstructedDataInstanceOf;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInstantaneousPower.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInstantaneousPower.java
index a7667a00616..1b7e4cad332 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInstantaneousPower.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataInstantaneousPower.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal instantaneousPower;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataInstantaneousPower(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal instantaneousPower,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal instantaneousPower) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.instantaneousPower = instantaneousPower;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getInstantaneousPower() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataInstantaneousPower");
     // Create the instance
-    return new BACnetConstructedDataInstantaneousPowerBuilderImpl(
-        instantaneousPower, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataInstantaneousPowerBuilderImpl(instantaneousPower);
   }
 
   public static class BACnetConstructedDataInstantaneousPowerBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal instantaneousPower;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataInstantaneousPowerBuilderImpl(
-        BACnetApplicationTagReal instantaneousPower,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal instantaneousPower) {
       this.instantaneousPower = instantaneousPower;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataInstantaneousPower build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataInstantaneousPower bACnetConstructedDataInstantaneousPower =
           new BACnetConstructedDataInstantaneousPower(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              instantaneousPower,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, instantaneousPower);
       return bACnetConstructedDataInstantaneousPower;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueAll.java
index c0b954bbfce..661a676162a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIntegerValueAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIntegerValueAll");
     // Create the instance
-    return new BACnetConstructedDataIntegerValueAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIntegerValueAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataIntegerValueAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataIntegerValueAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataIntegerValueAllBuilderImpl() {}
 
     public BACnetConstructedDataIntegerValueAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIntegerValueAll bACnetConstructedDataIntegerValueAll =
-          new BACnetConstructedDataIntegerValueAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataIntegerValueAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataIntegerValueAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueCOVIncrement.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueCOVIncrement.java
index 23af018c19e..7d12c77cd10 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueCOVIncrement.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueCOVIncrement.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger covIncrement;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIntegerValueCOVIncrement(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger covIncrement,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger covIncrement) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.covIncrement = covIncrement;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getCovIncrement() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIntegerValueCOVIncrement");
     // Create the instance
-    return new BACnetConstructedDataIntegerValueCOVIncrementBuilderImpl(
-        covIncrement, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIntegerValueCOVIncrementBuilderImpl(covIncrement);
   }
 
   public static class BACnetConstructedDataIntegerValueCOVIncrementBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger covIncrement;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIntegerValueCOVIncrementBuilderImpl(
-        BACnetApplicationTagUnsignedInteger covIncrement,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger covIncrement) {
       this.covIncrement = covIncrement;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIntegerValueCOVIncrement build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIntegerValueCOVIncrement bACnetConstructedDataIntegerValueCOVIncrement =
           new BACnetConstructedDataIntegerValueCOVIncrement(
-              openingTag, peekedTagHeader, closingTag, covIncrement, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, covIncrement);
       return bACnetConstructedDataIntegerValueCOVIncrement;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueDeadband.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueDeadband.java
index 4658828f9d3..5b33da77f14 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueDeadband.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueDeadband.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger deadband;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIntegerValueDeadband(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger deadband,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger deadband) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.deadband = deadband;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getDeadband() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIntegerValueDeadband");
     // Create the instance
-    return new BACnetConstructedDataIntegerValueDeadbandBuilderImpl(
-        deadband, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIntegerValueDeadbandBuilderImpl(deadband);
   }
 
   public static class BACnetConstructedDataIntegerValueDeadbandBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger deadband;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIntegerValueDeadbandBuilderImpl(
-        BACnetApplicationTagUnsignedInteger deadband,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger deadband) {
       this.deadband = deadband;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIntegerValueDeadband build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIntegerValueDeadband bACnetConstructedDataIntegerValueDeadband =
           new BACnetConstructedDataIntegerValueDeadband(
-              openingTag, peekedTagHeader, closingTag, deadband, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, deadband);
       return bACnetConstructedDataIntegerValueDeadband;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueFaultHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueFaultHighLimit.java
index 519ae4e311c..976cd826840 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueFaultHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueFaultHighLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger faultHighLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIntegerValueFaultHighLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger faultHighLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger faultHighLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultHighLimit = faultHighLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getFaultHighLimit() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIntegerValueFaultHighLimit");
     // Create the instance
-    return new BACnetConstructedDataIntegerValueFaultHighLimitBuilderImpl(
-        faultHighLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIntegerValueFaultHighLimitBuilderImpl(faultHighLimit);
   }
 
   public static class BACnetConstructedDataIntegerValueFaultHighLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger faultHighLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIntegerValueFaultHighLimitBuilderImpl(
-        BACnetApplicationTagSignedInteger faultHighLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagSignedInteger faultHighLimit) {
       this.faultHighLimit = faultHighLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIntegerValueFaultHighLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIntegerValueFaultHighLimit
           bACnetConstructedDataIntegerValueFaultHighLimit =
               new BACnetConstructedDataIntegerValueFaultHighLimit(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  faultHighLimit,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, faultHighLimit);
       return bACnetConstructedDataIntegerValueFaultHighLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueFaultLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueFaultLowLimit.java
index b45ceb4fef3..76d5f03a2bd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueFaultLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueFaultLowLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger faultLowLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIntegerValueFaultLowLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger faultLowLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger faultLowLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultLowLimit = faultLowLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getFaultLowLimit() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIntegerValueFaultLowLimit");
     // Create the instance
-    return new BACnetConstructedDataIntegerValueFaultLowLimitBuilderImpl(
-        faultLowLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIntegerValueFaultLowLimitBuilderImpl(faultLowLimit);
   }
 
   public static class BACnetConstructedDataIntegerValueFaultLowLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger faultLowLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIntegerValueFaultLowLimitBuilderImpl(
-        BACnetApplicationTagSignedInteger faultLowLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagSignedInteger faultLowLimit) {
       this.faultLowLimit = faultLowLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIntegerValueFaultLowLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIntegerValueFaultLowLimit
           bACnetConstructedDataIntegerValueFaultLowLimit =
               new BACnetConstructedDataIntegerValueFaultLowLimit(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  faultLowLimit,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, faultLowLimit);
       return bACnetConstructedDataIntegerValueFaultLowLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueHighLimit.java
index 380be15194d..fc48b38967a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueHighLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger highLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIntegerValueHighLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger highLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger highLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.highLimit = highLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getHighLimit() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIntegerValueHighLimit");
     // Create the instance
-    return new BACnetConstructedDataIntegerValueHighLimitBuilderImpl(
-        highLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIntegerValueHighLimitBuilderImpl(highLimit);
   }
 
   public static class BACnetConstructedDataIntegerValueHighLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger highLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIntegerValueHighLimitBuilderImpl(
-        BACnetApplicationTagSignedInteger highLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagSignedInteger highLimit) {
       this.highLimit = highLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIntegerValueHighLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIntegerValueHighLimit bACnetConstructedDataIntegerValueHighLimit =
           new BACnetConstructedDataIntegerValueHighLimit(
-              openingTag, peekedTagHeader, closingTag, highLimit, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, highLimit);
       return bACnetConstructedDataIntegerValueHighLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueLowLimit.java
index a760a00b5a5..80759b5f36a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueLowLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger lowLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIntegerValueLowLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger lowLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger lowLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lowLimit = lowLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getLowLimit() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIntegerValueLowLimit");
     // Create the instance
-    return new BACnetConstructedDataIntegerValueLowLimitBuilderImpl(
-        lowLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIntegerValueLowLimitBuilderImpl(lowLimit);
   }
 
   public static class BACnetConstructedDataIntegerValueLowLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger lowLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIntegerValueLowLimitBuilderImpl(
-        BACnetApplicationTagSignedInteger lowLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagSignedInteger lowLimit) {
       this.lowLimit = lowLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIntegerValueLowLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIntegerValueLowLimit bACnetConstructedDataIntegerValueLowLimit =
           new BACnetConstructedDataIntegerValueLowLimit(
-              openingTag, peekedTagHeader, closingTag, lowLimit, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lowLimit);
       return bACnetConstructedDataIntegerValueLowLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueMaxPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueMaxPresValue.java
index e78217c6fcb..f2c3d62dc5a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueMaxPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueMaxPresValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger maxPresValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIntegerValueMaxPresValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger maxPresValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger maxPresValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxPresValue = maxPresValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getMaxPresValue() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIntegerValueMaxPresValue");
     // Create the instance
-    return new BACnetConstructedDataIntegerValueMaxPresValueBuilderImpl(
-        maxPresValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIntegerValueMaxPresValueBuilderImpl(maxPresValue);
   }
 
   public static class BACnetConstructedDataIntegerValueMaxPresValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger maxPresValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIntegerValueMaxPresValueBuilderImpl(
-        BACnetApplicationTagSignedInteger maxPresValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagSignedInteger maxPresValue) {
       this.maxPresValue = maxPresValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIntegerValueMaxPresValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIntegerValueMaxPresValue bACnetConstructedDataIntegerValueMaxPresValue =
           new BACnetConstructedDataIntegerValueMaxPresValue(
-              openingTag, peekedTagHeader, closingTag, maxPresValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxPresValue);
       return bACnetConstructedDataIntegerValueMaxPresValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueMinPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueMinPresValue.java
index 2c3b9bd86eb..c9bb43122c0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueMinPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueMinPresValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger minPresValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIntegerValueMinPresValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger minPresValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger minPresValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.minPresValue = minPresValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getMinPresValue() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIntegerValueMinPresValue");
     // Create the instance
-    return new BACnetConstructedDataIntegerValueMinPresValueBuilderImpl(
-        minPresValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIntegerValueMinPresValueBuilderImpl(minPresValue);
   }
 
   public static class BACnetConstructedDataIntegerValueMinPresValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger minPresValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIntegerValueMinPresValueBuilderImpl(
-        BACnetApplicationTagSignedInteger minPresValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagSignedInteger minPresValue) {
       this.minPresValue = minPresValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIntegerValueMinPresValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIntegerValueMinPresValue bACnetConstructedDataIntegerValueMinPresValue =
           new BACnetConstructedDataIntegerValueMinPresValue(
-              openingTag, peekedTagHeader, closingTag, minPresValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, minPresValue);
       return bACnetConstructedDataIntegerValueMinPresValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValuePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValuePresentValue.java
index 3ae685217e7..071d048aec2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValuePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValuePresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIntegerValuePresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getPresentValue() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIntegerValuePresentValue");
     // Create the instance
-    return new BACnetConstructedDataIntegerValuePresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIntegerValuePresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataIntegerValuePresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIntegerValuePresentValueBuilderImpl(
-        BACnetApplicationTagSignedInteger presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagSignedInteger presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIntegerValuePresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIntegerValuePresentValue bACnetConstructedDataIntegerValuePresentValue =
           new BACnetConstructedDataIntegerValuePresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataIntegerValuePresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueRelinquishDefault.java
index a5ff43b89a5..b25b6a04ed4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIntegerValueRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getRelinquishDefault() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIntegerValueRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataIntegerValueRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIntegerValueRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataIntegerValueRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIntegerValueRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagSignedInteger relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagSignedInteger relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIntegerValueRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIntegerValueRelinquishDefault
           bACnetConstructedDataIntegerValueRelinquishDefault =
               new BACnetConstructedDataIntegerValueRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataIntegerValueRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueResolution.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueResolution.java
index 707314b1cc8..80cad58fbcf 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueResolution.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegerValueResolution.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger resolution;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIntegerValueResolution(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger resolution,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger resolution) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.resolution = resolution;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getResolution() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIntegerValueResolution");
     // Create the instance
-    return new BACnetConstructedDataIntegerValueResolutionBuilderImpl(
-        resolution, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIntegerValueResolutionBuilderImpl(resolution);
   }
 
   public static class BACnetConstructedDataIntegerValueResolutionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger resolution;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIntegerValueResolutionBuilderImpl(
-        BACnetApplicationTagSignedInteger resolution,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagSignedInteger resolution) {
       this.resolution = resolution;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIntegerValueResolution build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIntegerValueResolution bACnetConstructedDataIntegerValueResolution =
           new BACnetConstructedDataIntegerValueResolution(
-              openingTag, peekedTagHeader, closingTag, resolution, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, resolution);
       return bACnetConstructedDataIntegerValueResolution;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegralConstant.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegralConstant.java
index c257cdd9c7f..7adecdabc50 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegralConstant.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegralConstant.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal integralConstant;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIntegralConstant(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal integralConstant,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal integralConstant) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.integralConstant = integralConstant;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getIntegralConstant() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIntegralConstant");
     // Create the instance
-    return new BACnetConstructedDataIntegralConstantBuilderImpl(
-        integralConstant, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIntegralConstantBuilderImpl(integralConstant);
   }
 
   public static class BACnetConstructedDataIntegralConstantBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal integralConstant;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIntegralConstantBuilderImpl(
-        BACnetApplicationTagReal integralConstant,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal integralConstant) {
       this.integralConstant = integralConstant;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIntegralConstant build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIntegralConstant bACnetConstructedDataIntegralConstant =
           new BACnetConstructedDataIntegralConstant(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              integralConstant,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, integralConstant);
       return bACnetConstructedDataIntegralConstant;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegralConstantUnits.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegralConstantUnits.java
index f1497e8c9ad..6c75f3375d0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegralConstantUnits.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntegralConstantUnits.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetEngineeringUnitsTagged units;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIntegralConstantUnits(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetEngineeringUnitsTagged units,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetEngineeringUnitsTagged units) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.units = units;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetEngineeringUnitsTagged getUnits() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIntegralConstantUnits");
     // Create the instance
-    return new BACnetConstructedDataIntegralConstantUnitsBuilderImpl(
-        units, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIntegralConstantUnitsBuilderImpl(units);
   }
 
   public static class BACnetConstructedDataIntegralConstantUnitsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetEngineeringUnitsTagged units;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIntegralConstantUnitsBuilderImpl(
-        BACnetEngineeringUnitsTagged units,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetEngineeringUnitsTagged units) {
       this.units = units;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIntegralConstantUnits build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIntegralConstantUnits bACnetConstructedDataIntegralConstantUnits =
           new BACnetConstructedDataIntegralConstantUnits(
-              openingTag, peekedTagHeader, closingTag, units, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, units);
       return bACnetConstructedDataIntegralConstantUnits;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntervalOffset.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntervalOffset.java
index 19cbadc3f40..9eee17add2e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntervalOffset.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIntervalOffset.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger intervalOffset;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIntervalOffset(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger intervalOffset,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger intervalOffset) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.intervalOffset = intervalOffset;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getIntervalOffset() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIntervalOffset");
     // Create the instance
-    return new BACnetConstructedDataIntervalOffsetBuilderImpl(
-        intervalOffset, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIntervalOffsetBuilderImpl(intervalOffset);
   }
 
   public static class BACnetConstructedDataIntervalOffsetBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger intervalOffset;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataIntervalOffsetBuilderImpl(
-        BACnetApplicationTagUnsignedInteger intervalOffset,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger intervalOffset) {
       this.intervalOffset = intervalOffset;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIntervalOffset build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIntervalOffset bACnetConstructedDataIntervalOffset =
           new BACnetConstructedDataIntervalOffset(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              intervalOffset,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, intervalOffset);
       return bACnetConstructedDataIntervalOffset;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIsUTC.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIsUTC.java
index 2557bdbeb55..0e833443495 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIsUTC.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataIsUTC.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean isUtc;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataIsUTC(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean isUtc,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean isUtc) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.isUtc = isUtc;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getIsUtc() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataIsUTC");
     // Create the instance
-    return new BACnetConstructedDataIsUTCBuilderImpl(isUtc, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataIsUTCBuilderImpl(isUtc);
   }
 
   public static class BACnetConstructedDataIsUTCBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean isUtc;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataIsUTCBuilderImpl(
-        BACnetApplicationTagBoolean isUtc,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataIsUTCBuilderImpl(BACnetApplicationTagBoolean isUtc) {
       this.isUtc = isUtc;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataIsUTC build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataIsUTC bACnetConstructedDataIsUTC =
-          new BACnetConstructedDataIsUTC(
-              openingTag, peekedTagHeader, closingTag, isUtc, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataIsUTC(openingTag, peekedTagHeader, closingTag, isUtc);
       return bACnetConstructedDataIsUTC;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataKeySets.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataKeySets.java
index da5f2f35653..9d3ab817abe 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataKeySets.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataKeySets.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetSecurityKeySet> keySets;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataKeySets(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetSecurityKeySet> keySets,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetSecurityKeySet> keySets) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.keySets = keySets;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (keySets)
     writeComplexTypeArrayField("keySets", keySets, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataKeySets");
     // Create the instance
-    return new BACnetConstructedDataKeySetsBuilderImpl(
-        numberOfDataElements, keySets, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataKeySetsBuilderImpl(numberOfDataElements, keySets);
   }
 
   public static class BACnetConstructedDataKeySetsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetSecurityKeySet> keySets;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataKeySetsBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetSecurityKeySet> keySets,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetSecurityKeySet> keySets) {
       this.numberOfDataElements = numberOfDataElements;
       this.keySets = keySets;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataKeySets build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataKeySets bACnetConstructedDataKeySets =
           new BACnetConstructedDataKeySets(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              keySets,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, keySets);
       return bACnetConstructedDataKeySets;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLandingCallControl.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLandingCallControl.java
index bd3767ecde3..40b2f8c28b7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLandingCallControl.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLandingCallControl.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLandingCallStatus landingCallControl;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLandingCallControl(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLandingCallStatus landingCallControl,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLandingCallStatus landingCallControl) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.landingCallControl = landingCallControl;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLandingCallStatus getLandingCallControl() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLandingCallControl");
     // Create the instance
-    return new BACnetConstructedDataLandingCallControlBuilderImpl(
-        landingCallControl, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLandingCallControlBuilderImpl(landingCallControl);
   }
 
   public static class BACnetConstructedDataLandingCallControlBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLandingCallStatus landingCallControl;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLandingCallControlBuilderImpl(
-        BACnetLandingCallStatus landingCallControl,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetLandingCallStatus landingCallControl) {
       this.landingCallControl = landingCallControl;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLandingCallControl build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLandingCallControl bACnetConstructedDataLandingCallControl =
           new BACnetConstructedDataLandingCallControl(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              landingCallControl,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, landingCallControl);
       return bACnetConstructedDataLandingCallControl;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLandingCalls.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLandingCalls.java
index f17cf2157df..5c89f5bfd46 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLandingCalls.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLandingCalls.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetLandingCallStatus> landingCallStatus;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLandingCalls(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetLandingCallStatus> landingCallStatus,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLandingCallStatus> landingCallStatus) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.landingCallStatus = landingCallStatus;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetLandingCallStatus> getLandingCallStatus() {
@@ -126,39 +118,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLandingCalls");
     // Create the instance
-    return new BACnetConstructedDataLandingCallsBuilderImpl(
-        landingCallStatus, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLandingCallsBuilderImpl(landingCallStatus);
   }
 
   public static class BACnetConstructedDataLandingCallsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetLandingCallStatus> landingCallStatus;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLandingCallsBuilderImpl(
-        List<BACnetLandingCallStatus> landingCallStatus,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetLandingCallStatus> landingCallStatus) {
       this.landingCallStatus = landingCallStatus;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLandingCalls build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLandingCalls bACnetConstructedDataLandingCalls =
           new BACnetConstructedDataLandingCalls(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              landingCallStatus,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, landingCallStatus);
       return bACnetConstructedDataLandingCalls;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLandingDoorStatus.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLandingDoorStatus.java
index ec88f7a84d9..5a519d9313b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLandingDoorStatus.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLandingDoorStatus.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetLandingDoorStatus> landingDoorStatus;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLandingDoorStatus(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetLandingDoorStatus> landingDoorStatus,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLandingDoorStatus> landingDoorStatus) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.landingDoorStatus = landingDoorStatus;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (landingDoorStatus)
     writeComplexTypeArrayField("landingDoorStatus", landingDoorStatus, writeBuffer);
@@ -171,42 +159,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataLandingDoorStatus");
     // Create the instance
     return new BACnetConstructedDataLandingDoorStatusBuilderImpl(
-        numberOfDataElements, landingDoorStatus, tagNumber, arrayIndexArgument);
+        numberOfDataElements, landingDoorStatus);
   }
 
   public static class BACnetConstructedDataLandingDoorStatusBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetLandingDoorStatus> landingDoorStatus;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLandingDoorStatusBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetLandingDoorStatus> landingDoorStatus,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetLandingDoorStatus> landingDoorStatus) {
       this.numberOfDataElements = numberOfDataElements;
       this.landingDoorStatus = landingDoorStatus;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLandingDoorStatus build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLandingDoorStatus bACnetConstructedDataLandingDoorStatus =
           new BACnetConstructedDataLandingDoorStatus(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              landingDoorStatus,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, landingDoorStatus);
       return bACnetConstructedDataLandingDoorStatus;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueAll.java
index bcae1aa0143..ee5ee29f28e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLargeAnalogValueAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLargeAnalogValueAll");
     // Create the instance
-    return new BACnetConstructedDataLargeAnalogValueAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLargeAnalogValueAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataLargeAnalogValueAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLargeAnalogValueAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataLargeAnalogValueAllBuilderImpl() {}
 
     public BACnetConstructedDataLargeAnalogValueAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLargeAnalogValueAll bACnetConstructedDataLargeAnalogValueAll =
-          new BACnetConstructedDataLargeAnalogValueAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLargeAnalogValueAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataLargeAnalogValueAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueCOVIncrement.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueCOVIncrement.java
index e84f0ac644e..fb2bf334ffc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueCOVIncrement.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueCOVIncrement.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDouble covIncrement;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLargeAnalogValueCOVIncrement(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDouble covIncrement,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDouble covIncrement) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.covIncrement = covIncrement;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDouble getCovIncrement() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLargeAnalogValueCOVIncrement");
     // Create the instance
-    return new BACnetConstructedDataLargeAnalogValueCOVIncrementBuilderImpl(
-        covIncrement, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLargeAnalogValueCOVIncrementBuilderImpl(covIncrement);
   }
 
   public static class BACnetConstructedDataLargeAnalogValueCOVIncrementBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDouble covIncrement;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLargeAnalogValueCOVIncrementBuilderImpl(
-        BACnetApplicationTagDouble covIncrement,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagDouble covIncrement) {
       this.covIncrement = covIncrement;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLargeAnalogValueCOVIncrement build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLargeAnalogValueCOVIncrement
           bACnetConstructedDataLargeAnalogValueCOVIncrement =
               new BACnetConstructedDataLargeAnalogValueCOVIncrement(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  covIncrement,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, covIncrement);
       return bACnetConstructedDataLargeAnalogValueCOVIncrement;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueDeadband.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueDeadband.java
index b3130f3ac04..ae89db115c6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueDeadband.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueDeadband.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDouble deadband;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLargeAnalogValueDeadband(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDouble deadband,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDouble deadband) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.deadband = deadband;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDouble getDeadband() {
@@ -133,34 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLargeAnalogValueDeadband");
     // Create the instance
-    return new BACnetConstructedDataLargeAnalogValueDeadbandBuilderImpl(
-        deadband, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLargeAnalogValueDeadbandBuilderImpl(deadband);
   }
 
   public static class BACnetConstructedDataLargeAnalogValueDeadbandBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDouble deadband;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLargeAnalogValueDeadbandBuilderImpl(
-        BACnetApplicationTagDouble deadband,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagDouble deadband) {
       this.deadband = deadband;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLargeAnalogValueDeadband build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLargeAnalogValueDeadband bACnetConstructedDataLargeAnalogValueDeadband =
           new BACnetConstructedDataLargeAnalogValueDeadband(
-              openingTag, peekedTagHeader, closingTag, deadband, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, deadband);
       return bACnetConstructedDataLargeAnalogValueDeadband;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueFaultHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueFaultHighLimit.java
index c974a081e82..c1d8c29e3aa 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueFaultHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueFaultHighLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDouble faultHighLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLargeAnalogValueFaultHighLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDouble faultHighLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDouble faultHighLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultHighLimit = faultHighLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDouble getFaultHighLimit() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLargeAnalogValueFaultHighLimit");
     // Create the instance
-    return new BACnetConstructedDataLargeAnalogValueFaultHighLimitBuilderImpl(
-        faultHighLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLargeAnalogValueFaultHighLimitBuilderImpl(faultHighLimit);
   }
 
   public static class BACnetConstructedDataLargeAnalogValueFaultHighLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDouble faultHighLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLargeAnalogValueFaultHighLimitBuilderImpl(
-        BACnetApplicationTagDouble faultHighLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagDouble faultHighLimit) {
       this.faultHighLimit = faultHighLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLargeAnalogValueFaultHighLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLargeAnalogValueFaultHighLimit
           bACnetConstructedDataLargeAnalogValueFaultHighLimit =
               new BACnetConstructedDataLargeAnalogValueFaultHighLimit(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  faultHighLimit,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, faultHighLimit);
       return bACnetConstructedDataLargeAnalogValueFaultHighLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueFaultLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueFaultLowLimit.java
index 8a127ba7f7e..2c6030b40e2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueFaultLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueFaultLowLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDouble faultLowLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLargeAnalogValueFaultLowLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDouble faultLowLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDouble faultLowLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultLowLimit = faultLowLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDouble getFaultLowLimit() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLargeAnalogValueFaultLowLimit");
     // Create the instance
-    return new BACnetConstructedDataLargeAnalogValueFaultLowLimitBuilderImpl(
-        faultLowLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLargeAnalogValueFaultLowLimitBuilderImpl(faultLowLimit);
   }
 
   public static class BACnetConstructedDataLargeAnalogValueFaultLowLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDouble faultLowLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLargeAnalogValueFaultLowLimitBuilderImpl(
-        BACnetApplicationTagDouble faultLowLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagDouble faultLowLimit) {
       this.faultLowLimit = faultLowLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLargeAnalogValueFaultLowLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLargeAnalogValueFaultLowLimit
           bACnetConstructedDataLargeAnalogValueFaultLowLimit =
               new BACnetConstructedDataLargeAnalogValueFaultLowLimit(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  faultLowLimit,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, faultLowLimit);
       return bACnetConstructedDataLargeAnalogValueFaultLowLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueHighLimit.java
index 94525abceb4..cc861249ff5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueHighLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDouble highLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLargeAnalogValueHighLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDouble highLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDouble highLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.highLimit = highLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDouble getHighLimit() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLargeAnalogValueHighLimit");
     // Create the instance
-    return new BACnetConstructedDataLargeAnalogValueHighLimitBuilderImpl(
-        highLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLargeAnalogValueHighLimitBuilderImpl(highLimit);
   }
 
   public static class BACnetConstructedDataLargeAnalogValueHighLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDouble highLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLargeAnalogValueHighLimitBuilderImpl(
-        BACnetApplicationTagDouble highLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagDouble highLimit) {
       this.highLimit = highLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLargeAnalogValueHighLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLargeAnalogValueHighLimit
           bACnetConstructedDataLargeAnalogValueHighLimit =
               new BACnetConstructedDataLargeAnalogValueHighLimit(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  highLimit,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, highLimit);
       return bACnetConstructedDataLargeAnalogValueHighLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueLowLimit.java
index 980277d92b1..3d19d9666f7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueLowLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDouble lowLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLargeAnalogValueLowLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDouble lowLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDouble lowLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lowLimit = lowLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDouble getLowLimit() {
@@ -133,34 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLargeAnalogValueLowLimit");
     // Create the instance
-    return new BACnetConstructedDataLargeAnalogValueLowLimitBuilderImpl(
-        lowLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLargeAnalogValueLowLimitBuilderImpl(lowLimit);
   }
 
   public static class BACnetConstructedDataLargeAnalogValueLowLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDouble lowLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLargeAnalogValueLowLimitBuilderImpl(
-        BACnetApplicationTagDouble lowLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagDouble lowLimit) {
       this.lowLimit = lowLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLargeAnalogValueLowLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLargeAnalogValueLowLimit bACnetConstructedDataLargeAnalogValueLowLimit =
           new BACnetConstructedDataLargeAnalogValueLowLimit(
-              openingTag, peekedTagHeader, closingTag, lowLimit, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lowLimit);
       return bACnetConstructedDataLargeAnalogValueLowLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueMaxPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueMaxPresValue.java
index 9865c0201d4..03378f6ad72 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueMaxPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueMaxPresValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDouble maxPresValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLargeAnalogValueMaxPresValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDouble maxPresValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDouble maxPresValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxPresValue = maxPresValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDouble getMaxPresValue() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLargeAnalogValueMaxPresValue");
     // Create the instance
-    return new BACnetConstructedDataLargeAnalogValueMaxPresValueBuilderImpl(
-        maxPresValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLargeAnalogValueMaxPresValueBuilderImpl(maxPresValue);
   }
 
   public static class BACnetConstructedDataLargeAnalogValueMaxPresValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDouble maxPresValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLargeAnalogValueMaxPresValueBuilderImpl(
-        BACnetApplicationTagDouble maxPresValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagDouble maxPresValue) {
       this.maxPresValue = maxPresValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLargeAnalogValueMaxPresValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLargeAnalogValueMaxPresValue
           bACnetConstructedDataLargeAnalogValueMaxPresValue =
               new BACnetConstructedDataLargeAnalogValueMaxPresValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  maxPresValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, maxPresValue);
       return bACnetConstructedDataLargeAnalogValueMaxPresValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueMinPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueMinPresValue.java
index 0bf2054e517..884303f9761 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueMinPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueMinPresValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDouble minPresValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLargeAnalogValueMinPresValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDouble minPresValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDouble minPresValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.minPresValue = minPresValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDouble getMinPresValue() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLargeAnalogValueMinPresValue");
     // Create the instance
-    return new BACnetConstructedDataLargeAnalogValueMinPresValueBuilderImpl(
-        minPresValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLargeAnalogValueMinPresValueBuilderImpl(minPresValue);
   }
 
   public static class BACnetConstructedDataLargeAnalogValueMinPresValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDouble minPresValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLargeAnalogValueMinPresValueBuilderImpl(
-        BACnetApplicationTagDouble minPresValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagDouble minPresValue) {
       this.minPresValue = minPresValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLargeAnalogValueMinPresValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLargeAnalogValueMinPresValue
           bACnetConstructedDataLargeAnalogValueMinPresValue =
               new BACnetConstructedDataLargeAnalogValueMinPresValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  minPresValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, minPresValue);
       return bACnetConstructedDataLargeAnalogValueMinPresValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValuePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValuePresentValue.java
index 691baebbca7..e0668abb08f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValuePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValuePresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDouble presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLargeAnalogValuePresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDouble presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDouble presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDouble getPresentValue() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLargeAnalogValuePresentValue");
     // Create the instance
-    return new BACnetConstructedDataLargeAnalogValuePresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLargeAnalogValuePresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataLargeAnalogValuePresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDouble presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLargeAnalogValuePresentValueBuilderImpl(
-        BACnetApplicationTagDouble presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagDouble presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLargeAnalogValuePresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLargeAnalogValuePresentValue
           bACnetConstructedDataLargeAnalogValuePresentValue =
               new BACnetConstructedDataLargeAnalogValuePresentValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  presentValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataLargeAnalogValuePresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueRelinquishDefault.java
index b6dfa810208..502f296c397 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDouble relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLargeAnalogValueRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDouble relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDouble relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDouble getRelinquishDefault() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLargeAnalogValueRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataLargeAnalogValueRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLargeAnalogValueRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataLargeAnalogValueRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDouble relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLargeAnalogValueRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagDouble relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagDouble relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLargeAnalogValueRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLargeAnalogValueRelinquishDefault
           bACnetConstructedDataLargeAnalogValueRelinquishDefault =
               new BACnetConstructedDataLargeAnalogValueRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataLargeAnalogValueRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueResolution.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueResolution.java
index 3ae36ed7a8b..9caa091262a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueResolution.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLargeAnalogValueResolution.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDouble resolution;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLargeAnalogValueResolution(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDouble resolution,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDouble resolution) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.resolution = resolution;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDouble getResolution() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLargeAnalogValueResolution");
     // Create the instance
-    return new BACnetConstructedDataLargeAnalogValueResolutionBuilderImpl(
-        resolution, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLargeAnalogValueResolutionBuilderImpl(resolution);
   }
 
   public static class BACnetConstructedDataLargeAnalogValueResolutionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDouble resolution;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLargeAnalogValueResolutionBuilderImpl(
-        BACnetApplicationTagDouble resolution,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagDouble resolution) {
       this.resolution = resolution;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLargeAnalogValueResolution build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLargeAnalogValueResolution
           bACnetConstructedDataLargeAnalogValueResolution =
               new BACnetConstructedDataLargeAnalogValueResolution(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  resolution,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, resolution);
       return bACnetConstructedDataLargeAnalogValueResolution;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastAccessEvent.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastAccessEvent.java
index 7ffc145c5d8..267e424e72e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastAccessEvent.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastAccessEvent.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetAccessEventTagged lastAccessEvent;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLastAccessEvent(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetAccessEventTagged lastAccessEvent,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetAccessEventTagged lastAccessEvent) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lastAccessEvent = lastAccessEvent;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetAccessEventTagged getLastAccessEvent() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLastAccessEvent");
     // Create the instance
-    return new BACnetConstructedDataLastAccessEventBuilderImpl(
-        lastAccessEvent, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLastAccessEventBuilderImpl(lastAccessEvent);
   }
 
   public static class BACnetConstructedDataLastAccessEventBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetAccessEventTagged lastAccessEvent;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLastAccessEventBuilderImpl(
-        BACnetAccessEventTagged lastAccessEvent,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetAccessEventTagged lastAccessEvent) {
       this.lastAccessEvent = lastAccessEvent;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLastAccessEvent build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLastAccessEvent bACnetConstructedDataLastAccessEvent =
           new BACnetConstructedDataLastAccessEvent(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              lastAccessEvent,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lastAccessEvent);
       return bACnetConstructedDataLastAccessEvent;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastAccessPoint.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastAccessPoint.java
index f098141387c..c3d3daacf2c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastAccessPoint.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastAccessPoint.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDeviceObjectReference lastAccessPoint;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLastAccessPoint(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDeviceObjectReference lastAccessPoint,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDeviceObjectReference lastAccessPoint) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lastAccessPoint = lastAccessPoint;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDeviceObjectReference getLastAccessPoint() {
@@ -130,39 +122,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLastAccessPoint");
     // Create the instance
-    return new BACnetConstructedDataLastAccessPointBuilderImpl(
-        lastAccessPoint, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLastAccessPointBuilderImpl(lastAccessPoint);
   }
 
   public static class BACnetConstructedDataLastAccessPointBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDeviceObjectReference lastAccessPoint;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLastAccessPointBuilderImpl(
-        BACnetDeviceObjectReference lastAccessPoint,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDeviceObjectReference lastAccessPoint) {
       this.lastAccessPoint = lastAccessPoint;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLastAccessPoint build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLastAccessPoint bACnetConstructedDataLastAccessPoint =
           new BACnetConstructedDataLastAccessPoint(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              lastAccessPoint,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lastAccessPoint);
       return bACnetConstructedDataLastAccessPoint;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCommandTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCommandTime.java
index 137d2cf79f7..3b2f8b355af 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCommandTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCommandTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetTimeStamp lastCommandTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLastCommandTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetTimeStamp lastCommandTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetTimeStamp lastCommandTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lastCommandTime = lastCommandTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetTimeStamp getLastCommandTime() {
@@ -130,39 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLastCommandTime");
     // Create the instance
-    return new BACnetConstructedDataLastCommandTimeBuilderImpl(
-        lastCommandTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLastCommandTimeBuilderImpl(lastCommandTime);
   }
 
   public static class BACnetConstructedDataLastCommandTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetTimeStamp lastCommandTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLastCommandTimeBuilderImpl(
-        BACnetTimeStamp lastCommandTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLastCommandTimeBuilderImpl(BACnetTimeStamp lastCommandTime) {
       this.lastCommandTime = lastCommandTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLastCommandTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLastCommandTime bACnetConstructedDataLastCommandTime =
           new BACnetConstructedDataLastCommandTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              lastCommandTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lastCommandTime);
       return bACnetConstructedDataLastCommandTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialAdded.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialAdded.java
index 2f43591c55c..20d9d89334e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialAdded.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialAdded.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDeviceObjectReference lastCredentialAdded;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLastCredentialAdded(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDeviceObjectReference lastCredentialAdded,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDeviceObjectReference lastCredentialAdded) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lastCredentialAdded = lastCredentialAdded;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDeviceObjectReference getLastCredentialAdded() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLastCredentialAdded");
     // Create the instance
-    return new BACnetConstructedDataLastCredentialAddedBuilderImpl(
-        lastCredentialAdded, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLastCredentialAddedBuilderImpl(lastCredentialAdded);
   }
 
   public static class BACnetConstructedDataLastCredentialAddedBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDeviceObjectReference lastCredentialAdded;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLastCredentialAddedBuilderImpl(
-        BACnetDeviceObjectReference lastCredentialAdded,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDeviceObjectReference lastCredentialAdded) {
       this.lastCredentialAdded = lastCredentialAdded;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLastCredentialAdded build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLastCredentialAdded bACnetConstructedDataLastCredentialAdded =
           new BACnetConstructedDataLastCredentialAdded(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              lastCredentialAdded,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lastCredentialAdded);
       return bACnetConstructedDataLastCredentialAdded;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialAddedTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialAddedTime.java
index 5cc7543687f..6046086eca6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialAddedTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialAddedTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime lastCredentialAddedTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLastCredentialAddedTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime lastCredentialAddedTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime lastCredentialAddedTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lastCredentialAddedTime = lastCredentialAddedTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getLastCredentialAddedTime() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLastCredentialAddedTime");
     // Create the instance
-    return new BACnetConstructedDataLastCredentialAddedTimeBuilderImpl(
-        lastCredentialAddedTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLastCredentialAddedTimeBuilderImpl(lastCredentialAddedTime);
   }
 
   public static class BACnetConstructedDataLastCredentialAddedTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime lastCredentialAddedTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLastCredentialAddedTimeBuilderImpl(
-        BACnetDateTime lastCredentialAddedTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDateTime lastCredentialAddedTime) {
       this.lastCredentialAddedTime = lastCredentialAddedTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLastCredentialAddedTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLastCredentialAddedTime bACnetConstructedDataLastCredentialAddedTime =
           new BACnetConstructedDataLastCredentialAddedTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              lastCredentialAddedTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lastCredentialAddedTime);
       return bACnetConstructedDataLastCredentialAddedTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialRemoved.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialRemoved.java
index 902ac80baf3..83acd96bd3d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialRemoved.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialRemoved.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDeviceObjectReference lastCredentialRemoved;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLastCredentialRemoved(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDeviceObjectReference lastCredentialRemoved,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDeviceObjectReference lastCredentialRemoved) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lastCredentialRemoved = lastCredentialRemoved;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDeviceObjectReference getLastCredentialRemoved() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLastCredentialRemoved");
     // Create the instance
-    return new BACnetConstructedDataLastCredentialRemovedBuilderImpl(
-        lastCredentialRemoved, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLastCredentialRemovedBuilderImpl(lastCredentialRemoved);
   }
 
   public static class BACnetConstructedDataLastCredentialRemovedBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDeviceObjectReference lastCredentialRemoved;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLastCredentialRemovedBuilderImpl(
-        BACnetDeviceObjectReference lastCredentialRemoved,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDeviceObjectReference lastCredentialRemoved) {
       this.lastCredentialRemoved = lastCredentialRemoved;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLastCredentialRemoved build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLastCredentialRemoved bACnetConstructedDataLastCredentialRemoved =
           new BACnetConstructedDataLastCredentialRemoved(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              lastCredentialRemoved,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lastCredentialRemoved);
       return bACnetConstructedDataLastCredentialRemoved;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialRemovedTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialRemovedTime.java
index 8adaae79f32..866596966c9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialRemovedTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastCredentialRemovedTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime lastCredentialRemovedTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLastCredentialRemovedTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime lastCredentialRemovedTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime lastCredentialRemovedTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lastCredentialRemovedTime = lastCredentialRemovedTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getLastCredentialRemovedTime() {
@@ -132,40 +124,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLastCredentialRemovedTime");
     // Create the instance
-    return new BACnetConstructedDataLastCredentialRemovedTimeBuilderImpl(
-        lastCredentialRemovedTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLastCredentialRemovedTimeBuilderImpl(lastCredentialRemovedTime);
   }
 
   public static class BACnetConstructedDataLastCredentialRemovedTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime lastCredentialRemovedTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLastCredentialRemovedTimeBuilderImpl(
-        BACnetDateTime lastCredentialRemovedTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDateTime lastCredentialRemovedTime) {
       this.lastCredentialRemovedTime = lastCredentialRemovedTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLastCredentialRemovedTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLastCredentialRemovedTime
           bACnetConstructedDataLastCredentialRemovedTime =
               new BACnetConstructedDataLastCredentialRemovedTime(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  lastCredentialRemovedTime,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, lastCredentialRemovedTime);
       return bACnetConstructedDataLastCredentialRemovedTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastKeyServer.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastKeyServer.java
index 0b935dbcfd6..a32b1899c92 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastKeyServer.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastKeyServer.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetAddressBinding lastKeyServer;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLastKeyServer(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetAddressBinding lastKeyServer,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetAddressBinding lastKeyServer) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lastKeyServer = lastKeyServer;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetAddressBinding getLastKeyServer() {
@@ -130,39 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLastKeyServer");
     // Create the instance
-    return new BACnetConstructedDataLastKeyServerBuilderImpl(
-        lastKeyServer, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLastKeyServerBuilderImpl(lastKeyServer);
   }
 
   public static class BACnetConstructedDataLastKeyServerBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetAddressBinding lastKeyServer;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLastKeyServerBuilderImpl(
-        BACnetAddressBinding lastKeyServer,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLastKeyServerBuilderImpl(BACnetAddressBinding lastKeyServer) {
       this.lastKeyServer = lastKeyServer;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLastKeyServer build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLastKeyServer bACnetConstructedDataLastKeyServer =
           new BACnetConstructedDataLastKeyServer(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              lastKeyServer,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lastKeyServer);
       return bACnetConstructedDataLastKeyServer;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastNotifyRecord.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastNotifyRecord.java
index d7d95d008af..13b661d3d31 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastNotifyRecord.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastNotifyRecord.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger lastNotifyRecord;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLastNotifyRecord(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger lastNotifyRecord,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger lastNotifyRecord) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lastNotifyRecord = lastNotifyRecord;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getLastNotifyRecord() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLastNotifyRecord");
     // Create the instance
-    return new BACnetConstructedDataLastNotifyRecordBuilderImpl(
-        lastNotifyRecord, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLastNotifyRecordBuilderImpl(lastNotifyRecord);
   }
 
   public static class BACnetConstructedDataLastNotifyRecordBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger lastNotifyRecord;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLastNotifyRecordBuilderImpl(
-        BACnetApplicationTagUnsignedInteger lastNotifyRecord,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger lastNotifyRecord) {
       this.lastNotifyRecord = lastNotifyRecord;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLastNotifyRecord build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLastNotifyRecord bACnetConstructedDataLastNotifyRecord =
           new BACnetConstructedDataLastNotifyRecord(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              lastNotifyRecord,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lastNotifyRecord);
       return bACnetConstructedDataLastNotifyRecord;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastPriority.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastPriority.java
index ff54aa87192..7632ceaded8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastPriority.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastPriority.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger lastPriority;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLastPriority(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger lastPriority,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger lastPriority) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lastPriority = lastPriority;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getLastPriority() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLastPriority");
     // Create the instance
-    return new BACnetConstructedDataLastPriorityBuilderImpl(
-        lastPriority, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLastPriorityBuilderImpl(lastPriority);
   }
 
   public static class BACnetConstructedDataLastPriorityBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger lastPriority;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLastPriorityBuilderImpl(
-        BACnetApplicationTagUnsignedInteger lastPriority,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger lastPriority) {
       this.lastPriority = lastPriority;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLastPriority build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLastPriority bACnetConstructedDataLastPriority =
           new BACnetConstructedDataLastPriority(
-              openingTag, peekedTagHeader, closingTag, lastPriority, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lastPriority);
       return bACnetConstructedDataLastPriority;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastRestartReason.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastRestartReason.java
index 0a079968b20..d4a7965824f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastRestartReason.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastRestartReason.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetRestartReasonTagged lastRestartReason;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLastRestartReason(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetRestartReasonTagged lastRestartReason,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetRestartReasonTagged lastRestartReason) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lastRestartReason = lastRestartReason;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetRestartReasonTagged getLastRestartReason() {
@@ -135,39 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLastRestartReason");
     // Create the instance
-    return new BACnetConstructedDataLastRestartReasonBuilderImpl(
-        lastRestartReason, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLastRestartReasonBuilderImpl(lastRestartReason);
   }
 
   public static class BACnetConstructedDataLastRestartReasonBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetRestartReasonTagged lastRestartReason;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLastRestartReasonBuilderImpl(
-        BACnetRestartReasonTagged lastRestartReason,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetRestartReasonTagged lastRestartReason) {
       this.lastRestartReason = lastRestartReason;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLastRestartReason build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLastRestartReason bACnetConstructedDataLastRestartReason =
           new BACnetConstructedDataLastRestartReason(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              lastRestartReason,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lastRestartReason);
       return bACnetConstructedDataLastRestartReason;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastRestoreTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastRestoreTime.java
index 66adb4bc933..294d5bf4b46 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastRestoreTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastRestoreTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetTimeStamp lastRestoreTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLastRestoreTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetTimeStamp lastRestoreTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetTimeStamp lastRestoreTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lastRestoreTime = lastRestoreTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetTimeStamp getLastRestoreTime() {
@@ -130,39 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLastRestoreTime");
     // Create the instance
-    return new BACnetConstructedDataLastRestoreTimeBuilderImpl(
-        lastRestoreTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLastRestoreTimeBuilderImpl(lastRestoreTime);
   }
 
   public static class BACnetConstructedDataLastRestoreTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetTimeStamp lastRestoreTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLastRestoreTimeBuilderImpl(
-        BACnetTimeStamp lastRestoreTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLastRestoreTimeBuilderImpl(BACnetTimeStamp lastRestoreTime) {
       this.lastRestoreTime = lastRestoreTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLastRestoreTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLastRestoreTime bACnetConstructedDataLastRestoreTime =
           new BACnetConstructedDataLastRestoreTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              lastRestoreTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lastRestoreTime);
       return bACnetConstructedDataLastRestoreTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastStateChange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastStateChange.java
index 916db6d6629..833f15b667a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastStateChange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastStateChange.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetTimerTransitionTagged lastStateChange;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLastStateChange(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetTimerTransitionTagged lastStateChange,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetTimerTransitionTagged lastStateChange) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lastStateChange = lastStateChange;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetTimerTransitionTagged getLastStateChange() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLastStateChange");
     // Create the instance
-    return new BACnetConstructedDataLastStateChangeBuilderImpl(
-        lastStateChange, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLastStateChangeBuilderImpl(lastStateChange);
   }
 
   public static class BACnetConstructedDataLastStateChangeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetTimerTransitionTagged lastStateChange;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLastStateChangeBuilderImpl(
-        BACnetTimerTransitionTagged lastStateChange,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetTimerTransitionTagged lastStateChange) {
       this.lastStateChange = lastStateChange;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLastStateChange build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLastStateChange bACnetConstructedDataLastStateChange =
           new BACnetConstructedDataLastStateChange(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              lastStateChange,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lastStateChange);
       return bACnetConstructedDataLastStateChange;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastUseTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastUseTime.java
index 87c65849459..68a7f854aaf 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastUseTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLastUseTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime lastUseTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLastUseTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime lastUseTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime lastUseTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lastUseTime = lastUseTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getLastUseTime() {
@@ -128,34 +120,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLastUseTime");
     // Create the instance
-    return new BACnetConstructedDataLastUseTimeBuilderImpl(
-        lastUseTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLastUseTimeBuilderImpl(lastUseTime);
   }
 
   public static class BACnetConstructedDataLastUseTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime lastUseTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLastUseTimeBuilderImpl(
-        BACnetDateTime lastUseTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLastUseTimeBuilderImpl(BACnetDateTime lastUseTime) {
       this.lastUseTime = lastUseTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLastUseTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLastUseTime bACnetConstructedDataLastUseTime =
           new BACnetConstructedDataLastUseTime(
-              openingTag, peekedTagHeader, closingTag, lastUseTime, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lastUseTime);
       return bACnetConstructedDataLastUseTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyAlarmValues.java
index 2f7f35e9b08..db5d477f1a5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyAlarmValues.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetLifeSafetyStateTagged> alarmValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLifeSafetyAlarmValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetLifeSafetyStateTagged> alarmValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLifeSafetyStateTagged> alarmValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.alarmValues = alarmValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetLifeSafetyStateTagged> getAlarmValues() {
@@ -131,34 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLifeSafetyAlarmValues");
     // Create the instance
-    return new BACnetConstructedDataLifeSafetyAlarmValuesBuilderImpl(
-        alarmValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLifeSafetyAlarmValuesBuilderImpl(alarmValues);
   }
 
   public static class BACnetConstructedDataLifeSafetyAlarmValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetLifeSafetyStateTagged> alarmValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLifeSafetyAlarmValuesBuilderImpl(
-        List<BACnetLifeSafetyStateTagged> alarmValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetLifeSafetyStateTagged> alarmValues) {
       this.alarmValues = alarmValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLifeSafetyAlarmValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLifeSafetyAlarmValues bACnetConstructedDataLifeSafetyAlarmValues =
           new BACnetConstructedDataLifeSafetyAlarmValues(
-              openingTag, peekedTagHeader, closingTag, alarmValues, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, alarmValues);
       return bACnetConstructedDataLifeSafetyAlarmValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointAlarmValues.java
index f909ea7f41d..6c4050c2c05 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointAlarmValues.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetLifeSafetyStateTagged> alarmValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLifeSafetyPointAlarmValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetLifeSafetyStateTagged> alarmValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLifeSafetyStateTagged> alarmValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.alarmValues = alarmValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetLifeSafetyStateTagged> getAlarmValues() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLifeSafetyPointAlarmValues");
     // Create the instance
-    return new BACnetConstructedDataLifeSafetyPointAlarmValuesBuilderImpl(
-        alarmValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLifeSafetyPointAlarmValuesBuilderImpl(alarmValues);
   }
 
   public static class BACnetConstructedDataLifeSafetyPointAlarmValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetLifeSafetyStateTagged> alarmValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLifeSafetyPointAlarmValuesBuilderImpl(
-        List<BACnetLifeSafetyStateTagged> alarmValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetLifeSafetyStateTagged> alarmValues) {
       this.alarmValues = alarmValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLifeSafetyPointAlarmValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLifeSafetyPointAlarmValues
           bACnetConstructedDataLifeSafetyPointAlarmValues =
               new BACnetConstructedDataLifeSafetyPointAlarmValues(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  alarmValues,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, alarmValues);
       return bACnetConstructedDataLifeSafetyPointAlarmValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointAll.java
index 3637c3a2373..ba0cdce20db 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLifeSafetyPointAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLifeSafetyPointAll");
     // Create the instance
-    return new BACnetConstructedDataLifeSafetyPointAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLifeSafetyPointAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataLifeSafetyPointAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLifeSafetyPointAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataLifeSafetyPointAllBuilderImpl() {}
 
     public BACnetConstructedDataLifeSafetyPointAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLifeSafetyPointAll bACnetConstructedDataLifeSafetyPointAll =
-          new BACnetConstructedDataLifeSafetyPointAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLifeSafetyPointAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataLifeSafetyPointAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointFaultValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointFaultValues.java
index c95bc9bc5f0..63887a8db02 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointFaultValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointFaultValues.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetLifeSafetyStateTagged> faultValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLifeSafetyPointFaultValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetLifeSafetyStateTagged> faultValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLifeSafetyStateTagged> faultValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultValues = faultValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetLifeSafetyStateTagged> getFaultValues() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLifeSafetyPointFaultValues");
     // Create the instance
-    return new BACnetConstructedDataLifeSafetyPointFaultValuesBuilderImpl(
-        faultValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLifeSafetyPointFaultValuesBuilderImpl(faultValues);
   }
 
   public static class BACnetConstructedDataLifeSafetyPointFaultValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetLifeSafetyStateTagged> faultValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLifeSafetyPointFaultValuesBuilderImpl(
-        List<BACnetLifeSafetyStateTagged> faultValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetLifeSafetyStateTagged> faultValues) {
       this.faultValues = faultValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLifeSafetyPointFaultValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLifeSafetyPointFaultValues
           bACnetConstructedDataLifeSafetyPointFaultValues =
               new BACnetConstructedDataLifeSafetyPointFaultValues(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  faultValues,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, faultValues);
       return bACnetConstructedDataLifeSafetyPointFaultValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointPresentValue.java
index 730dbb255e4..edf7cbb1e4d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyPointPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLifeSafetyStateTagged presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLifeSafetyPointPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLifeSafetyStateTagged presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLifeSafetyStateTagged presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLifeSafetyStateTagged getPresentValue() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLifeSafetyPointPresentValue");
     // Create the instance
-    return new BACnetConstructedDataLifeSafetyPointPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLifeSafetyPointPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataLifeSafetyPointPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLifeSafetyStateTagged presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLifeSafetyPointPresentValueBuilderImpl(
-        BACnetLifeSafetyStateTagged presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetLifeSafetyStateTagged presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLifeSafetyPointPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLifeSafetyPointPresentValue
           bACnetConstructedDataLifeSafetyPointPresentValue =
               new BACnetConstructedDataLifeSafetyPointPresentValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  presentValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataLifeSafetyPointPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneAlarmValues.java
index cd02a92baf2..b13e8290f1a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneAlarmValues.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetLifeSafetyStateTagged> alarmValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLifeSafetyZoneAlarmValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetLifeSafetyStateTagged> alarmValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLifeSafetyStateTagged> alarmValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.alarmValues = alarmValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetLifeSafetyStateTagged> getAlarmValues() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLifeSafetyZoneAlarmValues");
     // Create the instance
-    return new BACnetConstructedDataLifeSafetyZoneAlarmValuesBuilderImpl(
-        alarmValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLifeSafetyZoneAlarmValuesBuilderImpl(alarmValues);
   }
 
   public static class BACnetConstructedDataLifeSafetyZoneAlarmValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetLifeSafetyStateTagged> alarmValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLifeSafetyZoneAlarmValuesBuilderImpl(
-        List<BACnetLifeSafetyStateTagged> alarmValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetLifeSafetyStateTagged> alarmValues) {
       this.alarmValues = alarmValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLifeSafetyZoneAlarmValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLifeSafetyZoneAlarmValues
           bACnetConstructedDataLifeSafetyZoneAlarmValues =
               new BACnetConstructedDataLifeSafetyZoneAlarmValues(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  alarmValues,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, alarmValues);
       return bACnetConstructedDataLifeSafetyZoneAlarmValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneAll.java
index fd975bbf4d4..46838ff50a3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLifeSafetyZoneAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLifeSafetyZoneAll");
     // Create the instance
-    return new BACnetConstructedDataLifeSafetyZoneAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLifeSafetyZoneAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataLifeSafetyZoneAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLifeSafetyZoneAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataLifeSafetyZoneAllBuilderImpl() {}
 
     public BACnetConstructedDataLifeSafetyZoneAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLifeSafetyZoneAll bACnetConstructedDataLifeSafetyZoneAll =
-          new BACnetConstructedDataLifeSafetyZoneAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLifeSafetyZoneAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataLifeSafetyZoneAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneFaultValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneFaultValues.java
index 71d9354a8a8..f68b8a6ad62 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneFaultValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneFaultValues.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetLifeSafetyStateTagged> faultValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLifeSafetyZoneFaultValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetLifeSafetyStateTagged> faultValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLifeSafetyStateTagged> faultValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultValues = faultValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetLifeSafetyStateTagged> getFaultValues() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLifeSafetyZoneFaultValues");
     // Create the instance
-    return new BACnetConstructedDataLifeSafetyZoneFaultValuesBuilderImpl(
-        faultValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLifeSafetyZoneFaultValuesBuilderImpl(faultValues);
   }
 
   public static class BACnetConstructedDataLifeSafetyZoneFaultValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetLifeSafetyStateTagged> faultValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLifeSafetyZoneFaultValuesBuilderImpl(
-        List<BACnetLifeSafetyStateTagged> faultValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetLifeSafetyStateTagged> faultValues) {
       this.faultValues = faultValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLifeSafetyZoneFaultValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLifeSafetyZoneFaultValues
           bACnetConstructedDataLifeSafetyZoneFaultValues =
               new BACnetConstructedDataLifeSafetyZoneFaultValues(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  faultValues,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, faultValues);
       return bACnetConstructedDataLifeSafetyZoneFaultValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneMaintenanceRequired.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneMaintenanceRequired.java
index 93fb08d2fe9..b99fb6e7902 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneMaintenanceRequired.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZoneMaintenanceRequired.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean maintenanceRequired;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLifeSafetyZoneMaintenanceRequired(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean maintenanceRequired,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean maintenanceRequired) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maintenanceRequired = maintenanceRequired;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getMaintenanceRequired() {
@@ -134,39 +126,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataLifeSafetyZoneMaintenanceRequired");
     // Create the instance
     return new BACnetConstructedDataLifeSafetyZoneMaintenanceRequiredBuilderImpl(
-        maintenanceRequired, tagNumber, arrayIndexArgument);
+        maintenanceRequired);
   }
 
   public static class BACnetConstructedDataLifeSafetyZoneMaintenanceRequiredBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean maintenanceRequired;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLifeSafetyZoneMaintenanceRequiredBuilderImpl(
-        BACnetApplicationTagBoolean maintenanceRequired,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean maintenanceRequired) {
       this.maintenanceRequired = maintenanceRequired;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLifeSafetyZoneMaintenanceRequired build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLifeSafetyZoneMaintenanceRequired
           bACnetConstructedDataLifeSafetyZoneMaintenanceRequired =
               new BACnetConstructedDataLifeSafetyZoneMaintenanceRequired(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  maintenanceRequired,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, maintenanceRequired);
       return bACnetConstructedDataLifeSafetyZoneMaintenanceRequired;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZonePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZonePresentValue.java
index 68e45c3a224..69b6a78c256 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZonePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLifeSafetyZonePresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLifeSafetyStateTagged presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLifeSafetyZonePresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLifeSafetyStateTagged presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLifeSafetyStateTagged presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLifeSafetyStateTagged getPresentValue() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLifeSafetyZonePresentValue");
     // Create the instance
-    return new BACnetConstructedDataLifeSafetyZonePresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLifeSafetyZonePresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataLifeSafetyZonePresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLifeSafetyStateTagged presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLifeSafetyZonePresentValueBuilderImpl(
-        BACnetLifeSafetyStateTagged presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetLifeSafetyStateTagged presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLifeSafetyZonePresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLifeSafetyZonePresentValue
           bACnetConstructedDataLifeSafetyZonePresentValue =
               new BACnetConstructedDataLifeSafetyZonePresentValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  presentValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataLifeSafetyZonePresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLiftAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLiftAll.java
index a21da0baa2c..1cd965b5605 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLiftAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLiftAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLiftAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLiftAll");
     // Create the instance
-    return new BACnetConstructedDataLiftAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLiftAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataLiftAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLiftAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataLiftAllBuilderImpl() {}
 
     public BACnetConstructedDataLiftAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLiftAll bACnetConstructedDataLiftAll =
-          new BACnetConstructedDataLiftAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLiftAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataLiftAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLiftFaultSignals.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLiftFaultSignals.java
index dbd147012ab..0c1e0a188ed 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLiftFaultSignals.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLiftFaultSignals.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetLiftFaultTagged> faultSignals;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLiftFaultSignals(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetLiftFaultTagged> faultSignals,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLiftFaultTagged> faultSignals) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultSignals = faultSignals;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetLiftFaultTagged> getFaultSignals() {
@@ -131,34 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLiftFaultSignals");
     // Create the instance
-    return new BACnetConstructedDataLiftFaultSignalsBuilderImpl(
-        faultSignals, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLiftFaultSignalsBuilderImpl(faultSignals);
   }
 
   public static class BACnetConstructedDataLiftFaultSignalsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetLiftFaultTagged> faultSignals;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLiftFaultSignalsBuilderImpl(
-        List<BACnetLiftFaultTagged> faultSignals,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetLiftFaultTagged> faultSignals) {
       this.faultSignals = faultSignals;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLiftFaultSignals build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLiftFaultSignals bACnetConstructedDataLiftFaultSignals =
           new BACnetConstructedDataLiftFaultSignals(
-              openingTag, peekedTagHeader, closingTag, faultSignals, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, faultSignals);
       return bACnetConstructedDataLiftFaultSignals;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingCommand.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingCommand.java
index 423cccab286..b32fdbb30f9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingCommand.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingCommand.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLightingCommand lightingCommand;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLightingCommand(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLightingCommand lightingCommand,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLightingCommand lightingCommand) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lightingCommand = lightingCommand;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLightingCommand getLightingCommand() {
@@ -130,39 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLightingCommand");
     // Create the instance
-    return new BACnetConstructedDataLightingCommandBuilderImpl(
-        lightingCommand, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLightingCommandBuilderImpl(lightingCommand);
   }
 
   public static class BACnetConstructedDataLightingCommandBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLightingCommand lightingCommand;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLightingCommandBuilderImpl(
-        BACnetLightingCommand lightingCommand,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLightingCommandBuilderImpl(BACnetLightingCommand lightingCommand) {
       this.lightingCommand = lightingCommand;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLightingCommand build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLightingCommand bACnetConstructedDataLightingCommand =
           new BACnetConstructedDataLightingCommand(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              lightingCommand,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lightingCommand);
       return bACnetConstructedDataLightingCommand;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingCommandDefaultPriority.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingCommandDefaultPriority.java
index 78263c94f12..9e964fb3dc6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingCommandDefaultPriority.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingCommandDefaultPriority.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger lightingCommandDefaultPriority;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLightingCommandDefaultPriority(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger lightingCommandDefaultPriority,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger lightingCommandDefaultPriority) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lightingCommandDefaultPriority = lightingCommandDefaultPriority;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getLightingCommandDefaultPriority() {
@@ -142,39 +134,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataLightingCommandDefaultPriority");
     // Create the instance
     return new BACnetConstructedDataLightingCommandDefaultPriorityBuilderImpl(
-        lightingCommandDefaultPriority, tagNumber, arrayIndexArgument);
+        lightingCommandDefaultPriority);
   }
 
   public static class BACnetConstructedDataLightingCommandDefaultPriorityBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger lightingCommandDefaultPriority;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLightingCommandDefaultPriorityBuilderImpl(
-        BACnetApplicationTagUnsignedInteger lightingCommandDefaultPriority,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger lightingCommandDefaultPriority) {
       this.lightingCommandDefaultPriority = lightingCommandDefaultPriority;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLightingCommandDefaultPriority build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLightingCommandDefaultPriority
           bACnetConstructedDataLightingCommandDefaultPriority =
               new BACnetConstructedDataLightingCommandDefaultPriority(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  lightingCommandDefaultPriority,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, lightingCommandDefaultPriority);
       return bACnetConstructedDataLightingCommandDefaultPriority;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputAll.java
index 502e770ed66..21575cf5038 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLightingOutputAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLightingOutputAll");
     // Create the instance
-    return new BACnetConstructedDataLightingOutputAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLightingOutputAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataLightingOutputAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLightingOutputAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataLightingOutputAllBuilderImpl() {}
 
     public BACnetConstructedDataLightingOutputAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLightingOutputAll bACnetConstructedDataLightingOutputAll =
-          new BACnetConstructedDataLightingOutputAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLightingOutputAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataLightingOutputAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputFeedbackValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputFeedbackValue.java
index 305e1c6933b..ae061cbcd56 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputFeedbackValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputFeedbackValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal feedbackValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLightingOutputFeedbackValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal feedbackValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal feedbackValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.feedbackValue = feedbackValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getFeedbackValue() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLightingOutputFeedbackValue");
     // Create the instance
-    return new BACnetConstructedDataLightingOutputFeedbackValueBuilderImpl(
-        feedbackValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLightingOutputFeedbackValueBuilderImpl(feedbackValue);
   }
 
   public static class BACnetConstructedDataLightingOutputFeedbackValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal feedbackValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLightingOutputFeedbackValueBuilderImpl(
-        BACnetApplicationTagReal feedbackValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal feedbackValue) {
       this.feedbackValue = feedbackValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLightingOutputFeedbackValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLightingOutputFeedbackValue
           bACnetConstructedDataLightingOutputFeedbackValue =
               new BACnetConstructedDataLightingOutputFeedbackValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  feedbackValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, feedbackValue);
       return bACnetConstructedDataLightingOutputFeedbackValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputPresentValue.java
index 11a88c11b68..e47e27b72ef 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLightingOutputPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getPresentValue() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLightingOutputPresentValue");
     // Create the instance
-    return new BACnetConstructedDataLightingOutputPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLightingOutputPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataLightingOutputPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLightingOutputPresentValueBuilderImpl(
-        BACnetApplicationTagReal presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLightingOutputPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLightingOutputPresentValue
           bACnetConstructedDataLightingOutputPresentValue =
               new BACnetConstructedDataLightingOutputPresentValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  presentValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataLightingOutputPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputRelinquishDefault.java
index 244c3b7482c..49c86759cee 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLightingOutputRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getRelinquishDefault() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLightingOutputRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataLightingOutputRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLightingOutputRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataLightingOutputRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLightingOutputRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagReal relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLightingOutputRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLightingOutputRelinquishDefault
           bACnetConstructedDataLightingOutputRelinquishDefault =
               new BACnetConstructedDataLightingOutputRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataLightingOutputRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputTrackingValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputTrackingValue.java
index 012c284afcf..b4058ae86fd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputTrackingValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLightingOutputTrackingValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal trackingValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLightingOutputTrackingValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal trackingValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal trackingValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.trackingValue = trackingValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getTrackingValue() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLightingOutputTrackingValue");
     // Create the instance
-    return new BACnetConstructedDataLightingOutputTrackingValueBuilderImpl(
-        trackingValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLightingOutputTrackingValueBuilderImpl(trackingValue);
   }
 
   public static class BACnetConstructedDataLightingOutputTrackingValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal trackingValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLightingOutputTrackingValueBuilderImpl(
-        BACnetApplicationTagReal trackingValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal trackingValue) {
       this.trackingValue = trackingValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLightingOutputTrackingValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLightingOutputTrackingValue
           bACnetConstructedDataLightingOutputTrackingValue =
               new BACnetConstructedDataLightingOutputTrackingValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  trackingValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, trackingValue);
       return bACnetConstructedDataLightingOutputTrackingValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLimitEnable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLimitEnable.java
index 655a58be9d7..4902a444e3c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLimitEnable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLimitEnable.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLimitEnableTagged limitEnable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLimitEnable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLimitEnableTagged limitEnable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLimitEnableTagged limitEnable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.limitEnable = limitEnable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLimitEnableTagged getLimitEnable() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLimitEnable");
     // Create the instance
-    return new BACnetConstructedDataLimitEnableBuilderImpl(
-        limitEnable, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLimitEnableBuilderImpl(limitEnable);
   }
 
   public static class BACnetConstructedDataLimitEnableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLimitEnableTagged limitEnable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLimitEnableBuilderImpl(
-        BACnetLimitEnableTagged limitEnable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLimitEnableBuilderImpl(BACnetLimitEnableTagged limitEnable) {
       this.limitEnable = limitEnable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLimitEnable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLimitEnable bACnetConstructedDataLimitEnable =
           new BACnetConstructedDataLimitEnable(
-              openingTag, peekedTagHeader, closingTag, limitEnable, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, limitEnable);
       return bACnetConstructedDataLimitEnable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLimitMonitoringInterval.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLimitMonitoringInterval.java
index 29a5a566223..3711b38ec11 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLimitMonitoringInterval.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLimitMonitoringInterval.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger limitMonitoringInterval;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLimitMonitoringInterval(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger limitMonitoringInterval,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger limitMonitoringInterval) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.limitMonitoringInterval = limitMonitoringInterval;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getLimitMonitoringInterval() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLimitMonitoringInterval");
     // Create the instance
-    return new BACnetConstructedDataLimitMonitoringIntervalBuilderImpl(
-        limitMonitoringInterval, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLimitMonitoringIntervalBuilderImpl(limitMonitoringInterval);
   }
 
   public static class BACnetConstructedDataLimitMonitoringIntervalBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger limitMonitoringInterval;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLimitMonitoringIntervalBuilderImpl(
-        BACnetApplicationTagUnsignedInteger limitMonitoringInterval,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger limitMonitoringInterval) {
       this.limitMonitoringInterval = limitMonitoringInterval;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLimitMonitoringInterval build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLimitMonitoringInterval bACnetConstructedDataLimitMonitoringInterval =
           new BACnetConstructedDataLimitMonitoringInterval(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              limitMonitoringInterval,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, limitMonitoringInterval);
       return bACnetConstructedDataLimitMonitoringInterval;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLinkSpeed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLinkSpeed.java
index 56322f80525..a03682e5492 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLinkSpeed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLinkSpeed.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal linkSpeed;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLinkSpeed(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal linkSpeed,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal linkSpeed) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.linkSpeed = linkSpeed;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getLinkSpeed() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLinkSpeed");
     // Create the instance
-    return new BACnetConstructedDataLinkSpeedBuilderImpl(linkSpeed, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLinkSpeedBuilderImpl(linkSpeed);
   }
 
   public static class BACnetConstructedDataLinkSpeedBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal linkSpeed;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLinkSpeedBuilderImpl(
-        BACnetApplicationTagReal linkSpeed,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLinkSpeedBuilderImpl(BACnetApplicationTagReal linkSpeed) {
       this.linkSpeed = linkSpeed;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLinkSpeed build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLinkSpeed bACnetConstructedDataLinkSpeed =
-          new BACnetConstructedDataLinkSpeed(
-              openingTag, peekedTagHeader, closingTag, linkSpeed, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLinkSpeed(openingTag, peekedTagHeader, closingTag, linkSpeed);
       return bACnetConstructedDataLinkSpeed;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLinkSpeedAutonegotiate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLinkSpeedAutonegotiate.java
index b3f8b7bcec8..c9cd8f0136a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLinkSpeedAutonegotiate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLinkSpeedAutonegotiate.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean linkSpeedAutonegotiate;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLinkSpeedAutonegotiate(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean linkSpeedAutonegotiate,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean linkSpeedAutonegotiate) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.linkSpeedAutonegotiate = linkSpeedAutonegotiate;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getLinkSpeedAutonegotiate() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLinkSpeedAutonegotiate");
     // Create the instance
-    return new BACnetConstructedDataLinkSpeedAutonegotiateBuilderImpl(
-        linkSpeedAutonegotiate, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLinkSpeedAutonegotiateBuilderImpl(linkSpeedAutonegotiate);
   }
 
   public static class BACnetConstructedDataLinkSpeedAutonegotiateBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean linkSpeedAutonegotiate;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLinkSpeedAutonegotiateBuilderImpl(
-        BACnetApplicationTagBoolean linkSpeedAutonegotiate,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean linkSpeedAutonegotiate) {
       this.linkSpeedAutonegotiate = linkSpeedAutonegotiate;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLinkSpeedAutonegotiate build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLinkSpeedAutonegotiate bACnetConstructedDataLinkSpeedAutonegotiate =
           new BACnetConstructedDataLinkSpeedAutonegotiate(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              linkSpeedAutonegotiate,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, linkSpeedAutonegotiate);
       return bACnetConstructedDataLinkSpeedAutonegotiate;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLinkSpeeds.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLinkSpeeds.java
index 96a9291a80f..7d331bed649 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLinkSpeeds.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLinkSpeeds.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagReal> linkSpeeds;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLinkSpeeds(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagReal> linkSpeeds,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagReal> linkSpeeds) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.linkSpeeds = linkSpeeds;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (linkSpeeds)
     writeComplexTypeArrayField("linkSpeeds", linkSpeeds, writeBuffer);
@@ -171,43 +159,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLinkSpeeds");
     // Create the instance
-    return new BACnetConstructedDataLinkSpeedsBuilderImpl(
-        numberOfDataElements, linkSpeeds, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLinkSpeedsBuilderImpl(numberOfDataElements, linkSpeeds);
   }
 
   public static class BACnetConstructedDataLinkSpeedsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagReal> linkSpeeds;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLinkSpeedsBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagReal> linkSpeeds,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagReal> linkSpeeds) {
       this.numberOfDataElements = numberOfDataElements;
       this.linkSpeeds = linkSpeeds;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLinkSpeeds build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLinkSpeeds bACnetConstructedDataLinkSpeeds =
           new BACnetConstructedDataLinkSpeeds(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              linkSpeeds,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, linkSpeeds);
       return bACnetConstructedDataLinkSpeeds;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataListOfGroupMembers.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataListOfGroupMembers.java
index 32030458843..b71c73795b4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataListOfGroupMembers.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataListOfGroupMembers.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetReadAccessSpecification> listOfGroupMembers;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataListOfGroupMembers(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetReadAccessSpecification> listOfGroupMembers,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetReadAccessSpecification> listOfGroupMembers) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.listOfGroupMembers = listOfGroupMembers;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetReadAccessSpecification> getListOfGroupMembers() {
@@ -127,39 +119,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataListOfGroupMembers");
     // Create the instance
-    return new BACnetConstructedDataListOfGroupMembersBuilderImpl(
-        listOfGroupMembers, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataListOfGroupMembersBuilderImpl(listOfGroupMembers);
   }
 
   public static class BACnetConstructedDataListOfGroupMembersBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetReadAccessSpecification> listOfGroupMembers;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataListOfGroupMembersBuilderImpl(
-        List<BACnetReadAccessSpecification> listOfGroupMembers,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetReadAccessSpecification> listOfGroupMembers) {
       this.listOfGroupMembers = listOfGroupMembers;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataListOfGroupMembers build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataListOfGroupMembers bACnetConstructedDataListOfGroupMembers =
           new BACnetConstructedDataListOfGroupMembers(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              listOfGroupMembers,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, listOfGroupMembers);
       return bACnetConstructedDataListOfGroupMembers;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataListOfObjectPropertyReferences.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataListOfObjectPropertyReferences.java
index 218009f8581..406e9d41876 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataListOfObjectPropertyReferences.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataListOfObjectPropertyReferences.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetDeviceObjectPropertyReference> references;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataListOfObjectPropertyReferences(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetDeviceObjectPropertyReference> references,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDeviceObjectPropertyReference> references) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.references = references;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetDeviceObjectPropertyReference> getReferences() {
@@ -128,40 +120,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataListOfObjectPropertyReferences");
     // Create the instance
-    return new BACnetConstructedDataListOfObjectPropertyReferencesBuilderImpl(
-        references, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataListOfObjectPropertyReferencesBuilderImpl(references);
   }
 
   public static class BACnetConstructedDataListOfObjectPropertyReferencesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetDeviceObjectPropertyReference> references;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataListOfObjectPropertyReferencesBuilderImpl(
-        List<BACnetDeviceObjectPropertyReference> references,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDeviceObjectPropertyReference> references) {
       this.references = references;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataListOfObjectPropertyReferences build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataListOfObjectPropertyReferences
           bACnetConstructedDataListOfObjectPropertyReferences =
               new BACnetConstructedDataListOfObjectPropertyReferences(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  references,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, references);
       return bACnetConstructedDataListOfObjectPropertyReferences;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoadControlAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoadControlAll.java
index 21079fcfc20..b11db2ffca6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoadControlAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoadControlAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLoadControlAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLoadControlAll");
     // Create the instance
-    return new BACnetConstructedDataLoadControlAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLoadControlAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataLoadControlAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLoadControlAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataLoadControlAllBuilderImpl() {}
 
     public BACnetConstructedDataLoadControlAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLoadControlAll bACnetConstructedDataLoadControlAll =
-          new BACnetConstructedDataLoadControlAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLoadControlAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataLoadControlAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoadControlPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoadControlPresentValue.java
index 68db411cd44..b8b42f5eaee 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoadControlPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoadControlPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetShedStateTagged presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLoadControlPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetShedStateTagged presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetShedStateTagged presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetShedStateTagged getPresentValue() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLoadControlPresentValue");
     // Create the instance
-    return new BACnetConstructedDataLoadControlPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLoadControlPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataLoadControlPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetShedStateTagged presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLoadControlPresentValueBuilderImpl(
-        BACnetShedStateTagged presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetShedStateTagged presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLoadControlPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLoadControlPresentValue bACnetConstructedDataLoadControlPresentValue =
           new BACnetConstructedDataLoadControlPresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataLoadControlPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocalDate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocalDate.java
index 2c1786c4543..153ace44986 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocalDate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocalDate.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagDate localDate;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLocalDate(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDate localDate,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagDate localDate) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.localDate = localDate;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagDate getLocalDate() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLocalDate");
     // Create the instance
-    return new BACnetConstructedDataLocalDateBuilderImpl(localDate, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLocalDateBuilderImpl(localDate);
   }
 
   public static class BACnetConstructedDataLocalDateBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagDate localDate;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLocalDateBuilderImpl(
-        BACnetApplicationTagDate localDate,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLocalDateBuilderImpl(BACnetApplicationTagDate localDate) {
       this.localDate = localDate;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLocalDate build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLocalDate bACnetConstructedDataLocalDate =
-          new BACnetConstructedDataLocalDate(
-              openingTag, peekedTagHeader, closingTag, localDate, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLocalDate(openingTag, peekedTagHeader, closingTag, localDate);
       return bACnetConstructedDataLocalDate;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocalForwardingOnly.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocalForwardingOnly.java
index 3c8b16dfadb..2bc4366016b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocalForwardingOnly.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocalForwardingOnly.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean localForwardingOnly;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLocalForwardingOnly(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean localForwardingOnly,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean localForwardingOnly) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.localForwardingOnly = localForwardingOnly;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getLocalForwardingOnly() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLocalForwardingOnly");
     // Create the instance
-    return new BACnetConstructedDataLocalForwardingOnlyBuilderImpl(
-        localForwardingOnly, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLocalForwardingOnlyBuilderImpl(localForwardingOnly);
   }
 
   public static class BACnetConstructedDataLocalForwardingOnlyBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean localForwardingOnly;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLocalForwardingOnlyBuilderImpl(
-        BACnetApplicationTagBoolean localForwardingOnly,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean localForwardingOnly) {
       this.localForwardingOnly = localForwardingOnly;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLocalForwardingOnly build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLocalForwardingOnly bACnetConstructedDataLocalForwardingOnly =
           new BACnetConstructedDataLocalForwardingOnly(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              localForwardingOnly,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, localForwardingOnly);
       return bACnetConstructedDataLocalForwardingOnly;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocalTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocalTime.java
index ac34f74c6fb..6bca8be2723 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocalTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocalTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagTime localTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLocalTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagTime localTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagTime localTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.localTime = localTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagTime getLocalTime() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLocalTime");
     // Create the instance
-    return new BACnetConstructedDataLocalTimeBuilderImpl(localTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLocalTimeBuilderImpl(localTime);
   }
 
   public static class BACnetConstructedDataLocalTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagTime localTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLocalTimeBuilderImpl(
-        BACnetApplicationTagTime localTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLocalTimeBuilderImpl(BACnetApplicationTagTime localTime) {
       this.localTime = localTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLocalTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLocalTime bACnetConstructedDataLocalTime =
-          new BACnetConstructedDataLocalTime(
-              openingTag, peekedTagHeader, closingTag, localTime, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLocalTime(openingTag, peekedTagHeader, closingTag, localTime);
       return bACnetConstructedDataLocalTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocation.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocation.java
index 413ec7b87aa..4bf06b05e6f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocation.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLocation.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString location;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLocation(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString location,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString location) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.location = location;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getLocation() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLocation");
     // Create the instance
-    return new BACnetConstructedDataLocationBuilderImpl(location, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLocationBuilderImpl(location);
   }
 
   public static class BACnetConstructedDataLocationBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString location;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLocationBuilderImpl(
-        BACnetApplicationTagCharacterString location,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLocationBuilderImpl(BACnetApplicationTagCharacterString location) {
       this.location = location;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLocation build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLocation bACnetConstructedDataLocation =
-          new BACnetConstructedDataLocation(
-              openingTag, peekedTagHeader, closingTag, location, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLocation(openingTag, peekedTagHeader, closingTag, location);
       return bACnetConstructedDataLocation;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLockStatus.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLockStatus.java
index 88597aa908b..3a62339f703 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLockStatus.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLockStatus.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLockStatusTagged lockStatus;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLockStatus(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLockStatusTagged lockStatus,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLockStatusTagged lockStatus) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lockStatus = lockStatus;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLockStatusTagged getLockStatus() {
@@ -134,34 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLockStatus");
     // Create the instance
-    return new BACnetConstructedDataLockStatusBuilderImpl(
-        lockStatus, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLockStatusBuilderImpl(lockStatus);
   }
 
   public static class BACnetConstructedDataLockStatusBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLockStatusTagged lockStatus;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLockStatusBuilderImpl(
-        BACnetLockStatusTagged lockStatus,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLockStatusBuilderImpl(BACnetLockStatusTagged lockStatus) {
       this.lockStatus = lockStatus;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLockStatus build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLockStatus bACnetConstructedDataLockStatus =
-          new BACnetConstructedDataLockStatus(
-              openingTag, peekedTagHeader, closingTag, lockStatus, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLockStatus(openingTag, peekedTagHeader, closingTag, lockStatus);
       return bACnetConstructedDataLockStatus;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLockout.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLockout.java
index 6dfc1753603..60370d68b6a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLockout.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLockout.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean lockout;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLockout(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean lockout,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean lockout) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lockout = lockout;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getLockout() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLockout");
     // Create the instance
-    return new BACnetConstructedDataLockoutBuilderImpl(lockout, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLockoutBuilderImpl(lockout);
   }
 
   public static class BACnetConstructedDataLockoutBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean lockout;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLockoutBuilderImpl(
-        BACnetApplicationTagBoolean lockout,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLockoutBuilderImpl(BACnetApplicationTagBoolean lockout) {
       this.lockout = lockout;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLockout build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLockout bACnetConstructedDataLockout =
-          new BACnetConstructedDataLockout(
-              openingTag, peekedTagHeader, closingTag, lockout, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLockout(openingTag, peekedTagHeader, closingTag, lockout);
       return bACnetConstructedDataLockout;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLockoutRelinquishTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLockoutRelinquishTime.java
index 03f459dd920..d022b4d1a39 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLockoutRelinquishTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLockoutRelinquishTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger lockoutRelinquishTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLockoutRelinquishTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger lockoutRelinquishTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger lockoutRelinquishTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lockoutRelinquishTime = lockoutRelinquishTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getLockoutRelinquishTime() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLockoutRelinquishTime");
     // Create the instance
-    return new BACnetConstructedDataLockoutRelinquishTimeBuilderImpl(
-        lockoutRelinquishTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLockoutRelinquishTimeBuilderImpl(lockoutRelinquishTime);
   }
 
   public static class BACnetConstructedDataLockoutRelinquishTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger lockoutRelinquishTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLockoutRelinquishTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger lockoutRelinquishTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger lockoutRelinquishTime) {
       this.lockoutRelinquishTime = lockoutRelinquishTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLockoutRelinquishTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLockoutRelinquishTime bACnetConstructedDataLockoutRelinquishTime =
           new BACnetConstructedDataLockoutRelinquishTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              lockoutRelinquishTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lockoutRelinquishTime);
       return bACnetConstructedDataLockoutRelinquishTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLogBuffer.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLogBuffer.java
index 0c1dcd348a3..cf31feb1fcb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLogBuffer.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLogBuffer.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetLogRecord> floorText;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLogBuffer(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetLogRecord> floorText,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLogRecord> floorText) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.floorText = floorText;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (floorText)
     writeComplexTypeArrayField("floorText", floorText, writeBuffer);
@@ -169,43 +157,25 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLogBuffer");
     // Create the instance
-    return new BACnetConstructedDataLogBufferBuilderImpl(
-        numberOfDataElements, floorText, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLogBufferBuilderImpl(numberOfDataElements, floorText);
   }
 
   public static class BACnetConstructedDataLogBufferBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetLogRecord> floorText;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLogBufferBuilderImpl(
-        BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetLogRecord> floorText,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger numberOfDataElements, List<BACnetLogRecord> floorText) {
       this.numberOfDataElements = numberOfDataElements;
       this.floorText = floorText;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLogBuffer build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLogBuffer bACnetConstructedDataLogBuffer =
           new BACnetConstructedDataLogBuffer(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              floorText,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, floorText);
       return bACnetConstructedDataLogBuffer;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLogDeviceObjectProperty.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLogDeviceObjectProperty.java
index d12135d255e..51440370fcb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLogDeviceObjectProperty.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLogDeviceObjectProperty.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDeviceObjectPropertyReference logDeviceObjectProperty;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLogDeviceObjectProperty(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDeviceObjectPropertyReference logDeviceObjectProperty,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDeviceObjectPropertyReference logDeviceObjectProperty) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.logDeviceObjectProperty = logDeviceObjectProperty;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDeviceObjectPropertyReference getLogDeviceObjectProperty() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLogDeviceObjectProperty");
     // Create the instance
-    return new BACnetConstructedDataLogDeviceObjectPropertyBuilderImpl(
-        logDeviceObjectProperty, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLogDeviceObjectPropertyBuilderImpl(logDeviceObjectProperty);
   }
 
   public static class BACnetConstructedDataLogDeviceObjectPropertyBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDeviceObjectPropertyReference logDeviceObjectProperty;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLogDeviceObjectPropertyBuilderImpl(
-        BACnetDeviceObjectPropertyReference logDeviceObjectProperty,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDeviceObjectPropertyReference logDeviceObjectProperty) {
       this.logDeviceObjectProperty = logDeviceObjectProperty;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLogDeviceObjectProperty build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLogDeviceObjectProperty bACnetConstructedDataLogDeviceObjectProperty =
           new BACnetConstructedDataLogDeviceObjectProperty(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              logDeviceObjectProperty,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, logDeviceObjectProperty);
       return bACnetConstructedDataLogDeviceObjectProperty;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLogInterval.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLogInterval.java
index 709888d85ad..c6ae4146560 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLogInterval.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLogInterval.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger logInterval;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLogInterval(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger logInterval,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger logInterval) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.logInterval = logInterval;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getLogInterval() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLogInterval");
     // Create the instance
-    return new BACnetConstructedDataLogIntervalBuilderImpl(
-        logInterval, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLogIntervalBuilderImpl(logInterval);
   }
 
   public static class BACnetConstructedDataLogIntervalBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger logInterval;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLogIntervalBuilderImpl(
-        BACnetApplicationTagUnsignedInteger logInterval,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger logInterval) {
       this.logInterval = logInterval;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLogInterval build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLogInterval bACnetConstructedDataLogInterval =
           new BACnetConstructedDataLogInterval(
-              openingTag, peekedTagHeader, closingTag, logInterval, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, logInterval);
       return bACnetConstructedDataLogInterval;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoggingObject.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoggingObject.java
index cc1ec30d4aa..9d2a894725b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoggingObject.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoggingObject.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagObjectIdentifier loggingObject;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLoggingObject(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagObjectIdentifier loggingObject,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagObjectIdentifier loggingObject) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.loggingObject = loggingObject;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagObjectIdentifier getLoggingObject() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLoggingObject");
     // Create the instance
-    return new BACnetConstructedDataLoggingObjectBuilderImpl(
-        loggingObject, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLoggingObjectBuilderImpl(loggingObject);
   }
 
   public static class BACnetConstructedDataLoggingObjectBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagObjectIdentifier loggingObject;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLoggingObjectBuilderImpl(
-        BACnetApplicationTagObjectIdentifier loggingObject,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagObjectIdentifier loggingObject) {
       this.loggingObject = loggingObject;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLoggingObject build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLoggingObject bACnetConstructedDataLoggingObject =
           new BACnetConstructedDataLoggingObject(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              loggingObject,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, loggingObject);
       return bACnetConstructedDataLoggingObject;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoggingRecord.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoggingRecord.java
index 91ea5d701be..6562cb777f0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoggingRecord.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoggingRecord.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetAccumulatorRecord loggingRecord;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLoggingRecord(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetAccumulatorRecord loggingRecord,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetAccumulatorRecord loggingRecord) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.loggingRecord = loggingRecord;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetAccumulatorRecord getLoggingRecord() {
@@ -130,39 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLoggingRecord");
     // Create the instance
-    return new BACnetConstructedDataLoggingRecordBuilderImpl(
-        loggingRecord, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLoggingRecordBuilderImpl(loggingRecord);
   }
 
   public static class BACnetConstructedDataLoggingRecordBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetAccumulatorRecord loggingRecord;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLoggingRecordBuilderImpl(
-        BACnetAccumulatorRecord loggingRecord,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLoggingRecordBuilderImpl(BACnetAccumulatorRecord loggingRecord) {
       this.loggingRecord = loggingRecord;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLoggingRecord build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLoggingRecord bACnetConstructedDataLoggingRecord =
           new BACnetConstructedDataLoggingRecord(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              loggingRecord,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, loggingRecord);
       return bACnetConstructedDataLoggingRecord;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoggingType.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoggingType.java
index 5833b5c1fb8..288a00f2da3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoggingType.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoggingType.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLoggingTypeTagged loggingType;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLoggingType(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLoggingTypeTagged loggingType,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLoggingTypeTagged loggingType) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.loggingType = loggingType;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLoggingTypeTagged getLoggingType() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLoggingType");
     // Create the instance
-    return new BACnetConstructedDataLoggingTypeBuilderImpl(
-        loggingType, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLoggingTypeBuilderImpl(loggingType);
   }
 
   public static class BACnetConstructedDataLoggingTypeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLoggingTypeTagged loggingType;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLoggingTypeBuilderImpl(
-        BACnetLoggingTypeTagged loggingType,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLoggingTypeBuilderImpl(BACnetLoggingTypeTagged loggingType) {
       this.loggingType = loggingType;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLoggingType build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLoggingType bACnetConstructedDataLoggingType =
           new BACnetConstructedDataLoggingType(
-              openingTag, peekedTagHeader, closingTag, loggingType, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, loggingType);
       return bACnetConstructedDataLoggingType;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoopAction.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoopAction.java
index e634b9f1e4b..0ef48db9f2a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoopAction.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoopAction.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetActionTagged action;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLoopAction(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetActionTagged action,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetActionTagged action) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.action = action;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetActionTagged getAction() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLoopAction");
     // Create the instance
-    return new BACnetConstructedDataLoopActionBuilderImpl(action, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLoopActionBuilderImpl(action);
   }
 
   public static class BACnetConstructedDataLoopActionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetActionTagged action;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLoopActionBuilderImpl(
-        BACnetActionTagged action,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLoopActionBuilderImpl(BACnetActionTagged action) {
       this.action = action;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLoopAction build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLoopAction bACnetConstructedDataLoopAction =
-          new BACnetConstructedDataLoopAction(
-              openingTag, peekedTagHeader, closingTag, action, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLoopAction(openingTag, peekedTagHeader, closingTag, action);
       return bACnetConstructedDataLoopAction;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoopAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoopAll.java
index f224e6a19c6..51ad8cae57e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoopAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoopAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLoopAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLoopAll");
     // Create the instance
-    return new BACnetConstructedDataLoopAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLoopAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataLoopAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLoopAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataLoopAllBuilderImpl() {}
 
     public BACnetConstructedDataLoopAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLoopAll bACnetConstructedDataLoopAll =
-          new BACnetConstructedDataLoopAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLoopAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataLoopAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoopPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoopPresentValue.java
index 98ab0dbf5cc..90ac4103604 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoopPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLoopPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLoopPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getPresentValue() {
@@ -133,34 +125,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLoopPresentValue");
     // Create the instance
-    return new BACnetConstructedDataLoopPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLoopPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataLoopPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLoopPresentValueBuilderImpl(
-        BACnetApplicationTagReal presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLoopPresentValueBuilderImpl(BACnetApplicationTagReal presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLoopPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLoopPresentValue bACnetConstructedDataLoopPresentValue =
           new BACnetConstructedDataLoopPresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataLoopPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLowDiffLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLowDiffLimit.java
index 4818528662c..34ff2c2a420 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLowDiffLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLowDiffLimit.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetOptionalREAL lowDiffLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLowDiffLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetOptionalREAL lowDiffLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetOptionalREAL lowDiffLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lowDiffLimit = lowDiffLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetOptionalREAL getLowDiffLimit() {
@@ -130,34 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLowDiffLimit");
     // Create the instance
-    return new BACnetConstructedDataLowDiffLimitBuilderImpl(
-        lowDiffLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLowDiffLimitBuilderImpl(lowDiffLimit);
   }
 
   public static class BACnetConstructedDataLowDiffLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetOptionalREAL lowDiffLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLowDiffLimitBuilderImpl(
-        BACnetOptionalREAL lowDiffLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLowDiffLimitBuilderImpl(BACnetOptionalREAL lowDiffLimit) {
       this.lowDiffLimit = lowDiffLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLowDiffLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLowDiffLimit bACnetConstructedDataLowDiffLimit =
           new BACnetConstructedDataLowDiffLimit(
-              openingTag, peekedTagHeader, closingTag, lowDiffLimit, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lowDiffLimit);
       return bACnetConstructedDataLowDiffLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLowLimit.java
index ad196ce3f76..ef6ee90589f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLowLimit.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal lowLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLowLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal lowLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal lowLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lowLimit = lowLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getLowLimit() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLowLimit");
     // Create the instance
-    return new BACnetConstructedDataLowLimitBuilderImpl(lowLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLowLimitBuilderImpl(lowLimit);
   }
 
   public static class BACnetConstructedDataLowLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal lowLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataLowLimitBuilderImpl(
-        BACnetApplicationTagReal lowLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataLowLimitBuilderImpl(BACnetApplicationTagReal lowLimit) {
       this.lowLimit = lowLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLowLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLowLimit bACnetConstructedDataLowLimit =
-          new BACnetConstructedDataLowLimit(
-              openingTag, peekedTagHeader, closingTag, lowLimit, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLowLimit(openingTag, peekedTagHeader, closingTag, lowLimit);
       return bACnetConstructedDataLowLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLowerDeck.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLowerDeck.java
index a7b6faabc73..4c8d93641f8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLowerDeck.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataLowerDeck.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagObjectIdentifier lowerDeck;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataLowerDeck(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagObjectIdentifier lowerDeck,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagObjectIdentifier lowerDeck) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lowerDeck = lowerDeck;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagObjectIdentifier getLowerDeck() {
@@ -134,33 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataLowerDeck");
     // Create the instance
-    return new BACnetConstructedDataLowerDeckBuilderImpl(lowerDeck, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataLowerDeckBuilderImpl(lowerDeck);
   }
 
   public static class BACnetConstructedDataLowerDeckBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagObjectIdentifier lowerDeck;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataLowerDeckBuilderImpl(
-        BACnetApplicationTagObjectIdentifier lowerDeck,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagObjectIdentifier lowerDeck) {
       this.lowerDeck = lowerDeck;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataLowerDeck build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataLowerDeck bACnetConstructedDataLowerDeck =
-          new BACnetConstructedDataLowerDeck(
-              openingTag, peekedTagHeader, closingTag, lowerDeck, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataLowerDeck(openingTag, peekedTagHeader, closingTag, lowerDeck);
       return bACnetConstructedDataLowerDeck;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMACAddress.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMACAddress.java
index 78d65898da5..03064934992 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMACAddress.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMACAddress.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagOctetString macAddress;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMACAddress(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagOctetString macAddress,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagOctetString macAddress) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.macAddress = macAddress;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagOctetString getMacAddress() {
@@ -133,34 +125,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMACAddress");
     // Create the instance
-    return new BACnetConstructedDataMACAddressBuilderImpl(
-        macAddress, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMACAddressBuilderImpl(macAddress);
   }
 
   public static class BACnetConstructedDataMACAddressBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagOctetString macAddress;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMACAddressBuilderImpl(
-        BACnetApplicationTagOctetString macAddress,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataMACAddressBuilderImpl(BACnetApplicationTagOctetString macAddress) {
       this.macAddress = macAddress;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMACAddress build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMACAddress bACnetConstructedDataMACAddress =
-          new BACnetConstructedDataMACAddress(
-              openingTag, peekedTagHeader, closingTag, macAddress, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataMACAddress(openingTag, peekedTagHeader, closingTag, macAddress);
       return bACnetConstructedDataMACAddress;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMachineRoomID.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMachineRoomID.java
index 010b7f8cece..36f058d6eb8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMachineRoomID.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMachineRoomID.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagObjectIdentifier machineRoomId;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMachineRoomID(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagObjectIdentifier machineRoomId,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagObjectIdentifier machineRoomId) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.machineRoomId = machineRoomId;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagObjectIdentifier getMachineRoomId() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMachineRoomID");
     // Create the instance
-    return new BACnetConstructedDataMachineRoomIDBuilderImpl(
-        machineRoomId, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMachineRoomIDBuilderImpl(machineRoomId);
   }
 
   public static class BACnetConstructedDataMachineRoomIDBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagObjectIdentifier machineRoomId;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMachineRoomIDBuilderImpl(
-        BACnetApplicationTagObjectIdentifier machineRoomId,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagObjectIdentifier machineRoomId) {
       this.machineRoomId = machineRoomId;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMachineRoomID build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMachineRoomID bACnetConstructedDataMachineRoomID =
           new BACnetConstructedDataMachineRoomID(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              machineRoomId,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, machineRoomId);
       return bACnetConstructedDataMachineRoomID;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaintenanceRequired.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaintenanceRequired.java
index c3ddf61f8b1..a4298d3b507 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaintenanceRequired.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaintenanceRequired.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetMaintenanceTagged maintenanceRequired;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMaintenanceRequired(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetMaintenanceTagged maintenanceRequired,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetMaintenanceTagged maintenanceRequired) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maintenanceRequired = maintenanceRequired;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetMaintenanceTagged getMaintenanceRequired() {
@@ -135,39 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMaintenanceRequired");
     // Create the instance
-    return new BACnetConstructedDataMaintenanceRequiredBuilderImpl(
-        maintenanceRequired, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMaintenanceRequiredBuilderImpl(maintenanceRequired);
   }
 
   public static class BACnetConstructedDataMaintenanceRequiredBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetMaintenanceTagged maintenanceRequired;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMaintenanceRequiredBuilderImpl(
-        BACnetMaintenanceTagged maintenanceRequired,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetMaintenanceTagged maintenanceRequired) {
       this.maintenanceRequired = maintenanceRequired;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMaintenanceRequired build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMaintenanceRequired bACnetConstructedDataMaintenanceRequired =
           new BACnetConstructedDataMaintenanceRequired(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              maintenanceRequired,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maintenanceRequired);
       return bACnetConstructedDataMaintenanceRequired;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMakingCarCall.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMakingCarCall.java
index 96c28099141..350e9707b0b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMakingCarCall.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMakingCarCall.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagUnsignedInteger> makingCarCall;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMakingCarCall(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagUnsignedInteger> makingCarCall,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagUnsignedInteger> makingCarCall) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.makingCarCall = makingCarCall;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (makingCarCall)
     writeComplexTypeArrayField("makingCarCall", makingCarCall, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMakingCarCall");
     // Create the instance
-    return new BACnetConstructedDataMakingCarCallBuilderImpl(
-        numberOfDataElements, makingCarCall, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMakingCarCallBuilderImpl(numberOfDataElements, makingCarCall);
   }
 
   public static class BACnetConstructedDataMakingCarCallBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagUnsignedInteger> makingCarCall;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMakingCarCallBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagUnsignedInteger> makingCarCall,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagUnsignedInteger> makingCarCall) {
       this.numberOfDataElements = numberOfDataElements;
       this.makingCarCall = makingCarCall;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMakingCarCall build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMakingCarCall bACnetConstructedDataMakingCarCall =
           new BACnetConstructedDataMakingCarCall(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              makingCarCall,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, makingCarCall);
       return bACnetConstructedDataMakingCarCall;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataManipulatedVariableReference.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataManipulatedVariableReference.java
index a4a7021cf56..e39b1710cad 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataManipulatedVariableReference.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataManipulatedVariableReference.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetObjectPropertyReference manipulatedVariableReference;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataManipulatedVariableReference(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetObjectPropertyReference manipulatedVariableReference,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetObjectPropertyReference manipulatedVariableReference) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.manipulatedVariableReference = manipulatedVariableReference;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetObjectPropertyReference getManipulatedVariableReference() {
@@ -134,39 +126,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataManipulatedVariableReference");
     // Create the instance
     return new BACnetConstructedDataManipulatedVariableReferenceBuilderImpl(
-        manipulatedVariableReference, tagNumber, arrayIndexArgument);
+        manipulatedVariableReference);
   }
 
   public static class BACnetConstructedDataManipulatedVariableReferenceBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetObjectPropertyReference manipulatedVariableReference;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataManipulatedVariableReferenceBuilderImpl(
-        BACnetObjectPropertyReference manipulatedVariableReference,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetObjectPropertyReference manipulatedVariableReference) {
       this.manipulatedVariableReference = manipulatedVariableReference;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataManipulatedVariableReference build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataManipulatedVariableReference
           bACnetConstructedDataManipulatedVariableReference =
               new BACnetConstructedDataManipulatedVariableReference(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  manipulatedVariableReference,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, manipulatedVariableReference);
       return bACnetConstructedDataManipulatedVariableReference;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataManualSlaveAddressBinding.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataManualSlaveAddressBinding.java
index fcf3d549ce1..8b1b6ac7f13 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataManualSlaveAddressBinding.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataManualSlaveAddressBinding.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetAddressBinding> manualSlaveAddressBinding;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataManualSlaveAddressBinding(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetAddressBinding> manualSlaveAddressBinding,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetAddressBinding> manualSlaveAddressBinding) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.manualSlaveAddressBinding = manualSlaveAddressBinding;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetAddressBinding> getManualSlaveAddressBinding() {
@@ -127,40 +119,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataManualSlaveAddressBinding");
     // Create the instance
-    return new BACnetConstructedDataManualSlaveAddressBindingBuilderImpl(
-        manualSlaveAddressBinding, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataManualSlaveAddressBindingBuilderImpl(manualSlaveAddressBinding);
   }
 
   public static class BACnetConstructedDataManualSlaveAddressBindingBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetAddressBinding> manualSlaveAddressBinding;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataManualSlaveAddressBindingBuilderImpl(
-        List<BACnetAddressBinding> manualSlaveAddressBinding,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetAddressBinding> manualSlaveAddressBinding) {
       this.manualSlaveAddressBinding = manualSlaveAddressBinding;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataManualSlaveAddressBinding build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataManualSlaveAddressBinding
           bACnetConstructedDataManualSlaveAddressBinding =
               new BACnetConstructedDataManualSlaveAddressBinding(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  manualSlaveAddressBinding,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, manualSlaveAddressBinding);
       return bACnetConstructedDataManualSlaveAddressBinding;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaskedAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaskedAlarmValues.java
index 606450f6bd8..fb3c911edee 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaskedAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaskedAlarmValues.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetDoorAlarmStateTagged> maskedAlarmValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMaskedAlarmValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetDoorAlarmStateTagged> maskedAlarmValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDoorAlarmStateTagged> maskedAlarmValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maskedAlarmValues = maskedAlarmValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetDoorAlarmStateTagged> getMaskedAlarmValues() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMaskedAlarmValues");
     // Create the instance
-    return new BACnetConstructedDataMaskedAlarmValuesBuilderImpl(
-        maskedAlarmValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMaskedAlarmValuesBuilderImpl(maskedAlarmValues);
   }
 
   public static class BACnetConstructedDataMaskedAlarmValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetDoorAlarmStateTagged> maskedAlarmValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMaskedAlarmValuesBuilderImpl(
-        List<BACnetDoorAlarmStateTagged> maskedAlarmValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDoorAlarmStateTagged> maskedAlarmValues) {
       this.maskedAlarmValues = maskedAlarmValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMaskedAlarmValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMaskedAlarmValues bACnetConstructedDataMaskedAlarmValues =
           new BACnetConstructedDataMaskedAlarmValues(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              maskedAlarmValues,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maskedAlarmValues);
       return bACnetConstructedDataMaskedAlarmValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxAPDULengthAccepted.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxAPDULengthAccepted.java
index 7d7caef50d2..0e9aa9d9419 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxAPDULengthAccepted.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxAPDULengthAccepted.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger maxApduLengthAccepted;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMaxAPDULengthAccepted(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger maxApduLengthAccepted,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger maxApduLengthAccepted) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxApduLengthAccepted = maxApduLengthAccepted;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMaxApduLengthAccepted() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMaxAPDULengthAccepted");
     // Create the instance
-    return new BACnetConstructedDataMaxAPDULengthAcceptedBuilderImpl(
-        maxApduLengthAccepted, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMaxAPDULengthAcceptedBuilderImpl(maxApduLengthAccepted);
   }
 
   public static class BACnetConstructedDataMaxAPDULengthAcceptedBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger maxApduLengthAccepted;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMaxAPDULengthAcceptedBuilderImpl(
-        BACnetApplicationTagUnsignedInteger maxApduLengthAccepted,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger maxApduLengthAccepted) {
       this.maxApduLengthAccepted = maxApduLengthAccepted;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMaxAPDULengthAccepted build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMaxAPDULengthAccepted bACnetConstructedDataMaxAPDULengthAccepted =
           new BACnetConstructedDataMaxAPDULengthAccepted(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              maxApduLengthAccepted,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxApduLengthAccepted);
       return bACnetConstructedDataMaxAPDULengthAccepted;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxActualValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxActualValue.java
index d5e3413fc00..f88b9d05441 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxActualValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxActualValue.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal maxActualValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMaxActualValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal maxActualValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal maxActualValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxActualValue = maxActualValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getMaxActualValue() {
@@ -132,39 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMaxActualValue");
     // Create the instance
-    return new BACnetConstructedDataMaxActualValueBuilderImpl(
-        maxActualValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMaxActualValueBuilderImpl(maxActualValue);
   }
 
   public static class BACnetConstructedDataMaxActualValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal maxActualValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMaxActualValueBuilderImpl(
-        BACnetApplicationTagReal maxActualValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataMaxActualValueBuilderImpl(BACnetApplicationTagReal maxActualValue) {
       this.maxActualValue = maxActualValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMaxActualValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMaxActualValue bACnetConstructedDataMaxActualValue =
           new BACnetConstructedDataMaxActualValue(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              maxActualValue,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxActualValue);
       return bACnetConstructedDataMaxActualValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxFailedAttempts.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxFailedAttempts.java
index b63c5aa0b08..be167fe2a36 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxFailedAttempts.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxFailedAttempts.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger maxFailedAttempts;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMaxFailedAttempts(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger maxFailedAttempts,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger maxFailedAttempts) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxFailedAttempts = maxFailedAttempts;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMaxFailedAttempts() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMaxFailedAttempts");
     // Create the instance
-    return new BACnetConstructedDataMaxFailedAttemptsBuilderImpl(
-        maxFailedAttempts, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMaxFailedAttemptsBuilderImpl(maxFailedAttempts);
   }
 
   public static class BACnetConstructedDataMaxFailedAttemptsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger maxFailedAttempts;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMaxFailedAttemptsBuilderImpl(
-        BACnetApplicationTagUnsignedInteger maxFailedAttempts,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger maxFailedAttempts) {
       this.maxFailedAttempts = maxFailedAttempts;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMaxFailedAttempts build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMaxFailedAttempts bACnetConstructedDataMaxFailedAttempts =
           new BACnetConstructedDataMaxFailedAttempts(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              maxFailedAttempts,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxFailedAttempts);
       return bACnetConstructedDataMaxFailedAttempts;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxInfoFrames.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxInfoFrames.java
index c6ade0435c2..2c9031d0adc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxInfoFrames.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxInfoFrames.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger maxInfoFrames;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMaxInfoFrames(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger maxInfoFrames,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger maxInfoFrames) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxInfoFrames = maxInfoFrames;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMaxInfoFrames() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMaxInfoFrames");
     // Create the instance
-    return new BACnetConstructedDataMaxInfoFramesBuilderImpl(
-        maxInfoFrames, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMaxInfoFramesBuilderImpl(maxInfoFrames);
   }
 
   public static class BACnetConstructedDataMaxInfoFramesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger maxInfoFrames;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMaxInfoFramesBuilderImpl(
-        BACnetApplicationTagUnsignedInteger maxInfoFrames,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger maxInfoFrames) {
       this.maxInfoFrames = maxInfoFrames;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMaxInfoFrames build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMaxInfoFrames bACnetConstructedDataMaxInfoFrames =
           new BACnetConstructedDataMaxInfoFrames(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              maxInfoFrames,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxInfoFrames);
       return bACnetConstructedDataMaxInfoFrames;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxMaster.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxMaster.java
index 04e91f66898..3cd8ea7cd12 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxMaster.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxMaster.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger maxMaster;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMaxMaster(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger maxMaster,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger maxMaster) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxMaster = maxMaster;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMaxMaster() {
@@ -134,33 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMaxMaster");
     // Create the instance
-    return new BACnetConstructedDataMaxMasterBuilderImpl(maxMaster, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMaxMasterBuilderImpl(maxMaster);
   }
 
   public static class BACnetConstructedDataMaxMasterBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger maxMaster;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMaxMasterBuilderImpl(
-        BACnetApplicationTagUnsignedInteger maxMaster,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger maxMaster) {
       this.maxMaster = maxMaster;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMaxMaster build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMaxMaster bACnetConstructedDataMaxMaster =
-          new BACnetConstructedDataMaxMaster(
-              openingTag, peekedTagHeader, closingTag, maxMaster, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataMaxMaster(openingTag, peekedTagHeader, closingTag, maxMaster);
       return bACnetConstructedDataMaxMaster;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxPresValue.java
index 8ddd81f93fe..aa4752531d8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxPresValue.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal maxPresValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMaxPresValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal maxPresValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal maxPresValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxPresValue = maxPresValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getMaxPresValue() {
@@ -132,34 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMaxPresValue");
     // Create the instance
-    return new BACnetConstructedDataMaxPresValueBuilderImpl(
-        maxPresValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMaxPresValueBuilderImpl(maxPresValue);
   }
 
   public static class BACnetConstructedDataMaxPresValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal maxPresValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMaxPresValueBuilderImpl(
-        BACnetApplicationTagReal maxPresValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataMaxPresValueBuilderImpl(BACnetApplicationTagReal maxPresValue) {
       this.maxPresValue = maxPresValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMaxPresValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMaxPresValue bACnetConstructedDataMaxPresValue =
           new BACnetConstructedDataMaxPresValue(
-              openingTag, peekedTagHeader, closingTag, maxPresValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxPresValue);
       return bACnetConstructedDataMaxPresValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxSegmentsAccepted.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxSegmentsAccepted.java
index a89f250a37a..1037d5c61a7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxSegmentsAccepted.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaxSegmentsAccepted.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger maxSegmentsAccepted;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMaxSegmentsAccepted(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger maxSegmentsAccepted,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger maxSegmentsAccepted) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxSegmentsAccepted = maxSegmentsAccepted;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMaxSegmentsAccepted() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMaxSegmentsAccepted");
     // Create the instance
-    return new BACnetConstructedDataMaxSegmentsAcceptedBuilderImpl(
-        maxSegmentsAccepted, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMaxSegmentsAcceptedBuilderImpl(maxSegmentsAccepted);
   }
 
   public static class BACnetConstructedDataMaxSegmentsAcceptedBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger maxSegmentsAccepted;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMaxSegmentsAcceptedBuilderImpl(
-        BACnetApplicationTagUnsignedInteger maxSegmentsAccepted,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger maxSegmentsAccepted) {
       this.maxSegmentsAccepted = maxSegmentsAccepted;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMaxSegmentsAccepted build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMaxSegmentsAccepted bACnetConstructedDataMaxSegmentsAccepted =
           new BACnetConstructedDataMaxSegmentsAccepted(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              maxSegmentsAccepted,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxSegmentsAccepted);
       return bACnetConstructedDataMaxSegmentsAccepted;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaximumOutput.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaximumOutput.java
index d4d5aa529b1..4f2d31967f5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaximumOutput.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaximumOutput.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal maximumOutput;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMaximumOutput(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal maximumOutput,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal maximumOutput) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maximumOutput = maximumOutput;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getMaximumOutput() {
@@ -132,39 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMaximumOutput");
     // Create the instance
-    return new BACnetConstructedDataMaximumOutputBuilderImpl(
-        maximumOutput, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMaximumOutputBuilderImpl(maximumOutput);
   }
 
   public static class BACnetConstructedDataMaximumOutputBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal maximumOutput;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMaximumOutputBuilderImpl(
-        BACnetApplicationTagReal maximumOutput,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataMaximumOutputBuilderImpl(BACnetApplicationTagReal maximumOutput) {
       this.maximumOutput = maximumOutput;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMaximumOutput build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMaximumOutput bACnetConstructedDataMaximumOutput =
           new BACnetConstructedDataMaximumOutput(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              maximumOutput,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maximumOutput);
       return bACnetConstructedDataMaximumOutput;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaximumValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaximumValue.java
index a7cfaf914cf..00a3848da32 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaximumValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaximumValue.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal maximumValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMaximumValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal maximumValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal maximumValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maximumValue = maximumValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getMaximumValue() {
@@ -132,34 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMaximumValue");
     // Create the instance
-    return new BACnetConstructedDataMaximumValueBuilderImpl(
-        maximumValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMaximumValueBuilderImpl(maximumValue);
   }
 
   public static class BACnetConstructedDataMaximumValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal maximumValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMaximumValueBuilderImpl(
-        BACnetApplicationTagReal maximumValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataMaximumValueBuilderImpl(BACnetApplicationTagReal maximumValue) {
       this.maximumValue = maximumValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMaximumValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMaximumValue bACnetConstructedDataMaximumValue =
           new BACnetConstructedDataMaximumValue(
-              openingTag, peekedTagHeader, closingTag, maximumValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maximumValue);
       return bACnetConstructedDataMaximumValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaximumValueTimestamp.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaximumValueTimestamp.java
index cfdb76f63f4..8d4bea76f78 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaximumValueTimestamp.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMaximumValueTimestamp.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime maximumValueTimestamp;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMaximumValueTimestamp(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime maximumValueTimestamp,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime maximumValueTimestamp) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maximumValueTimestamp = maximumValueTimestamp;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getMaximumValueTimestamp() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMaximumValueTimestamp");
     // Create the instance
-    return new BACnetConstructedDataMaximumValueTimestampBuilderImpl(
-        maximumValueTimestamp, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMaximumValueTimestampBuilderImpl(maximumValueTimestamp);
   }
 
   public static class BACnetConstructedDataMaximumValueTimestampBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime maximumValueTimestamp;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMaximumValueTimestampBuilderImpl(
-        BACnetDateTime maximumValueTimestamp,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDateTime maximumValueTimestamp) {
       this.maximumValueTimestamp = maximumValueTimestamp;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMaximumValueTimestamp build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMaximumValueTimestamp bACnetConstructedDataMaximumValueTimestamp =
           new BACnetConstructedDataMaximumValueTimestamp(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              maximumValueTimestamp,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maximumValueTimestamp);
       return bACnetConstructedDataMaximumValueTimestamp;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMemberOf.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMemberOf.java
index baf07efcf42..df1404eab2d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMemberOf.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMemberOf.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetDeviceObjectReference> zones;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMemberOf(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetDeviceObjectReference> zones,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDeviceObjectReference> zones) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.zones = zones;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetDeviceObjectReference> getZones() {
@@ -126,33 +118,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMemberOf");
     // Create the instance
-    return new BACnetConstructedDataMemberOfBuilderImpl(zones, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMemberOfBuilderImpl(zones);
   }
 
   public static class BACnetConstructedDataMemberOfBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetDeviceObjectReference> zones;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMemberOfBuilderImpl(
-        List<BACnetDeviceObjectReference> zones,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataMemberOfBuilderImpl(List<BACnetDeviceObjectReference> zones) {
       this.zones = zones;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMemberOf build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMemberOf bACnetConstructedDataMemberOf =
-          new BACnetConstructedDataMemberOf(
-              openingTag, peekedTagHeader, closingTag, zones, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataMemberOf(openingTag, peekedTagHeader, closingTag, zones);
       return bACnetConstructedDataMemberOf;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMemberStatusFlags.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMemberStatusFlags.java
index 9782be1db6d..567e74ef9fc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMemberStatusFlags.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMemberStatusFlags.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetStatusFlagsTagged statusFlags;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMemberStatusFlags(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetStatusFlagsTagged statusFlags,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetStatusFlagsTagged statusFlags) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.statusFlags = statusFlags;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetStatusFlagsTagged getStatusFlags() {
@@ -135,34 +127,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMemberStatusFlags");
     // Create the instance
-    return new BACnetConstructedDataMemberStatusFlagsBuilderImpl(
-        statusFlags, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMemberStatusFlagsBuilderImpl(statusFlags);
   }
 
   public static class BACnetConstructedDataMemberStatusFlagsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetStatusFlagsTagged statusFlags;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMemberStatusFlagsBuilderImpl(
-        BACnetStatusFlagsTagged statusFlags,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataMemberStatusFlagsBuilderImpl(BACnetStatusFlagsTagged statusFlags) {
       this.statusFlags = statusFlags;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMemberStatusFlags build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMemberStatusFlags bACnetConstructedDataMemberStatusFlags =
           new BACnetConstructedDataMemberStatusFlags(
-              openingTag, peekedTagHeader, closingTag, statusFlags, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, statusFlags);
       return bACnetConstructedDataMemberStatusFlags;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMembers.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMembers.java
index 943bd72e4f3..651dcb874f0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMembers.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMembers.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetDeviceObjectReference> members;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMembers(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetDeviceObjectReference> members,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDeviceObjectReference> members) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.members = members;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetDeviceObjectReference> getMembers() {
@@ -126,33 +118,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMembers");
     // Create the instance
-    return new BACnetConstructedDataMembersBuilderImpl(members, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMembersBuilderImpl(members);
   }
 
   public static class BACnetConstructedDataMembersBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetDeviceObjectReference> members;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMembersBuilderImpl(
-        List<BACnetDeviceObjectReference> members,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataMembersBuilderImpl(List<BACnetDeviceObjectReference> members) {
       this.members = members;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMembers build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMembers bACnetConstructedDataMembers =
-          new BACnetConstructedDataMembers(
-              openingTag, peekedTagHeader, closingTag, members, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataMembers(openingTag, peekedTagHeader, closingTag, members);
       return bACnetConstructedDataMembers;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinActualValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinActualValue.java
index 5705ecdc922..5bb55b907cd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinActualValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinActualValue.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal minActualValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMinActualValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal minActualValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal minActualValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.minActualValue = minActualValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getMinActualValue() {
@@ -132,39 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMinActualValue");
     // Create the instance
-    return new BACnetConstructedDataMinActualValueBuilderImpl(
-        minActualValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMinActualValueBuilderImpl(minActualValue);
   }
 
   public static class BACnetConstructedDataMinActualValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal minActualValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMinActualValueBuilderImpl(
-        BACnetApplicationTagReal minActualValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataMinActualValueBuilderImpl(BACnetApplicationTagReal minActualValue) {
       this.minActualValue = minActualValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMinActualValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMinActualValue bACnetConstructedDataMinActualValue =
           new BACnetConstructedDataMinActualValue(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              minActualValue,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, minActualValue);
       return bACnetConstructedDataMinActualValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinPresValue.java
index b468fd7535f..c4570ab448a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinPresValue.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal minPresValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMinPresValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal minPresValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal minPresValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.minPresValue = minPresValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getMinPresValue() {
@@ -132,34 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMinPresValue");
     // Create the instance
-    return new BACnetConstructedDataMinPresValueBuilderImpl(
-        minPresValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMinPresValueBuilderImpl(minPresValue);
   }
 
   public static class BACnetConstructedDataMinPresValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal minPresValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMinPresValueBuilderImpl(
-        BACnetApplicationTagReal minPresValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataMinPresValueBuilderImpl(BACnetApplicationTagReal minPresValue) {
       this.minPresValue = minPresValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMinPresValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMinPresValue bACnetConstructedDataMinPresValue =
           new BACnetConstructedDataMinPresValue(
-              openingTag, peekedTagHeader, closingTag, minPresValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, minPresValue);
       return bACnetConstructedDataMinPresValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumOffTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumOffTime.java
index 472eea80dbe..62d766eaa92 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumOffTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumOffTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger minimumOffTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMinimumOffTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger minimumOffTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger minimumOffTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.minimumOffTime = minimumOffTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMinimumOffTime() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMinimumOffTime");
     // Create the instance
-    return new BACnetConstructedDataMinimumOffTimeBuilderImpl(
-        minimumOffTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMinimumOffTimeBuilderImpl(minimumOffTime);
   }
 
   public static class BACnetConstructedDataMinimumOffTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger minimumOffTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMinimumOffTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger minimumOffTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger minimumOffTime) {
       this.minimumOffTime = minimumOffTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMinimumOffTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMinimumOffTime bACnetConstructedDataMinimumOffTime =
           new BACnetConstructedDataMinimumOffTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              minimumOffTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, minimumOffTime);
       return bACnetConstructedDataMinimumOffTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumOnTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumOnTime.java
index 0c9644b53fb..ef5239347af 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumOnTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumOnTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger minimumOnTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMinimumOnTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger minimumOnTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger minimumOnTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.minimumOnTime = minimumOnTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMinimumOnTime() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMinimumOnTime");
     // Create the instance
-    return new BACnetConstructedDataMinimumOnTimeBuilderImpl(
-        minimumOnTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMinimumOnTimeBuilderImpl(minimumOnTime);
   }
 
   public static class BACnetConstructedDataMinimumOnTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger minimumOnTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMinimumOnTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger minimumOnTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger minimumOnTime) {
       this.minimumOnTime = minimumOnTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMinimumOnTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMinimumOnTime bACnetConstructedDataMinimumOnTime =
           new BACnetConstructedDataMinimumOnTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              minimumOnTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, minimumOnTime);
       return bACnetConstructedDataMinimumOnTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumOutput.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumOutput.java
index 5ac1fe8191d..d697bf79350 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumOutput.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumOutput.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal minimumOutput;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMinimumOutput(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal minimumOutput,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal minimumOutput) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.minimumOutput = minimumOutput;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getMinimumOutput() {
@@ -132,39 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMinimumOutput");
     // Create the instance
-    return new BACnetConstructedDataMinimumOutputBuilderImpl(
-        minimumOutput, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMinimumOutputBuilderImpl(minimumOutput);
   }
 
   public static class BACnetConstructedDataMinimumOutputBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal minimumOutput;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMinimumOutputBuilderImpl(
-        BACnetApplicationTagReal minimumOutput,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataMinimumOutputBuilderImpl(BACnetApplicationTagReal minimumOutput) {
       this.minimumOutput = minimumOutput;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMinimumOutput build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMinimumOutput bACnetConstructedDataMinimumOutput =
           new BACnetConstructedDataMinimumOutput(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              minimumOutput,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, minimumOutput);
       return bACnetConstructedDataMinimumOutput;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumValue.java
index 6cf3db0f5b8..72ca0a71185 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumValue.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal minimumValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMinimumValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal minimumValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal minimumValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.minimumValue = minimumValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getMinimumValue() {
@@ -132,34 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMinimumValue");
     // Create the instance
-    return new BACnetConstructedDataMinimumValueBuilderImpl(
-        minimumValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMinimumValueBuilderImpl(minimumValue);
   }
 
   public static class BACnetConstructedDataMinimumValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal minimumValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMinimumValueBuilderImpl(
-        BACnetApplicationTagReal minimumValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataMinimumValueBuilderImpl(BACnetApplicationTagReal minimumValue) {
       this.minimumValue = minimumValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMinimumValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMinimumValue bACnetConstructedDataMinimumValue =
           new BACnetConstructedDataMinimumValue(
-              openingTag, peekedTagHeader, closingTag, minimumValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, minimumValue);
       return bACnetConstructedDataMinimumValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumValueTimestamp.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumValueTimestamp.java
index b7ddb21aa8e..74b7a190d2a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumValueTimestamp.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMinimumValueTimestamp.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime minimumValueTimestamp;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMinimumValueTimestamp(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime minimumValueTimestamp,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime minimumValueTimestamp) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.minimumValueTimestamp = minimumValueTimestamp;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getMinimumValueTimestamp() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMinimumValueTimestamp");
     // Create the instance
-    return new BACnetConstructedDataMinimumValueTimestampBuilderImpl(
-        minimumValueTimestamp, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMinimumValueTimestampBuilderImpl(minimumValueTimestamp);
   }
 
   public static class BACnetConstructedDataMinimumValueTimestampBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime minimumValueTimestamp;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMinimumValueTimestampBuilderImpl(
-        BACnetDateTime minimumValueTimestamp,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDateTime minimumValueTimestamp) {
       this.minimumValueTimestamp = minimumValueTimestamp;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMinimumValueTimestamp build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMinimumValueTimestamp bACnetConstructedDataMinimumValueTimestamp =
           new BACnetConstructedDataMinimumValueTimestamp(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              minimumValueTimestamp,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, minimumValueTimestamp);
       return bACnetConstructedDataMinimumValueTimestamp;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMode.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMode.java
index a1cddfba224..701f0e6d772 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMode.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMode.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLifeSafetyModeTagged mode;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMode(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLifeSafetyModeTagged mode,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLifeSafetyModeTagged mode) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.mode = mode;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLifeSafetyModeTagged getMode() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMode");
     // Create the instance
-    return new BACnetConstructedDataModeBuilderImpl(mode, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataModeBuilderImpl(mode);
   }
 
   public static class BACnetConstructedDataModeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLifeSafetyModeTagged mode;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataModeBuilderImpl(
-        BACnetLifeSafetyModeTagged mode,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataModeBuilderImpl(BACnetLifeSafetyModeTagged mode) {
       this.mode = mode;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMode build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMode bACnetConstructedDataMode =
-          new BACnetConstructedDataMode(
-              openingTag, peekedTagHeader, closingTag, mode, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataMode(openingTag, peekedTagHeader, closingTag, mode);
       return bACnetConstructedDataMode;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataModelName.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataModelName.java
index 3bf05b5207c..db24faf0941 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataModelName.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataModelName.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString modelName;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataModelName(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString modelName,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString modelName) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.modelName = modelName;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getModelName() {
@@ -134,33 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataModelName");
     // Create the instance
-    return new BACnetConstructedDataModelNameBuilderImpl(modelName, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataModelNameBuilderImpl(modelName);
   }
 
   public static class BACnetConstructedDataModelNameBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString modelName;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataModelNameBuilderImpl(
-        BACnetApplicationTagCharacterString modelName,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString modelName) {
       this.modelName = modelName;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataModelName build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataModelName bACnetConstructedDataModelName =
-          new BACnetConstructedDataModelName(
-              openingTag, peekedTagHeader, closingTag, modelName, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataModelName(openingTag, peekedTagHeader, closingTag, modelName);
       return bACnetConstructedDataModelName;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataModificationDate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataModificationDate.java
index d39678a8b4c..3332a3515b0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataModificationDate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataModificationDate.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime modificationDate;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataModificationDate(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime modificationDate,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime modificationDate) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.modificationDate = modificationDate;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getModificationDate() {
@@ -131,39 +123,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataModificationDate");
     // Create the instance
-    return new BACnetConstructedDataModificationDateBuilderImpl(
-        modificationDate, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataModificationDateBuilderImpl(modificationDate);
   }
 
   public static class BACnetConstructedDataModificationDateBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime modificationDate;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataModificationDateBuilderImpl(
-        BACnetDateTime modificationDate,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataModificationDateBuilderImpl(BACnetDateTime modificationDate) {
       this.modificationDate = modificationDate;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataModificationDate build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataModificationDate bACnetConstructedDataModificationDate =
           new BACnetConstructedDataModificationDate(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              modificationDate,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, modificationDate);
       return bACnetConstructedDataModificationDate;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputAlarmValues.java
index 308fd57a12e..01efbfd92cb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputAlarmValues.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetApplicationTagUnsignedInteger> alarmValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMultiStateInputAlarmValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetApplicationTagUnsignedInteger> alarmValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagUnsignedInteger> alarmValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.alarmValues = alarmValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetApplicationTagUnsignedInteger> getAlarmValues() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMultiStateInputAlarmValues");
     // Create the instance
-    return new BACnetConstructedDataMultiStateInputAlarmValuesBuilderImpl(
-        alarmValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMultiStateInputAlarmValuesBuilderImpl(alarmValues);
   }
 
   public static class BACnetConstructedDataMultiStateInputAlarmValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetApplicationTagUnsignedInteger> alarmValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMultiStateInputAlarmValuesBuilderImpl(
-        List<BACnetApplicationTagUnsignedInteger> alarmValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagUnsignedInteger> alarmValues) {
       this.alarmValues = alarmValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMultiStateInputAlarmValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMultiStateInputAlarmValues
           bACnetConstructedDataMultiStateInputAlarmValues =
               new BACnetConstructedDataMultiStateInputAlarmValues(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  alarmValues,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, alarmValues);
       return bACnetConstructedDataMultiStateInputAlarmValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputAll.java
index a910cd433af..5a0dccc420d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMultiStateInputAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMultiStateInputAll");
     // Create the instance
-    return new BACnetConstructedDataMultiStateInputAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMultiStateInputAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataMultiStateInputAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMultiStateInputAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataMultiStateInputAllBuilderImpl() {}
 
     public BACnetConstructedDataMultiStateInputAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMultiStateInputAll bACnetConstructedDataMultiStateInputAll =
-          new BACnetConstructedDataMultiStateInputAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataMultiStateInputAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataMultiStateInputAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputFaultValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputFaultValues.java
index bbcbe06779e..458a1e6eb23 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputFaultValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputFaultValues.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetApplicationTagUnsignedInteger> faultValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMultiStateInputFaultValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetApplicationTagUnsignedInteger> faultValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagUnsignedInteger> faultValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultValues = faultValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetApplicationTagUnsignedInteger> getFaultValues() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMultiStateInputFaultValues");
     // Create the instance
-    return new BACnetConstructedDataMultiStateInputFaultValuesBuilderImpl(
-        faultValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMultiStateInputFaultValuesBuilderImpl(faultValues);
   }
 
   public static class BACnetConstructedDataMultiStateInputFaultValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetApplicationTagUnsignedInteger> faultValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMultiStateInputFaultValuesBuilderImpl(
-        List<BACnetApplicationTagUnsignedInteger> faultValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagUnsignedInteger> faultValues) {
       this.faultValues = faultValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMultiStateInputFaultValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMultiStateInputFaultValues
           bACnetConstructedDataMultiStateInputFaultValues =
               new BACnetConstructedDataMultiStateInputFaultValues(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  faultValues,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, faultValues);
       return bACnetConstructedDataMultiStateInputFaultValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputInterfaceValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputInterfaceValue.java
index dbdc0aed39c..c471b1b1c8b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputInterfaceValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateInputInterfaceValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetOptionalBinaryPV interfaceValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMultiStateInputInterfaceValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetOptionalBinaryPV interfaceValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetOptionalBinaryPV interfaceValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.interfaceValue = interfaceValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetOptionalBinaryPV getInterfaceValue() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMultiStateInputInterfaceValue");
     // Create the instance
-    return new BACnetConstructedDataMultiStateInputInterfaceValueBuilderImpl(
-        interfaceValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMultiStateInputInterfaceValueBuilderImpl(interfaceValue);
   }
 
   public static class BACnetConstructedDataMultiStateInputInterfaceValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetOptionalBinaryPV interfaceValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMultiStateInputInterfaceValueBuilderImpl(
-        BACnetOptionalBinaryPV interfaceValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOptionalBinaryPV interfaceValue) {
       this.interfaceValue = interfaceValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMultiStateInputInterfaceValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMultiStateInputInterfaceValue
           bACnetConstructedDataMultiStateInputInterfaceValue =
               new BACnetConstructedDataMultiStateInputInterfaceValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  interfaceValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, interfaceValue);
       return bACnetConstructedDataMultiStateInputInterfaceValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputAll.java
index d7705a18958..64295d4a56d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMultiStateOutputAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMultiStateOutputAll");
     // Create the instance
-    return new BACnetConstructedDataMultiStateOutputAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMultiStateOutputAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataMultiStateOutputAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMultiStateOutputAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataMultiStateOutputAllBuilderImpl() {}
 
     public BACnetConstructedDataMultiStateOutputAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMultiStateOutputAll bACnetConstructedDataMultiStateOutputAll =
-          new BACnetConstructedDataMultiStateOutputAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataMultiStateOutputAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataMultiStateOutputAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputFeedbackValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputFeedbackValue.java
index 48754cbb831..6a97fdd6058 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputFeedbackValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputFeedbackValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger feedbackValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMultiStateOutputFeedbackValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger feedbackValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger feedbackValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.feedbackValue = feedbackValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getFeedbackValue() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMultiStateOutputFeedbackValue");
     // Create the instance
-    return new BACnetConstructedDataMultiStateOutputFeedbackValueBuilderImpl(
-        feedbackValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMultiStateOutputFeedbackValueBuilderImpl(feedbackValue);
   }
 
   public static class BACnetConstructedDataMultiStateOutputFeedbackValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger feedbackValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMultiStateOutputFeedbackValueBuilderImpl(
-        BACnetApplicationTagUnsignedInteger feedbackValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger feedbackValue) {
       this.feedbackValue = feedbackValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMultiStateOutputFeedbackValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMultiStateOutputFeedbackValue
           bACnetConstructedDataMultiStateOutputFeedbackValue =
               new BACnetConstructedDataMultiStateOutputFeedbackValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  feedbackValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, feedbackValue);
       return bACnetConstructedDataMultiStateOutputFeedbackValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputInterfaceValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputInterfaceValue.java
index aa545d0f69e..5e6aaf51948 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputInterfaceValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputInterfaceValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetOptionalBinaryPV interfaceValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMultiStateOutputInterfaceValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetOptionalBinaryPV interfaceValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetOptionalBinaryPV interfaceValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.interfaceValue = interfaceValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetOptionalBinaryPV getInterfaceValue() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMultiStateOutputInterfaceValue");
     // Create the instance
-    return new BACnetConstructedDataMultiStateOutputInterfaceValueBuilderImpl(
-        interfaceValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMultiStateOutputInterfaceValueBuilderImpl(interfaceValue);
   }
 
   public static class BACnetConstructedDataMultiStateOutputInterfaceValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetOptionalBinaryPV interfaceValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMultiStateOutputInterfaceValueBuilderImpl(
-        BACnetOptionalBinaryPV interfaceValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOptionalBinaryPV interfaceValue) {
       this.interfaceValue = interfaceValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMultiStateOutputInterfaceValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMultiStateOutputInterfaceValue
           bACnetConstructedDataMultiStateOutputInterfaceValue =
               new BACnetConstructedDataMultiStateOutputInterfaceValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  interfaceValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, interfaceValue);
       return bACnetConstructedDataMultiStateOutputInterfaceValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputRelinquishDefault.java
index b45e7b07e3b..82b56d3d43a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateOutputRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMultiStateOutputRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getRelinquishDefault() {
@@ -136,40 +128,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMultiStateOutputRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataMultiStateOutputRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMultiStateOutputRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataMultiStateOutputRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMultiStateOutputRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagUnsignedInteger relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMultiStateOutputRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMultiStateOutputRelinquishDefault
           bACnetConstructedDataMultiStateOutputRelinquishDefault =
               new BACnetConstructedDataMultiStateOutputRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataMultiStateOutputRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueAlarmValues.java
index 2c42ce19d1d..21ea050e3b9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueAlarmValues.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetApplicationTagUnsignedInteger> alarmValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMultiStateValueAlarmValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetApplicationTagUnsignedInteger> alarmValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagUnsignedInteger> alarmValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.alarmValues = alarmValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetApplicationTagUnsignedInteger> getAlarmValues() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMultiStateValueAlarmValues");
     // Create the instance
-    return new BACnetConstructedDataMultiStateValueAlarmValuesBuilderImpl(
-        alarmValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMultiStateValueAlarmValuesBuilderImpl(alarmValues);
   }
 
   public static class BACnetConstructedDataMultiStateValueAlarmValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetApplicationTagUnsignedInteger> alarmValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMultiStateValueAlarmValuesBuilderImpl(
-        List<BACnetApplicationTagUnsignedInteger> alarmValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagUnsignedInteger> alarmValues) {
       this.alarmValues = alarmValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMultiStateValueAlarmValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMultiStateValueAlarmValues
           bACnetConstructedDataMultiStateValueAlarmValues =
               new BACnetConstructedDataMultiStateValueAlarmValues(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  alarmValues,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, alarmValues);
       return bACnetConstructedDataMultiStateValueAlarmValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueAll.java
index 4434e66aa92..8f1b86b5735 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMultiStateValueAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMultiStateValueAll");
     // Create the instance
-    return new BACnetConstructedDataMultiStateValueAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMultiStateValueAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataMultiStateValueAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMultiStateValueAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataMultiStateValueAllBuilderImpl() {}
 
     public BACnetConstructedDataMultiStateValueAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMultiStateValueAll bACnetConstructedDataMultiStateValueAll =
-          new BACnetConstructedDataMultiStateValueAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataMultiStateValueAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataMultiStateValueAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueFaultValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueFaultValues.java
index 7b1494753d2..c65c69fae9d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueFaultValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueFaultValues.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetApplicationTagUnsignedInteger> faultValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMultiStateValueFaultValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetApplicationTagUnsignedInteger> faultValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagUnsignedInteger> faultValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultValues = faultValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetApplicationTagUnsignedInteger> getFaultValues() {
@@ -131,40 +123,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMultiStateValueFaultValues");
     // Create the instance
-    return new BACnetConstructedDataMultiStateValueFaultValuesBuilderImpl(
-        faultValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMultiStateValueFaultValuesBuilderImpl(faultValues);
   }
 
   public static class BACnetConstructedDataMultiStateValueFaultValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetApplicationTagUnsignedInteger> faultValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMultiStateValueFaultValuesBuilderImpl(
-        List<BACnetApplicationTagUnsignedInteger> faultValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagUnsignedInteger> faultValues) {
       this.faultValues = faultValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMultiStateValueFaultValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMultiStateValueFaultValues
           bACnetConstructedDataMultiStateValueFaultValues =
               new BACnetConstructedDataMultiStateValueFaultValues(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  faultValues,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, faultValues);
       return bACnetConstructedDataMultiStateValueFaultValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueRelinquishDefault.java
index 4703b7073ad..b1fcea9bc00 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMultiStateValueRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMultiStateValueRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getRelinquishDefault() {
@@ -136,40 +128,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMultiStateValueRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataMultiStateValueRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMultiStateValueRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataMultiStateValueRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataMultiStateValueRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagUnsignedInteger relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMultiStateValueRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMultiStateValueRelinquishDefault
           bACnetConstructedDataMultiStateValueRelinquishDefault =
               new BACnetConstructedDataMultiStateValueRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataMultiStateValueRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMusterPoint.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMusterPoint.java
index ca220110e47..68024199baa 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMusterPoint.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataMusterPoint.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean musterPoint;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataMusterPoint(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean musterPoint,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean musterPoint) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.musterPoint = musterPoint;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getMusterPoint() {
@@ -132,34 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataMusterPoint");
     // Create the instance
-    return new BACnetConstructedDataMusterPointBuilderImpl(
-        musterPoint, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataMusterPointBuilderImpl(musterPoint);
   }
 
   public static class BACnetConstructedDataMusterPointBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean musterPoint;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataMusterPointBuilderImpl(
-        BACnetApplicationTagBoolean musterPoint,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataMusterPointBuilderImpl(BACnetApplicationTagBoolean musterPoint) {
       this.musterPoint = musterPoint;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataMusterPoint build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataMusterPoint bACnetConstructedDataMusterPoint =
           new BACnetConstructedDataMusterPoint(
-              openingTag, peekedTagHeader, closingTag, musterPoint, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, musterPoint);
       return bACnetConstructedDataMusterPoint;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNegativeAccessRules.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNegativeAccessRules.java
index 46087fee918..cfc464e2acd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNegativeAccessRules.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNegativeAccessRules.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetAccessRule> negativeAccessRules;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNegativeAccessRules(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetAccessRule> negativeAccessRules,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetAccessRule> negativeAccessRules) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.negativeAccessRules = negativeAccessRules;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (negativeAccessRules)
     writeComplexTypeArrayField("negativeAccessRules", negativeAccessRules, writeBuffer);
@@ -171,42 +159,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataNegativeAccessRules");
     // Create the instance
     return new BACnetConstructedDataNegativeAccessRulesBuilderImpl(
-        numberOfDataElements, negativeAccessRules, tagNumber, arrayIndexArgument);
+        numberOfDataElements, negativeAccessRules);
   }
 
   public static class BACnetConstructedDataNegativeAccessRulesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetAccessRule> negativeAccessRules;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataNegativeAccessRulesBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetAccessRule> negativeAccessRules,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetAccessRule> negativeAccessRules) {
       this.numberOfDataElements = numberOfDataElements;
       this.negativeAccessRules = negativeAccessRules;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNegativeAccessRules build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNegativeAccessRules bACnetConstructedDataNegativeAccessRules =
           new BACnetConstructedDataNegativeAccessRules(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              negativeAccessRules,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, negativeAccessRules);
       return bACnetConstructedDataNegativeAccessRules;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkAccessSecurityPolicies.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkAccessSecurityPolicies.java
index 6e1c2c2aa1e..c9f8925e717 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkAccessSecurityPolicies.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkAccessSecurityPolicies.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetNetworkSecurityPolicy> networkAccessSecurityPolicies;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNetworkAccessSecurityPolicies(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetNetworkSecurityPolicy> networkAccessSecurityPolicies,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetNetworkSecurityPolicy> networkAccessSecurityPolicies) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.networkAccessSecurityPolicies = networkAccessSecurityPolicies;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (networkAccessSecurityPolicies)
     writeComplexTypeArrayField(
@@ -172,33 +160,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataNetworkAccessSecurityPolicies");
     // Create the instance
     return new BACnetConstructedDataNetworkAccessSecurityPoliciesBuilderImpl(
-        numberOfDataElements, networkAccessSecurityPolicies, tagNumber, arrayIndexArgument);
+        numberOfDataElements, networkAccessSecurityPolicies);
   }
 
   public static class BACnetConstructedDataNetworkAccessSecurityPoliciesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetNetworkSecurityPolicy> networkAccessSecurityPolicies;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataNetworkAccessSecurityPoliciesBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetNetworkSecurityPolicy> networkAccessSecurityPolicies,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetNetworkSecurityPolicy> networkAccessSecurityPolicies) {
       this.numberOfDataElements = numberOfDataElements;
       this.networkAccessSecurityPolicies = networkAccessSecurityPolicies;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNetworkAccessSecurityPolicies build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNetworkAccessSecurityPolicies
           bACnetConstructedDataNetworkAccessSecurityPolicies =
               new BACnetConstructedDataNetworkAccessSecurityPolicies(
@@ -206,9 +184,7 @@ public BACnetConstructedDataNetworkAccessSecurityPolicies build(
                   peekedTagHeader,
                   closingTag,
                   numberOfDataElements,
-                  networkAccessSecurityPolicies,
-                  tagNumber,
-                  arrayIndexArgument);
+                  networkAccessSecurityPolicies);
       return bACnetConstructedDataNetworkAccessSecurityPolicies;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkInterfaceName.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkInterfaceName.java
index 300079098d5..5aa06a1febc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkInterfaceName.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkInterfaceName.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString networkInterfaceName;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNetworkInterfaceName(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString networkInterfaceName,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString networkInterfaceName) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.networkInterfaceName = networkInterfaceName;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getNetworkInterfaceName() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNetworkInterfaceName");
     // Create the instance
-    return new BACnetConstructedDataNetworkInterfaceNameBuilderImpl(
-        networkInterfaceName, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNetworkInterfaceNameBuilderImpl(networkInterfaceName);
   }
 
   public static class BACnetConstructedDataNetworkInterfaceNameBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString networkInterfaceName;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataNetworkInterfaceNameBuilderImpl(
-        BACnetApplicationTagCharacterString networkInterfaceName,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString networkInterfaceName) {
       this.networkInterfaceName = networkInterfaceName;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNetworkInterfaceName build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNetworkInterfaceName bACnetConstructedDataNetworkInterfaceName =
           new BACnetConstructedDataNetworkInterfaceName(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              networkInterfaceName,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, networkInterfaceName);
       return bACnetConstructedDataNetworkInterfaceName;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkNumber.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkNumber.java
index e731f00babe..6a38eeb76f0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkNumber.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkNumber.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger networkNumber;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNetworkNumber(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger networkNumber,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger networkNumber) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.networkNumber = networkNumber;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNetworkNumber() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNetworkNumber");
     // Create the instance
-    return new BACnetConstructedDataNetworkNumberBuilderImpl(
-        networkNumber, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNetworkNumberBuilderImpl(networkNumber);
   }
 
   public static class BACnetConstructedDataNetworkNumberBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger networkNumber;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataNetworkNumberBuilderImpl(
-        BACnetApplicationTagUnsignedInteger networkNumber,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger networkNumber) {
       this.networkNumber = networkNumber;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNetworkNumber build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNetworkNumber bACnetConstructedDataNetworkNumber =
           new BACnetConstructedDataNetworkNumber(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              networkNumber,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, networkNumber);
       return bACnetConstructedDataNetworkNumber;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkNumberQuality.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkNumberQuality.java
index 60a164e783d..cd373f068fd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkNumberQuality.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkNumberQuality.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetNetworkNumberQualityTagged networkNumberQuality;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNetworkNumberQuality(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetNetworkNumberQualityTagged networkNumberQuality,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetNetworkNumberQualityTagged networkNumberQuality) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.networkNumberQuality = networkNumberQuality;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetNetworkNumberQualityTagged getNetworkNumberQuality() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNetworkNumberQuality");
     // Create the instance
-    return new BACnetConstructedDataNetworkNumberQualityBuilderImpl(
-        networkNumberQuality, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNetworkNumberQualityBuilderImpl(networkNumberQuality);
   }
 
   public static class BACnetConstructedDataNetworkNumberQualityBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetNetworkNumberQualityTagged networkNumberQuality;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataNetworkNumberQualityBuilderImpl(
-        BACnetNetworkNumberQualityTagged networkNumberQuality,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetNetworkNumberQualityTagged networkNumberQuality) {
       this.networkNumberQuality = networkNumberQuality;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNetworkNumberQuality build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNetworkNumberQuality bACnetConstructedDataNetworkNumberQuality =
           new BACnetConstructedDataNetworkNumberQuality(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              networkNumberQuality,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, networkNumberQuality);
       return bACnetConstructedDataNetworkNumberQuality;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkPortAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkPortAll.java
index 64c7ae254f6..dab430b5cdb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkPortAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkPortAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNetworkPortAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNetworkPortAll");
     // Create the instance
-    return new BACnetConstructedDataNetworkPortAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNetworkPortAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataNetworkPortAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataNetworkPortAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataNetworkPortAllBuilderImpl() {}
 
     public BACnetConstructedDataNetworkPortAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNetworkPortAll bACnetConstructedDataNetworkPortAll =
-          new BACnetConstructedDataNetworkPortAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataNetworkPortAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataNetworkPortAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkPortMaxInfoFrames.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkPortMaxInfoFrames.java
index 6ae7a94f117..4045c91a116 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkPortMaxInfoFrames.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkPortMaxInfoFrames.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger maxInfoFrames;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNetworkPortMaxInfoFrames(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger maxInfoFrames,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger maxInfoFrames) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxInfoFrames = maxInfoFrames;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMaxInfoFrames() {
@@ -135,39 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNetworkPortMaxInfoFrames");
     // Create the instance
-    return new BACnetConstructedDataNetworkPortMaxInfoFramesBuilderImpl(
-        maxInfoFrames, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNetworkPortMaxInfoFramesBuilderImpl(maxInfoFrames);
   }
 
   public static class BACnetConstructedDataNetworkPortMaxInfoFramesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger maxInfoFrames;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataNetworkPortMaxInfoFramesBuilderImpl(
-        BACnetApplicationTagUnsignedInteger maxInfoFrames,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger maxInfoFrames) {
       this.maxInfoFrames = maxInfoFrames;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNetworkPortMaxInfoFrames build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNetworkPortMaxInfoFrames bACnetConstructedDataNetworkPortMaxInfoFrames =
           new BACnetConstructedDataNetworkPortMaxInfoFrames(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              maxInfoFrames,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxInfoFrames);
       return bACnetConstructedDataNetworkPortMaxInfoFrames;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkPortMaxMaster.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkPortMaxMaster.java
index 1fd1c8d4099..aff310e6986 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkPortMaxMaster.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkPortMaxMaster.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger maxMaster;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNetworkPortMaxMaster(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger maxMaster,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger maxMaster) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxMaster = maxMaster;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMaxMaster() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNetworkPortMaxMaster");
     // Create the instance
-    return new BACnetConstructedDataNetworkPortMaxMasterBuilderImpl(
-        maxMaster, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNetworkPortMaxMasterBuilderImpl(maxMaster);
   }
 
   public static class BACnetConstructedDataNetworkPortMaxMasterBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger maxMaster;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataNetworkPortMaxMasterBuilderImpl(
-        BACnetApplicationTagUnsignedInteger maxMaster,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger maxMaster) {
       this.maxMaster = maxMaster;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNetworkPortMaxMaster build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNetworkPortMaxMaster bACnetConstructedDataNetworkPortMaxMaster =
           new BACnetConstructedDataNetworkPortMaxMaster(
-              openingTag, peekedTagHeader, closingTag, maxMaster, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxMaster);
       return bACnetConstructedDataNetworkPortMaxMaster;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkSecurityAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkSecurityAll.java
index 20257076e3c..9d77a13a5aa 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkSecurityAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkSecurityAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNetworkSecurityAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNetworkSecurityAll");
     // Create the instance
-    return new BACnetConstructedDataNetworkSecurityAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNetworkSecurityAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataNetworkSecurityAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataNetworkSecurityAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataNetworkSecurityAllBuilderImpl() {}
 
     public BACnetConstructedDataNetworkSecurityAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNetworkSecurityAll bACnetConstructedDataNetworkSecurityAll =
-          new BACnetConstructedDataNetworkSecurityAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataNetworkSecurityAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataNetworkSecurityAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkType.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkType.java
index 80cfb53106d..a5e8337fba9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkType.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNetworkType.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetNetworkTypeTagged networkType;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNetworkType(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetNetworkTypeTagged networkType,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetNetworkTypeTagged networkType) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.networkType = networkType;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetNetworkTypeTagged getNetworkType() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNetworkType");
     // Create the instance
-    return new BACnetConstructedDataNetworkTypeBuilderImpl(
-        networkType, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNetworkTypeBuilderImpl(networkType);
   }
 
   public static class BACnetConstructedDataNetworkTypeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetNetworkTypeTagged networkType;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataNetworkTypeBuilderImpl(
-        BACnetNetworkTypeTagged networkType,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataNetworkTypeBuilderImpl(BACnetNetworkTypeTagged networkType) {
       this.networkType = networkType;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNetworkType build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNetworkType bACnetConstructedDataNetworkType =
           new BACnetConstructedDataNetworkType(
-              openingTag, peekedTagHeader, closingTag, networkType, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, networkType);
       return bACnetConstructedDataNetworkType;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNextStoppingFloor.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNextStoppingFloor.java
index 9adecdfc389..f65a6450ebd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNextStoppingFloor.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNextStoppingFloor.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger nextStoppingFloor;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNextStoppingFloor(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger nextStoppingFloor,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger nextStoppingFloor) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.nextStoppingFloor = nextStoppingFloor;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNextStoppingFloor() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNextStoppingFloor");
     // Create the instance
-    return new BACnetConstructedDataNextStoppingFloorBuilderImpl(
-        nextStoppingFloor, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNextStoppingFloorBuilderImpl(nextStoppingFloor);
   }
 
   public static class BACnetConstructedDataNextStoppingFloorBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger nextStoppingFloor;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataNextStoppingFloorBuilderImpl(
-        BACnetApplicationTagUnsignedInteger nextStoppingFloor,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger nextStoppingFloor) {
       this.nextStoppingFloor = nextStoppingFloor;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNextStoppingFloor build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNextStoppingFloor bACnetConstructedDataNextStoppingFloor =
           new BACnetConstructedDataNextStoppingFloor(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              nextStoppingFloor,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, nextStoppingFloor);
       return bACnetConstructedDataNextStoppingFloor;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNodeSubtype.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNodeSubtype.java
index 6598c4d6ff9..12ce957588d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNodeSubtype.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNodeSubtype.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString nodeSubType;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNodeSubtype(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString nodeSubType,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString nodeSubType) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.nodeSubType = nodeSubType;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getNodeSubType() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNodeSubtype");
     // Create the instance
-    return new BACnetConstructedDataNodeSubtypeBuilderImpl(
-        nodeSubType, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNodeSubtypeBuilderImpl(nodeSubType);
   }
 
   public static class BACnetConstructedDataNodeSubtypeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString nodeSubType;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataNodeSubtypeBuilderImpl(
-        BACnetApplicationTagCharacterString nodeSubType,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString nodeSubType) {
       this.nodeSubType = nodeSubType;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNodeSubtype build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNodeSubtype bACnetConstructedDataNodeSubtype =
           new BACnetConstructedDataNodeSubtype(
-              openingTag, peekedTagHeader, closingTag, nodeSubType, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, nodeSubType);
       return bACnetConstructedDataNodeSubtype;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNodeType.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNodeType.java
index 1df5277f88b..504d36187c0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNodeType.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNodeType.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetNodeTypeTagged nodeType;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNodeType(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetNodeTypeTagged nodeType,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetNodeTypeTagged nodeType) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.nodeType = nodeType;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetNodeTypeTagged getNodeType() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNodeType");
     // Create the instance
-    return new BACnetConstructedDataNodeTypeBuilderImpl(nodeType, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNodeTypeBuilderImpl(nodeType);
   }
 
   public static class BACnetConstructedDataNodeTypeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetNodeTypeTagged nodeType;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataNodeTypeBuilderImpl(
-        BACnetNodeTypeTagged nodeType,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataNodeTypeBuilderImpl(BACnetNodeTypeTagged nodeType) {
       this.nodeType = nodeType;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNodeType build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNodeType bACnetConstructedDataNodeType =
-          new BACnetConstructedDataNodeType(
-              openingTag, peekedTagHeader, closingTag, nodeType, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataNodeType(openingTag, peekedTagHeader, closingTag, nodeType);
       return bACnetConstructedDataNodeType;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationClass.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationClass.java
index cc3a620c3a0..5e919d90ea2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationClass.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationClass.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger notificationClass;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNotificationClass(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger notificationClass,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger notificationClass) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.notificationClass = notificationClass;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNotificationClass() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNotificationClass");
     // Create the instance
-    return new BACnetConstructedDataNotificationClassBuilderImpl(
-        notificationClass, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNotificationClassBuilderImpl(notificationClass);
   }
 
   public static class BACnetConstructedDataNotificationClassBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger notificationClass;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataNotificationClassBuilderImpl(
-        BACnetApplicationTagUnsignedInteger notificationClass,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger notificationClass) {
       this.notificationClass = notificationClass;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNotificationClass build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNotificationClass bACnetConstructedDataNotificationClass =
           new BACnetConstructedDataNotificationClass(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              notificationClass,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, notificationClass);
       return bACnetConstructedDataNotificationClass;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationClassAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationClassAll.java
index 42b0bae0583..00cfb593ca1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationClassAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationClassAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNotificationClassAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNotificationClassAll");
     // Create the instance
-    return new BACnetConstructedDataNotificationClassAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNotificationClassAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataNotificationClassAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataNotificationClassAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataNotificationClassAllBuilderImpl() {}
 
     public BACnetConstructedDataNotificationClassAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNotificationClassAll bACnetConstructedDataNotificationClassAll =
-          new BACnetConstructedDataNotificationClassAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataNotificationClassAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataNotificationClassAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationForwarderAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationForwarderAll.java
index 91bf796be13..5d59de3d845 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationForwarderAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationForwarderAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNotificationForwarderAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,30 +94,19 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNotificationForwarderAll");
     // Create the instance
-    return new BACnetConstructedDataNotificationForwarderAllBuilderImpl(
-        tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNotificationForwarderAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataNotificationForwarderAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataNotificationForwarderAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataNotificationForwarderAllBuilderImpl() {}
 
     public BACnetConstructedDataNotificationForwarderAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNotificationForwarderAll bACnetConstructedDataNotificationForwarderAll =
           new BACnetConstructedDataNotificationForwarderAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataNotificationForwarderAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationThreshold.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationThreshold.java
index b330743217c..7535d2a012d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationThreshold.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotificationThreshold.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger notificationThreshold;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNotificationThreshold(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger notificationThreshold,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger notificationThreshold) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.notificationThreshold = notificationThreshold;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNotificationThreshold() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNotificationThreshold");
     // Create the instance
-    return new BACnetConstructedDataNotificationThresholdBuilderImpl(
-        notificationThreshold, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNotificationThresholdBuilderImpl(notificationThreshold);
   }
 
   public static class BACnetConstructedDataNotificationThresholdBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger notificationThreshold;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataNotificationThresholdBuilderImpl(
-        BACnetApplicationTagUnsignedInteger notificationThreshold,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger notificationThreshold) {
       this.notificationThreshold = notificationThreshold;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNotificationThreshold build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNotificationThreshold bACnetConstructedDataNotificationThreshold =
           new BACnetConstructedDataNotificationThreshold(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              notificationThreshold,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, notificationThreshold);
       return bACnetConstructedDataNotificationThreshold;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotifyType.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotifyType.java
index ed70ac5a4e6..22cef64acf3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotifyType.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNotifyType.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetNotifyTypeTagged notifyType;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNotifyType(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetNotifyTypeTagged notifyType,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetNotifyTypeTagged notifyType) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.notifyType = notifyType;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetNotifyTypeTagged getNotifyType() {
@@ -134,34 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNotifyType");
     // Create the instance
-    return new BACnetConstructedDataNotifyTypeBuilderImpl(
-        notifyType, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNotifyTypeBuilderImpl(notifyType);
   }
 
   public static class BACnetConstructedDataNotifyTypeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetNotifyTypeTagged notifyType;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataNotifyTypeBuilderImpl(
-        BACnetNotifyTypeTagged notifyType,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataNotifyTypeBuilderImpl(BACnetNotifyTypeTagged notifyType) {
       this.notifyType = notifyType;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNotifyType build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNotifyType bACnetConstructedDataNotifyType =
-          new BACnetConstructedDataNotifyType(
-              openingTag, peekedTagHeader, closingTag, notifyType, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataNotifyType(openingTag, peekedTagHeader, closingTag, notifyType);
       return bACnetConstructedDataNotifyType;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNumberOfAPDURetries.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNumberOfAPDURetries.java
index 83b29bab606..d97d3ec2d8b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNumberOfAPDURetries.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNumberOfAPDURetries.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger numberOfApduRetries;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNumberOfAPDURetries(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger numberOfApduRetries,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger numberOfApduRetries) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfApduRetries = numberOfApduRetries;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfApduRetries() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNumberOfAPDURetries");
     // Create the instance
-    return new BACnetConstructedDataNumberOfAPDURetriesBuilderImpl(
-        numberOfApduRetries, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNumberOfAPDURetriesBuilderImpl(numberOfApduRetries);
   }
 
   public static class BACnetConstructedDataNumberOfAPDURetriesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfApduRetries;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataNumberOfAPDURetriesBuilderImpl(
-        BACnetApplicationTagUnsignedInteger numberOfApduRetries,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger numberOfApduRetries) {
       this.numberOfApduRetries = numberOfApduRetries;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNumberOfAPDURetries build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNumberOfAPDURetries bACnetConstructedDataNumberOfAPDURetries =
           new BACnetConstructedDataNumberOfAPDURetries(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfApduRetries,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfApduRetries);
       return bACnetConstructedDataNumberOfAPDURetries;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNumberOfAuthenticationPolicies.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNumberOfAuthenticationPolicies.java
index 4b32acf7578..af5ad28d349 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNumberOfAuthenticationPolicies.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNumberOfAuthenticationPolicies.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger numberOfAuthenticationPolicies;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNumberOfAuthenticationPolicies(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger numberOfAuthenticationPolicies,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger numberOfAuthenticationPolicies) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfAuthenticationPolicies = numberOfAuthenticationPolicies;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfAuthenticationPolicies() {
@@ -142,39 +134,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataNumberOfAuthenticationPolicies");
     // Create the instance
     return new BACnetConstructedDataNumberOfAuthenticationPoliciesBuilderImpl(
-        numberOfAuthenticationPolicies, tagNumber, arrayIndexArgument);
+        numberOfAuthenticationPolicies);
   }
 
   public static class BACnetConstructedDataNumberOfAuthenticationPoliciesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfAuthenticationPolicies;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataNumberOfAuthenticationPoliciesBuilderImpl(
-        BACnetApplicationTagUnsignedInteger numberOfAuthenticationPolicies,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger numberOfAuthenticationPolicies) {
       this.numberOfAuthenticationPolicies = numberOfAuthenticationPolicies;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNumberOfAuthenticationPolicies build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNumberOfAuthenticationPolicies
           bACnetConstructedDataNumberOfAuthenticationPolicies =
               new BACnetConstructedDataNumberOfAuthenticationPolicies(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  numberOfAuthenticationPolicies,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, numberOfAuthenticationPolicies);
       return bACnetConstructedDataNumberOfAuthenticationPolicies;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNumberOfStates.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNumberOfStates.java
index 12a8b61d92b..72eb503702c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNumberOfStates.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataNumberOfStates.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger numberOfState;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataNumberOfStates(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger numberOfState,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger numberOfState) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfState = numberOfState;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfState() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataNumberOfStates");
     // Create the instance
-    return new BACnetConstructedDataNumberOfStatesBuilderImpl(
-        numberOfState, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataNumberOfStatesBuilderImpl(numberOfState);
   }
 
   public static class BACnetConstructedDataNumberOfStatesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfState;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataNumberOfStatesBuilderImpl(
-        BACnetApplicationTagUnsignedInteger numberOfState,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger numberOfState) {
       this.numberOfState = numberOfState;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataNumberOfStates build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataNumberOfStates bACnetConstructedDataNumberOfStates =
           new BACnetConstructedDataNumberOfStates(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfState,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfState);
       return bACnetConstructedDataNumberOfStates;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectIdentifier.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectIdentifier.java
index e07c4a27555..75b21eb1b52 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectIdentifier.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectIdentifier.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagObjectIdentifier objectIdentifier;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataObjectIdentifier(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagObjectIdentifier objectIdentifier,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagObjectIdentifier objectIdentifier) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.objectIdentifier = objectIdentifier;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagObjectIdentifier getObjectIdentifier() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataObjectIdentifier");
     // Create the instance
-    return new BACnetConstructedDataObjectIdentifierBuilderImpl(
-        objectIdentifier, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataObjectIdentifierBuilderImpl(objectIdentifier);
   }
 
   public static class BACnetConstructedDataObjectIdentifierBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagObjectIdentifier objectIdentifier;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataObjectIdentifierBuilderImpl(
-        BACnetApplicationTagObjectIdentifier objectIdentifier,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagObjectIdentifier objectIdentifier) {
       this.objectIdentifier = objectIdentifier;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataObjectIdentifier build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataObjectIdentifier bACnetConstructedDataObjectIdentifier =
           new BACnetConstructedDataObjectIdentifier(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              objectIdentifier,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, objectIdentifier);
       return bACnetConstructedDataObjectIdentifier;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectList.java
index 45ca50f7d78..0c395472f15 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectList.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagObjectIdentifier> objectList;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataObjectList(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagObjectIdentifier> objectList,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagObjectIdentifier> objectList) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.objectList = objectList;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (objectList)
     writeComplexTypeArrayField("objectList", objectList, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataObjectList");
     // Create the instance
-    return new BACnetConstructedDataObjectListBuilderImpl(
-        numberOfDataElements, objectList, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataObjectListBuilderImpl(numberOfDataElements, objectList);
   }
 
   public static class BACnetConstructedDataObjectListBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagObjectIdentifier> objectList;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataObjectListBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagObjectIdentifier> objectList,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagObjectIdentifier> objectList) {
       this.numberOfDataElements = numberOfDataElements;
       this.objectList = objectList;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataObjectList build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataObjectList bACnetConstructedDataObjectList =
           new BACnetConstructedDataObjectList(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              objectList,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, objectList);
       return bACnetConstructedDataObjectList;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectName.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectName.java
index a558d7ad03d..a8f7091e64a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectName.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectName.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString objectName;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataObjectName(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString objectName,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString objectName) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.objectName = objectName;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getObjectName() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataObjectName");
     // Create the instance
-    return new BACnetConstructedDataObjectNameBuilderImpl(
-        objectName, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataObjectNameBuilderImpl(objectName);
   }
 
   public static class BACnetConstructedDataObjectNameBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString objectName;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataObjectNameBuilderImpl(
-        BACnetApplicationTagCharacterString objectName,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString objectName) {
       this.objectName = objectName;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataObjectName build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataObjectName bACnetConstructedDataObjectName =
-          new BACnetConstructedDataObjectName(
-              openingTag, peekedTagHeader, closingTag, objectName, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataObjectName(openingTag, peekedTagHeader, closingTag, objectName);
       return bACnetConstructedDataObjectName;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectPropertyReference.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectPropertyReference.java
index 7f3b74a7ca5..bbdf719b630 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectPropertyReference.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectPropertyReference.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDeviceObjectPropertyReference propertyReference;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataObjectPropertyReference(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDeviceObjectPropertyReference propertyReference,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDeviceObjectPropertyReference propertyReference) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.propertyReference = propertyReference;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDeviceObjectPropertyReference getPropertyReference() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataObjectPropertyReference");
     // Create the instance
-    return new BACnetConstructedDataObjectPropertyReferenceBuilderImpl(
-        propertyReference, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataObjectPropertyReferenceBuilderImpl(propertyReference);
   }
 
   public static class BACnetConstructedDataObjectPropertyReferenceBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDeviceObjectPropertyReference propertyReference;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataObjectPropertyReferenceBuilderImpl(
-        BACnetDeviceObjectPropertyReference propertyReference,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDeviceObjectPropertyReference propertyReference) {
       this.propertyReference = propertyReference;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataObjectPropertyReference build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataObjectPropertyReference bACnetConstructedDataObjectPropertyReference =
           new BACnetConstructedDataObjectPropertyReference(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              propertyReference,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, propertyReference);
       return bACnetConstructedDataObjectPropertyReference;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectType.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectType.java
index c90113d89e7..a95c3f31f58 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectType.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataObjectType.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetObjectTypeTagged objectType;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataObjectType(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetObjectTypeTagged objectType,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetObjectTypeTagged objectType) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.objectType = objectType;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetObjectTypeTagged getObjectType() {
@@ -134,34 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataObjectType");
     // Create the instance
-    return new BACnetConstructedDataObjectTypeBuilderImpl(
-        objectType, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataObjectTypeBuilderImpl(objectType);
   }
 
   public static class BACnetConstructedDataObjectTypeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetObjectTypeTagged objectType;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataObjectTypeBuilderImpl(
-        BACnetObjectTypeTagged objectType,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataObjectTypeBuilderImpl(BACnetObjectTypeTagged objectType) {
       this.objectType = objectType;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataObjectType build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataObjectType bACnetConstructedDataObjectType =
-          new BACnetConstructedDataObjectType(
-              openingTag, peekedTagHeader, closingTag, objectType, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataObjectType(openingTag, peekedTagHeader, closingTag, objectType);
       return bACnetConstructedDataObjectType;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyCount.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyCount.java
index 62d3132b486..7c024de95f7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyCount.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyCount.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger occupancyCount;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOccupancyCount(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger occupancyCount,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger occupancyCount) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.occupancyCount = occupancyCount;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getOccupancyCount() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataOccupancyCount");
     // Create the instance
-    return new BACnetConstructedDataOccupancyCountBuilderImpl(
-        occupancyCount, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataOccupancyCountBuilderImpl(occupancyCount);
   }
 
   public static class BACnetConstructedDataOccupancyCountBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger occupancyCount;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataOccupancyCountBuilderImpl(
-        BACnetApplicationTagUnsignedInteger occupancyCount,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger occupancyCount) {
       this.occupancyCount = occupancyCount;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataOccupancyCount build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOccupancyCount bACnetConstructedDataOccupancyCount =
           new BACnetConstructedDataOccupancyCount(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              occupancyCount,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, occupancyCount);
       return bACnetConstructedDataOccupancyCount;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyCountAdjust.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyCountAdjust.java
index ba4bfd8aefb..908a8f681e9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyCountAdjust.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyCountAdjust.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean occupancyCountAdjust;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOccupancyCountAdjust(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean occupancyCountAdjust,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean occupancyCountAdjust) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.occupancyCountAdjust = occupancyCountAdjust;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getOccupancyCountAdjust() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataOccupancyCountAdjust");
     // Create the instance
-    return new BACnetConstructedDataOccupancyCountAdjustBuilderImpl(
-        occupancyCountAdjust, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataOccupancyCountAdjustBuilderImpl(occupancyCountAdjust);
   }
 
   public static class BACnetConstructedDataOccupancyCountAdjustBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean occupancyCountAdjust;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataOccupancyCountAdjustBuilderImpl(
-        BACnetApplicationTagBoolean occupancyCountAdjust,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean occupancyCountAdjust) {
       this.occupancyCountAdjust = occupancyCountAdjust;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataOccupancyCountAdjust build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOccupancyCountAdjust bACnetConstructedDataOccupancyCountAdjust =
           new BACnetConstructedDataOccupancyCountAdjust(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              occupancyCountAdjust,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, occupancyCountAdjust);
       return bACnetConstructedDataOccupancyCountAdjust;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyCountEnable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyCountEnable.java
index 62d0321141a..3112460ca3c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyCountEnable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyCountEnable.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean occupancyCountEnable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOccupancyCountEnable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean occupancyCountEnable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean occupancyCountEnable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.occupancyCountEnable = occupancyCountEnable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getOccupancyCountEnable() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataOccupancyCountEnable");
     // Create the instance
-    return new BACnetConstructedDataOccupancyCountEnableBuilderImpl(
-        occupancyCountEnable, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataOccupancyCountEnableBuilderImpl(occupancyCountEnable);
   }
 
   public static class BACnetConstructedDataOccupancyCountEnableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean occupancyCountEnable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataOccupancyCountEnableBuilderImpl(
-        BACnetApplicationTagBoolean occupancyCountEnable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean occupancyCountEnable) {
       this.occupancyCountEnable = occupancyCountEnable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataOccupancyCountEnable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOccupancyCountEnable bACnetConstructedDataOccupancyCountEnable =
           new BACnetConstructedDataOccupancyCountEnable(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              occupancyCountEnable,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, occupancyCountEnable);
       return bACnetConstructedDataOccupancyCountEnable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyLowerLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyLowerLimit.java
index 3f72da84c22..e60aa421c08 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyLowerLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyLowerLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger occupancyLowerLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOccupancyLowerLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger occupancyLowerLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger occupancyLowerLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.occupancyLowerLimit = occupancyLowerLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getOccupancyLowerLimit() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataOccupancyLowerLimit");
     // Create the instance
-    return new BACnetConstructedDataOccupancyLowerLimitBuilderImpl(
-        occupancyLowerLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataOccupancyLowerLimitBuilderImpl(occupancyLowerLimit);
   }
 
   public static class BACnetConstructedDataOccupancyLowerLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger occupancyLowerLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataOccupancyLowerLimitBuilderImpl(
-        BACnetApplicationTagUnsignedInteger occupancyLowerLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger occupancyLowerLimit) {
       this.occupancyLowerLimit = occupancyLowerLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataOccupancyLowerLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOccupancyLowerLimit bACnetConstructedDataOccupancyLowerLimit =
           new BACnetConstructedDataOccupancyLowerLimit(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              occupancyLowerLimit,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, occupancyLowerLimit);
       return bACnetConstructedDataOccupancyLowerLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyLowerLimitEnforced.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyLowerLimitEnforced.java
index bbc9eb85f2d..e2d01e85810 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyLowerLimitEnforced.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyLowerLimitEnforced.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean occupancyLowerLimitEnforced;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOccupancyLowerLimitEnforced(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean occupancyLowerLimitEnforced,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean occupancyLowerLimitEnforced) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.occupancyLowerLimitEnforced = occupancyLowerLimitEnforced;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getOccupancyLowerLimitEnforced() {
@@ -136,39 +128,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataOccupancyLowerLimitEnforced");
     // Create the instance
     return new BACnetConstructedDataOccupancyLowerLimitEnforcedBuilderImpl(
-        occupancyLowerLimitEnforced, tagNumber, arrayIndexArgument);
+        occupancyLowerLimitEnforced);
   }
 
   public static class BACnetConstructedDataOccupancyLowerLimitEnforcedBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean occupancyLowerLimitEnforced;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataOccupancyLowerLimitEnforcedBuilderImpl(
-        BACnetApplicationTagBoolean occupancyLowerLimitEnforced,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean occupancyLowerLimitEnforced) {
       this.occupancyLowerLimitEnforced = occupancyLowerLimitEnforced;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataOccupancyLowerLimitEnforced build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOccupancyLowerLimitEnforced
           bACnetConstructedDataOccupancyLowerLimitEnforced =
               new BACnetConstructedDataOccupancyLowerLimitEnforced(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  occupancyLowerLimitEnforced,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, occupancyLowerLimitEnforced);
       return bACnetConstructedDataOccupancyLowerLimitEnforced;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyState.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyState.java
index 5e9e5656dad..681c75e6848 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyState.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyState.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetAccessZoneOccupancyStateTagged occupancyState;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOccupancyState(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetAccessZoneOccupancyStateTagged occupancyState,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetAccessZoneOccupancyStateTagged occupancyState) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.occupancyState = occupancyState;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetAccessZoneOccupancyStateTagged getOccupancyState() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataOccupancyState");
     // Create the instance
-    return new BACnetConstructedDataOccupancyStateBuilderImpl(
-        occupancyState, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataOccupancyStateBuilderImpl(occupancyState);
   }
 
   public static class BACnetConstructedDataOccupancyStateBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetAccessZoneOccupancyStateTagged occupancyState;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataOccupancyStateBuilderImpl(
-        BACnetAccessZoneOccupancyStateTagged occupancyState,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetAccessZoneOccupancyStateTagged occupancyState) {
       this.occupancyState = occupancyState;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataOccupancyState build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOccupancyState bACnetConstructedDataOccupancyState =
           new BACnetConstructedDataOccupancyState(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              occupancyState,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, occupancyState);
       return bACnetConstructedDataOccupancyState;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyUpperLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyUpperLimit.java
index 6aa2ba20862..338e51993ea 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyUpperLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyUpperLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger occupancyUpperLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOccupancyUpperLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger occupancyUpperLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger occupancyUpperLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.occupancyUpperLimit = occupancyUpperLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getOccupancyUpperLimit() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataOccupancyUpperLimit");
     // Create the instance
-    return new BACnetConstructedDataOccupancyUpperLimitBuilderImpl(
-        occupancyUpperLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataOccupancyUpperLimitBuilderImpl(occupancyUpperLimit);
   }
 
   public static class BACnetConstructedDataOccupancyUpperLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger occupancyUpperLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataOccupancyUpperLimitBuilderImpl(
-        BACnetApplicationTagUnsignedInteger occupancyUpperLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger occupancyUpperLimit) {
       this.occupancyUpperLimit = occupancyUpperLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataOccupancyUpperLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOccupancyUpperLimit bACnetConstructedDataOccupancyUpperLimit =
           new BACnetConstructedDataOccupancyUpperLimit(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              occupancyUpperLimit,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, occupancyUpperLimit);
       return bACnetConstructedDataOccupancyUpperLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyUpperLimitEnforced.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyUpperLimitEnforced.java
index 9576edf8a5b..ecd51c5f84b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyUpperLimitEnforced.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOccupancyUpperLimitEnforced.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean occupancyUpperLimitEnforced;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOccupancyUpperLimitEnforced(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean occupancyUpperLimitEnforced,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean occupancyUpperLimitEnforced) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.occupancyUpperLimitEnforced = occupancyUpperLimitEnforced;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getOccupancyUpperLimitEnforced() {
@@ -136,39 +128,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataOccupancyUpperLimitEnforced");
     // Create the instance
     return new BACnetConstructedDataOccupancyUpperLimitEnforcedBuilderImpl(
-        occupancyUpperLimitEnforced, tagNumber, arrayIndexArgument);
+        occupancyUpperLimitEnforced);
   }
 
   public static class BACnetConstructedDataOccupancyUpperLimitEnforcedBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean occupancyUpperLimitEnforced;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataOccupancyUpperLimitEnforcedBuilderImpl(
-        BACnetApplicationTagBoolean occupancyUpperLimitEnforced,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean occupancyUpperLimitEnforced) {
       this.occupancyUpperLimitEnforced = occupancyUpperLimitEnforced;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataOccupancyUpperLimitEnforced build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOccupancyUpperLimitEnforced
           bACnetConstructedDataOccupancyUpperLimitEnforced =
               new BACnetConstructedDataOccupancyUpperLimitEnforced(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  occupancyUpperLimitEnforced,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, occupancyUpperLimitEnforced);
       return bACnetConstructedDataOccupancyUpperLimitEnforced;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOctetStringValuePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOctetStringValuePresentValue.java
index 551578c2b10..073008c740b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOctetStringValuePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOctetStringValuePresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagOctetString presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOctetStringValuePresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagOctetString presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagOctetString presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagOctetString getPresentValue() {
@@ -134,40 +126,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataOctetStringValuePresentValue");
     // Create the instance
-    return new BACnetConstructedDataOctetStringValuePresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataOctetStringValuePresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataOctetStringValuePresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagOctetString presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataOctetStringValuePresentValueBuilderImpl(
-        BACnetApplicationTagOctetString presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagOctetString presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataOctetStringValuePresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOctetStringValuePresentValue
           bACnetConstructedDataOctetStringValuePresentValue =
               new BACnetConstructedDataOctetStringValuePresentValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  presentValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataOctetStringValuePresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOctetStringValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOctetStringValueRelinquishDefault.java
index f6c764e31dd..997267f2f30 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOctetStringValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOctetStringValueRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOctetStringValueRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getRelinquishDefault() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataOctetStringValueRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataOctetStringValueRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataOctetStringValueRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataOctetStringValueRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataOctetStringValueRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagSignedInteger relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagSignedInteger relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataOctetStringValueRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOctetStringValueRelinquishDefault
           bACnetConstructedDataOctetStringValueRelinquishDefault =
               new BACnetConstructedDataOctetStringValueRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataOctetStringValueRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOctetstringValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOctetstringValueAll.java
index e594e81419f..0121f03679e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOctetstringValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOctetstringValueAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOctetstringValueAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataOctetstringValueAll");
     // Create the instance
-    return new BACnetConstructedDataOctetstringValueAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataOctetstringValueAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataOctetstringValueAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataOctetstringValueAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataOctetstringValueAllBuilderImpl() {}
 
     public BACnetConstructedDataOctetstringValueAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOctetstringValueAll bACnetConstructedDataOctetstringValueAll =
-          new BACnetConstructedDataOctetstringValueAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataOctetstringValueAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataOctetstringValueAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOperationDirection.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOperationDirection.java
index 2c97f0ff2a9..0b5515c12bc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOperationDirection.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOperationDirection.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetEscalatorOperationDirectionTagged operationDirection;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOperationDirection(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetEscalatorOperationDirectionTagged operationDirection,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetEscalatorOperationDirectionTagged operationDirection) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.operationDirection = operationDirection;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetEscalatorOperationDirectionTagged getOperationDirection() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataOperationDirection");
     // Create the instance
-    return new BACnetConstructedDataOperationDirectionBuilderImpl(
-        operationDirection, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataOperationDirectionBuilderImpl(operationDirection);
   }
 
   public static class BACnetConstructedDataOperationDirectionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetEscalatorOperationDirectionTagged operationDirection;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataOperationDirectionBuilderImpl(
-        BACnetEscalatorOperationDirectionTagged operationDirection,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetEscalatorOperationDirectionTagged operationDirection) {
       this.operationDirection = operationDirection;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataOperationDirection build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOperationDirection bACnetConstructedDataOperationDirection =
           new BACnetConstructedDataOperationDirection(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              operationDirection,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, operationDirection);
       return bACnetConstructedDataOperationDirection;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOperationExpected.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOperationExpected.java
index 0008182e0cd..28c957cec8b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOperationExpected.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOperationExpected.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLifeSafetyOperationTagged lifeSafetyOperations;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOperationExpected(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLifeSafetyOperationTagged lifeSafetyOperations,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLifeSafetyOperationTagged lifeSafetyOperations) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lifeSafetyOperations = lifeSafetyOperations;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLifeSafetyOperationTagged getLifeSafetyOperations() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataOperationExpected");
     // Create the instance
-    return new BACnetConstructedDataOperationExpectedBuilderImpl(
-        lifeSafetyOperations, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataOperationExpectedBuilderImpl(lifeSafetyOperations);
   }
 
   public static class BACnetConstructedDataOperationExpectedBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLifeSafetyOperationTagged lifeSafetyOperations;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataOperationExpectedBuilderImpl(
-        BACnetLifeSafetyOperationTagged lifeSafetyOperations,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetLifeSafetyOperationTagged lifeSafetyOperations) {
       this.lifeSafetyOperations = lifeSafetyOperations;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataOperationExpected build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOperationExpected bACnetConstructedDataOperationExpected =
           new BACnetConstructedDataOperationExpected(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              lifeSafetyOperations,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, lifeSafetyOperations);
       return bACnetConstructedDataOperationExpected;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOptional.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOptional.java
index ff7f59e7c41..6e0fad079db 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOptional.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOptional.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.OPTIONAL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOptional(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataOptional");
     // Create the instance
-    return new BACnetConstructedDataOptionalBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataOptionalBuilderImpl();
   }
 
   public static class BACnetConstructedDataOptionalBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataOptionalBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataOptionalBuilderImpl() {}
 
     public BACnetConstructedDataOptional build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOptional bACnetConstructedDataOptional =
-          new BACnetConstructedDataOptional(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataOptional(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataOptional;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOutOfService.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOutOfService.java
index 7fad670c095..29b5a6d98ba 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOutOfService.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOutOfService.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean outOfService;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOutOfService(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean outOfService,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean outOfService) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.outOfService = outOfService;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getOutOfService() {
@@ -132,34 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataOutOfService");
     // Create the instance
-    return new BACnetConstructedDataOutOfServiceBuilderImpl(
-        outOfService, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataOutOfServiceBuilderImpl(outOfService);
   }
 
   public static class BACnetConstructedDataOutOfServiceBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean outOfService;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataOutOfServiceBuilderImpl(
-        BACnetApplicationTagBoolean outOfService,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataOutOfServiceBuilderImpl(BACnetApplicationTagBoolean outOfService) {
       this.outOfService = outOfService;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataOutOfService build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOutOfService bACnetConstructedDataOutOfService =
           new BACnetConstructedDataOutOfService(
-              openingTag, peekedTagHeader, closingTag, outOfService, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, outOfService);
       return bACnetConstructedDataOutOfService;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOutputUnits.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOutputUnits.java
index 05c1ecc947e..1b74b747211 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOutputUnits.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataOutputUnits.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetEngineeringUnitsTagged units;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataOutputUnits(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetEngineeringUnitsTagged units,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetEngineeringUnitsTagged units) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.units = units;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetEngineeringUnitsTagged getUnits() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataOutputUnits");
     // Create the instance
-    return new BACnetConstructedDataOutputUnitsBuilderImpl(units, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataOutputUnitsBuilderImpl(units);
   }
 
   public static class BACnetConstructedDataOutputUnitsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetEngineeringUnitsTagged units;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataOutputUnitsBuilderImpl(
-        BACnetEngineeringUnitsTagged units,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataOutputUnitsBuilderImpl(BACnetEngineeringUnitsTagged units) {
       this.units = units;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataOutputUnits build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataOutputUnits bACnetConstructedDataOutputUnits =
-          new BACnetConstructedDataOutputUnits(
-              openingTag, peekedTagHeader, closingTag, units, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataOutputUnits(openingTag, peekedTagHeader, closingTag, units);
       return bACnetConstructedDataOutputUnits;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPacketReorderTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPacketReorderTime.java
index 9e387911f62..dbb67f5488f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPacketReorderTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPacketReorderTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger packetReorderTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPacketReorderTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger packetReorderTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger packetReorderTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.packetReorderTime = packetReorderTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getPacketReorderTime() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPacketReorderTime");
     // Create the instance
-    return new BACnetConstructedDataPacketReorderTimeBuilderImpl(
-        packetReorderTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPacketReorderTimeBuilderImpl(packetReorderTime);
   }
 
   public static class BACnetConstructedDataPacketReorderTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger packetReorderTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPacketReorderTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger packetReorderTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger packetReorderTime) {
       this.packetReorderTime = packetReorderTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPacketReorderTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPacketReorderTime bACnetConstructedDataPacketReorderTime =
           new BACnetConstructedDataPacketReorderTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              packetReorderTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, packetReorderTime);
       return bACnetConstructedDataPacketReorderTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPassbackMode.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPassbackMode.java
index 2b8b199cdb1..3cd921bc1b3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPassbackMode.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPassbackMode.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetAccessPassbackModeTagged passbackMode;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPassbackMode(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetAccessPassbackModeTagged passbackMode,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetAccessPassbackModeTagged passbackMode) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.passbackMode = passbackMode;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetAccessPassbackModeTagged getPassbackMode() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPassbackMode");
     // Create the instance
-    return new BACnetConstructedDataPassbackModeBuilderImpl(
-        passbackMode, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPassbackModeBuilderImpl(passbackMode);
   }
 
   public static class BACnetConstructedDataPassbackModeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetAccessPassbackModeTagged passbackMode;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPassbackModeBuilderImpl(
-        BACnetAccessPassbackModeTagged passbackMode,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetAccessPassbackModeTagged passbackMode) {
       this.passbackMode = passbackMode;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPassbackMode build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPassbackMode bACnetConstructedDataPassbackMode =
           new BACnetConstructedDataPassbackMode(
-              openingTag, peekedTagHeader, closingTag, passbackMode, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, passbackMode);
       return bACnetConstructedDataPassbackMode;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPassbackTimeout.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPassbackTimeout.java
index 1bf559489e8..b2406457b56 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPassbackTimeout.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPassbackTimeout.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger passbackTimeout;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPassbackTimeout(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger passbackTimeout,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger passbackTimeout) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.passbackTimeout = passbackTimeout;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getPassbackTimeout() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPassbackTimeout");
     // Create the instance
-    return new BACnetConstructedDataPassbackTimeoutBuilderImpl(
-        passbackTimeout, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPassbackTimeoutBuilderImpl(passbackTimeout);
   }
 
   public static class BACnetConstructedDataPassbackTimeoutBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger passbackTimeout;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPassbackTimeoutBuilderImpl(
-        BACnetApplicationTagUnsignedInteger passbackTimeout,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger passbackTimeout) {
       this.passbackTimeout = passbackTimeout;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPassbackTimeout build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPassbackTimeout bACnetConstructedDataPassbackTimeout =
           new BACnetConstructedDataPassbackTimeout(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              passbackTimeout,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, passbackTimeout);
       return bACnetConstructedDataPassbackTimeout;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPassengerAlarm.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPassengerAlarm.java
index ff2f79a6fa5..c2e13365638 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPassengerAlarm.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPassengerAlarm.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean passengerAlarm;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPassengerAlarm(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean passengerAlarm,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean passengerAlarm) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.passengerAlarm = passengerAlarm;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getPassengerAlarm() {
@@ -132,39 +124,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPassengerAlarm");
     // Create the instance
-    return new BACnetConstructedDataPassengerAlarmBuilderImpl(
-        passengerAlarm, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPassengerAlarmBuilderImpl(passengerAlarm);
   }
 
   public static class BACnetConstructedDataPassengerAlarmBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean passengerAlarm;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPassengerAlarmBuilderImpl(
-        BACnetApplicationTagBoolean passengerAlarm,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean passengerAlarm) {
       this.passengerAlarm = passengerAlarm;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPassengerAlarm build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPassengerAlarm bACnetConstructedDataPassengerAlarm =
           new BACnetConstructedDataPassengerAlarm(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              passengerAlarm,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, passengerAlarm);
       return bACnetConstructedDataPassengerAlarm;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPolarity.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPolarity.java
index 65685e99aaa..15af9ef1b6b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPolarity.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPolarity.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetPolarityTagged polarity;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPolarity(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetPolarityTagged polarity,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetPolarityTagged polarity) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.polarity = polarity;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetPolarityTagged getPolarity() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPolarity");
     // Create the instance
-    return new BACnetConstructedDataPolarityBuilderImpl(polarity, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPolarityBuilderImpl(polarity);
   }
 
   public static class BACnetConstructedDataPolarityBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetPolarityTagged polarity;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataPolarityBuilderImpl(
-        BACnetPolarityTagged polarity,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataPolarityBuilderImpl(BACnetPolarityTagged polarity) {
       this.polarity = polarity;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPolarity build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPolarity bACnetConstructedDataPolarity =
-          new BACnetConstructedDataPolarity(
-              openingTag, peekedTagHeader, closingTag, polarity, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataPolarity(openingTag, peekedTagHeader, closingTag, polarity);
       return bACnetConstructedDataPolarity;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPortFilter.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPortFilter.java
index 420ca59136d..e79352b0f3f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPortFilter.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPortFilter.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetPortPermission> portFilter;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPortFilter(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetPortPermission> portFilter,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetPortPermission> portFilter) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.portFilter = portFilter;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (portFilter)
     writeComplexTypeArrayField("portFilter", portFilter, writeBuffer);
@@ -169,43 +157,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPortFilter");
     // Create the instance
-    return new BACnetConstructedDataPortFilterBuilderImpl(
-        numberOfDataElements, portFilter, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPortFilterBuilderImpl(numberOfDataElements, portFilter);
   }
 
   public static class BACnetConstructedDataPortFilterBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetPortPermission> portFilter;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPortFilterBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetPortPermission> portFilter,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetPortPermission> portFilter) {
       this.numberOfDataElements = numberOfDataElements;
       this.portFilter = portFilter;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPortFilter build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPortFilter bACnetConstructedDataPortFilter =
           new BACnetConstructedDataPortFilter(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              portFilter,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, portFilter);
       return bACnetConstructedDataPortFilter;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveAccessRules.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveAccessRules.java
index 040aad5c8c9..d523de097bf 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveAccessRules.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveAccessRules.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetAccessRule> positiveAccessRules;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPositiveAccessRules(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetAccessRule> positiveAccessRules,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetAccessRule> positiveAccessRules) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.positiveAccessRules = positiveAccessRules;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (positiveAccessRules)
     writeComplexTypeArrayField("positiveAccessRules", positiveAccessRules, writeBuffer);
@@ -171,42 +159,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataPositiveAccessRules");
     // Create the instance
     return new BACnetConstructedDataPositiveAccessRulesBuilderImpl(
-        numberOfDataElements, positiveAccessRules, tagNumber, arrayIndexArgument);
+        numberOfDataElements, positiveAccessRules);
   }
 
   public static class BACnetConstructedDataPositiveAccessRulesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetAccessRule> positiveAccessRules;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPositiveAccessRulesBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetAccessRule> positiveAccessRules,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetAccessRule> positiveAccessRules) {
       this.numberOfDataElements = numberOfDataElements;
       this.positiveAccessRules = positiveAccessRules;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPositiveAccessRules build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPositiveAccessRules bACnetConstructedDataPositiveAccessRules =
           new BACnetConstructedDataPositiveAccessRules(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              positiveAccessRules,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, positiveAccessRules);
       return bACnetConstructedDataPositiveAccessRules;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueAll.java
index af1d29269bf..5d19eaa2178 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPositiveIntegerValueAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,30 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPositiveIntegerValueAll");
     // Create the instance
-    return new BACnetConstructedDataPositiveIntegerValueAllBuilderImpl(
-        tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPositiveIntegerValueAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataPositiveIntegerValueAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataPositiveIntegerValueAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataPositiveIntegerValueAllBuilderImpl() {}
 
     public BACnetConstructedDataPositiveIntegerValueAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPositiveIntegerValueAll bACnetConstructedDataPositiveIntegerValueAll =
-          new BACnetConstructedDataPositiveIntegerValueAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataPositiveIntegerValueAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataPositiveIntegerValueAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueCOVIncrement.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueCOVIncrement.java
index c7fb8ff2716..e39766d1951 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueCOVIncrement.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueCOVIncrement.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger covIncrement;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPositiveIntegerValueCOVIncrement(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger covIncrement,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger covIncrement) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.covIncrement = covIncrement;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getCovIncrement() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPositiveIntegerValueCOVIncrement");
     // Create the instance
-    return new BACnetConstructedDataPositiveIntegerValueCOVIncrementBuilderImpl(
-        covIncrement, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPositiveIntegerValueCOVIncrementBuilderImpl(covIncrement);
   }
 
   public static class BACnetConstructedDataPositiveIntegerValueCOVIncrementBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger covIncrement;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPositiveIntegerValueCOVIncrementBuilderImpl(
-        BACnetApplicationTagUnsignedInteger covIncrement,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger covIncrement) {
       this.covIncrement = covIncrement;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPositiveIntegerValueCOVIncrement build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPositiveIntegerValueCOVIncrement
           bACnetConstructedDataPositiveIntegerValueCOVIncrement =
               new BACnetConstructedDataPositiveIntegerValueCOVIncrement(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  covIncrement,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, covIncrement);
       return bACnetConstructedDataPositiveIntegerValueCOVIncrement;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueDeadband.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueDeadband.java
index 63904c894de..b55ca893a13 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueDeadband.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueDeadband.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger deadband;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPositiveIntegerValueDeadband(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger deadband,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger deadband) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.deadband = deadband;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getDeadband() {
@@ -135,35 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPositiveIntegerValueDeadband");
     // Create the instance
-    return new BACnetConstructedDataPositiveIntegerValueDeadbandBuilderImpl(
-        deadband, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPositiveIntegerValueDeadbandBuilderImpl(deadband);
   }
 
   public static class BACnetConstructedDataPositiveIntegerValueDeadbandBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger deadband;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPositiveIntegerValueDeadbandBuilderImpl(
-        BACnetApplicationTagUnsignedInteger deadband,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger deadband) {
       this.deadband = deadband;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPositiveIntegerValueDeadband build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPositiveIntegerValueDeadband
           bACnetConstructedDataPositiveIntegerValueDeadband =
               new BACnetConstructedDataPositiveIntegerValueDeadband(
-                  openingTag, peekedTagHeader, closingTag, deadband, tagNumber, arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, deadband);
       return bACnetConstructedDataPositiveIntegerValueDeadband;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueFaultHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueFaultHighLimit.java
index 7ac4151dc31..723b2ea6d3b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueFaultHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueFaultHighLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger faultHighLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPositiveIntegerValueFaultHighLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger faultHighLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger faultHighLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultHighLimit = faultHighLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getFaultHighLimit() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPositiveIntegerValueFaultHighLimit");
     // Create the instance
-    return new BACnetConstructedDataPositiveIntegerValueFaultHighLimitBuilderImpl(
-        faultHighLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPositiveIntegerValueFaultHighLimitBuilderImpl(faultHighLimit);
   }
 
   public static class BACnetConstructedDataPositiveIntegerValueFaultHighLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger faultHighLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPositiveIntegerValueFaultHighLimitBuilderImpl(
-        BACnetApplicationTagUnsignedInteger faultHighLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger faultHighLimit) {
       this.faultHighLimit = faultHighLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPositiveIntegerValueFaultHighLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPositiveIntegerValueFaultHighLimit
           bACnetConstructedDataPositiveIntegerValueFaultHighLimit =
               new BACnetConstructedDataPositiveIntegerValueFaultHighLimit(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  faultHighLimit,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, faultHighLimit);
       return bACnetConstructedDataPositiveIntegerValueFaultHighLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueFaultLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueFaultLowLimit.java
index e1f219a667f..03ebb1d52dc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueFaultLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueFaultLowLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger faultLowLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPositiveIntegerValueFaultLowLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger faultLowLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger faultLowLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.faultLowLimit = faultLowLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getFaultLowLimit() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPositiveIntegerValueFaultLowLimit");
     // Create the instance
-    return new BACnetConstructedDataPositiveIntegerValueFaultLowLimitBuilderImpl(
-        faultLowLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPositiveIntegerValueFaultLowLimitBuilderImpl(faultLowLimit);
   }
 
   public static class BACnetConstructedDataPositiveIntegerValueFaultLowLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger faultLowLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPositiveIntegerValueFaultLowLimitBuilderImpl(
-        BACnetApplicationTagUnsignedInteger faultLowLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger faultLowLimit) {
       this.faultLowLimit = faultLowLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPositiveIntegerValueFaultLowLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPositiveIntegerValueFaultLowLimit
           bACnetConstructedDataPositiveIntegerValueFaultLowLimit =
               new BACnetConstructedDataPositiveIntegerValueFaultLowLimit(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  faultLowLimit,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, faultLowLimit);
       return bACnetConstructedDataPositiveIntegerValueFaultLowLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueHighLimit.java
index 2966dcdf1ef..d5f1207fe51 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueHighLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger highLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPositiveIntegerValueHighLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger highLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger highLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.highLimit = highLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getHighLimit() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPositiveIntegerValueHighLimit");
     // Create the instance
-    return new BACnetConstructedDataPositiveIntegerValueHighLimitBuilderImpl(
-        highLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPositiveIntegerValueHighLimitBuilderImpl(highLimit);
   }
 
   public static class BACnetConstructedDataPositiveIntegerValueHighLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger highLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPositiveIntegerValueHighLimitBuilderImpl(
-        BACnetApplicationTagUnsignedInteger highLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger highLimit) {
       this.highLimit = highLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPositiveIntegerValueHighLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPositiveIntegerValueHighLimit
           bACnetConstructedDataPositiveIntegerValueHighLimit =
               new BACnetConstructedDataPositiveIntegerValueHighLimit(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  highLimit,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, highLimit);
       return bACnetConstructedDataPositiveIntegerValueHighLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueLowLimit.java
index b610505ea21..93b598a8e8b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueLowLimit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger lowLimit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPositiveIntegerValueLowLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger lowLimit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger lowLimit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.lowLimit = lowLimit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getLowLimit() {
@@ -135,35 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPositiveIntegerValueLowLimit");
     // Create the instance
-    return new BACnetConstructedDataPositiveIntegerValueLowLimitBuilderImpl(
-        lowLimit, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPositiveIntegerValueLowLimitBuilderImpl(lowLimit);
   }
 
   public static class BACnetConstructedDataPositiveIntegerValueLowLimitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger lowLimit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPositiveIntegerValueLowLimitBuilderImpl(
-        BACnetApplicationTagUnsignedInteger lowLimit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger lowLimit) {
       this.lowLimit = lowLimit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPositiveIntegerValueLowLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPositiveIntegerValueLowLimit
           bACnetConstructedDataPositiveIntegerValueLowLimit =
               new BACnetConstructedDataPositiveIntegerValueLowLimit(
-                  openingTag, peekedTagHeader, closingTag, lowLimit, tagNumber, arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, lowLimit);
       return bACnetConstructedDataPositiveIntegerValueLowLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueMaxPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueMaxPresValue.java
index 8b79b7d57a8..f4403668eb9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueMaxPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueMaxPresValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger maxPresValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPositiveIntegerValueMaxPresValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger maxPresValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger maxPresValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxPresValue = maxPresValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMaxPresValue() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPositiveIntegerValueMaxPresValue");
     // Create the instance
-    return new BACnetConstructedDataPositiveIntegerValueMaxPresValueBuilderImpl(
-        maxPresValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPositiveIntegerValueMaxPresValueBuilderImpl(maxPresValue);
   }
 
   public static class BACnetConstructedDataPositiveIntegerValueMaxPresValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger maxPresValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPositiveIntegerValueMaxPresValueBuilderImpl(
-        BACnetApplicationTagUnsignedInteger maxPresValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger maxPresValue) {
       this.maxPresValue = maxPresValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPositiveIntegerValueMaxPresValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPositiveIntegerValueMaxPresValue
           bACnetConstructedDataPositiveIntegerValueMaxPresValue =
               new BACnetConstructedDataPositiveIntegerValueMaxPresValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  maxPresValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, maxPresValue);
       return bACnetConstructedDataPositiveIntegerValueMaxPresValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueMinPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueMinPresValue.java
index 2b23eb9b464..52182431790 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueMinPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueMinPresValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger minPresValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPositiveIntegerValueMinPresValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger minPresValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger minPresValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.minPresValue = minPresValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMinPresValue() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPositiveIntegerValueMinPresValue");
     // Create the instance
-    return new BACnetConstructedDataPositiveIntegerValueMinPresValueBuilderImpl(
-        minPresValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPositiveIntegerValueMinPresValueBuilderImpl(minPresValue);
   }
 
   public static class BACnetConstructedDataPositiveIntegerValueMinPresValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger minPresValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPositiveIntegerValueMinPresValueBuilderImpl(
-        BACnetApplicationTagUnsignedInteger minPresValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger minPresValue) {
       this.minPresValue = minPresValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPositiveIntegerValueMinPresValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPositiveIntegerValueMinPresValue
           bACnetConstructedDataPositiveIntegerValueMinPresValue =
               new BACnetConstructedDataPositiveIntegerValueMinPresValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  minPresValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, minPresValue);
       return bACnetConstructedDataPositiveIntegerValueMinPresValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueRelinquishDefault.java
index c63d45ed0b2..e28f07177b9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPositiveIntegerValueRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getRelinquishDefault() {
@@ -137,39 +129,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataPositiveIntegerValueRelinquishDefault");
     // Create the instance
     return new BACnetConstructedDataPositiveIntegerValueRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+        relinquishDefault);
   }
 
   public static class BACnetConstructedDataPositiveIntegerValueRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPositiveIntegerValueRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagUnsignedInteger relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPositiveIntegerValueRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPositiveIntegerValueRelinquishDefault
           bACnetConstructedDataPositiveIntegerValueRelinquishDefault =
               new BACnetConstructedDataPositiveIntegerValueRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataPositiveIntegerValueRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueResolution.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueResolution.java
index faf9b75bed8..519d7bcd819 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueResolution.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPositiveIntegerValueResolution.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger resolution;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPositiveIntegerValueResolution(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger resolution,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger resolution) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.resolution = resolution;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getResolution() {
@@ -135,40 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPositiveIntegerValueResolution");
     // Create the instance
-    return new BACnetConstructedDataPositiveIntegerValueResolutionBuilderImpl(
-        resolution, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPositiveIntegerValueResolutionBuilderImpl(resolution);
   }
 
   public static class BACnetConstructedDataPositiveIntegerValueResolutionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger resolution;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPositiveIntegerValueResolutionBuilderImpl(
-        BACnetApplicationTagUnsignedInteger resolution,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger resolution) {
       this.resolution = resolution;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPositiveIntegerValueResolution build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPositiveIntegerValueResolution
           bACnetConstructedDataPositiveIntegerValueResolution =
               new BACnetConstructedDataPositiveIntegerValueResolution(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  resolution,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, resolution);
       return bACnetConstructedDataPositiveIntegerValueResolution;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPower.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPower.java
index fdedd3884b5..b121e9a7655 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPower.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPower.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal power;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPower(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal power,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal power) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.power = power;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getPower() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPower");
     // Create the instance
-    return new BACnetConstructedDataPowerBuilderImpl(power, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPowerBuilderImpl(power);
   }
 
   public static class BACnetConstructedDataPowerBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal power;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataPowerBuilderImpl(
-        BACnetApplicationTagReal power,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataPowerBuilderImpl(BACnetApplicationTagReal power) {
       this.power = power;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPower build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPower bACnetConstructedDataPower =
-          new BACnetConstructedDataPower(
-              openingTag, peekedTagHeader, closingTag, power, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataPower(openingTag, peekedTagHeader, closingTag, power);
       return bACnetConstructedDataPower;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPowerMode.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPowerMode.java
index 47b80fc93f6..4083932e003 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPowerMode.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPowerMode.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean powerMode;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPowerMode(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean powerMode,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean powerMode) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.powerMode = powerMode;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getPowerMode() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPowerMode");
     // Create the instance
-    return new BACnetConstructedDataPowerModeBuilderImpl(powerMode, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPowerModeBuilderImpl(powerMode);
   }
 
   public static class BACnetConstructedDataPowerModeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean powerMode;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataPowerModeBuilderImpl(
-        BACnetApplicationTagBoolean powerMode,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataPowerModeBuilderImpl(BACnetApplicationTagBoolean powerMode) {
       this.powerMode = powerMode;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPowerMode build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPowerMode bACnetConstructedDataPowerMode =
-          new BACnetConstructedDataPowerMode(
-              openingTag, peekedTagHeader, closingTag, powerMode, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataPowerMode(openingTag, peekedTagHeader, closingTag, powerMode);
       return bACnetConstructedDataPowerMode;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPrescale.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPrescale.java
index 1d0e68fbfd8..c3ab2dab045 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPrescale.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPrescale.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetPrescale prescale;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPrescale(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetPrescale prescale,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetPrescale prescale) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.prescale = prescale;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetPrescale getPrescale() {
@@ -128,33 +120,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPrescale");
     // Create the instance
-    return new BACnetConstructedDataPrescaleBuilderImpl(prescale, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPrescaleBuilderImpl(prescale);
   }
 
   public static class BACnetConstructedDataPrescaleBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetPrescale prescale;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataPrescaleBuilderImpl(
-        BACnetPrescale prescale,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataPrescaleBuilderImpl(BACnetPrescale prescale) {
       this.prescale = prescale;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPrescale build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPrescale bACnetConstructedDataPrescale =
-          new BACnetConstructedDataPrescale(
-              openingTag, peekedTagHeader, closingTag, prescale, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataPrescale(openingTag, peekedTagHeader, closingTag, prescale);
       return bACnetConstructedDataPrescale;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPresentValue.java
index f1e46ebc4ac..df58b543e2e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPresentValue.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getPresentValue() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPresentValue");
     // Create the instance
-    return new BACnetConstructedDataPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPresentValueBuilderImpl(
-        BACnetApplicationTagUnsignedInteger presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPresentValue bACnetConstructedDataPresentValue =
           new BACnetConstructedDataPresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPriority.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPriority.java
index c22f5504eae..86a4b9a6980 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPriority.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPriority.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagUnsignedInteger> priority;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPriority(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagUnsignedInteger> priority,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagUnsignedInteger> priority) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.priority = priority;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (priority)
     writeComplexTypeArrayField("priority", priority, writeBuffer);
@@ -177,43 +165,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPriority");
     // Create the instance
-    return new BACnetConstructedDataPriorityBuilderImpl(
-        numberOfDataElements, priority, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPriorityBuilderImpl(numberOfDataElements, priority);
   }
 
   public static class BACnetConstructedDataPriorityBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagUnsignedInteger> priority;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPriorityBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagUnsignedInteger> priority,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagUnsignedInteger> priority) {
       this.numberOfDataElements = numberOfDataElements;
       this.priority = priority;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPriority build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPriority bACnetConstructedDataPriority =
           new BACnetConstructedDataPriority(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              priority,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, priority);
       return bACnetConstructedDataPriority;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPriorityArray.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPriorityArray.java
index e3eb724f3dd..3443b38a919 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPriorityArray.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPriorityArray.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetPriorityArray priorityArray;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPriorityArray(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetPriorityArray priorityArray,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetPriorityArray priorityArray) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.priorityArray = priorityArray;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetPriorityArray getPriorityArray() {
@@ -137,39 +129,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPriorityArray");
     // Create the instance
-    return new BACnetConstructedDataPriorityArrayBuilderImpl(
-        priorityArray, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPriorityArrayBuilderImpl(priorityArray);
   }
 
   public static class BACnetConstructedDataPriorityArrayBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetPriorityArray priorityArray;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataPriorityArrayBuilderImpl(
-        BACnetPriorityArray priorityArray,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataPriorityArrayBuilderImpl(BACnetPriorityArray priorityArray) {
       this.priorityArray = priorityArray;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPriorityArray build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPriorityArray bACnetConstructedDataPriorityArray =
           new BACnetConstructedDataPriorityArray(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              priorityArray,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, priorityArray);
       return bACnetConstructedDataPriorityArray;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPriorityForWriting.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPriorityForWriting.java
index 6c0131175bc..6c594aa9bf0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPriorityForWriting.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPriorityForWriting.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger priorityForWriting;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPriorityForWriting(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger priorityForWriting,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger priorityForWriting) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.priorityForWriting = priorityForWriting;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getPriorityForWriting() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPriorityForWriting");
     // Create the instance
-    return new BACnetConstructedDataPriorityForWritingBuilderImpl(
-        priorityForWriting, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPriorityForWritingBuilderImpl(priorityForWriting);
   }
 
   public static class BACnetConstructedDataPriorityForWritingBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger priorityForWriting;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPriorityForWritingBuilderImpl(
-        BACnetApplicationTagUnsignedInteger priorityForWriting,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger priorityForWriting) {
       this.priorityForWriting = priorityForWriting;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPriorityForWriting build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPriorityForWriting bACnetConstructedDataPriorityForWriting =
           new BACnetConstructedDataPriorityForWriting(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              priorityForWriting,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, priorityForWriting);
       return bACnetConstructedDataPriorityForWriting;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProcessIdentifier.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProcessIdentifier.java
index ec1111f96b0..0103471217b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProcessIdentifier.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProcessIdentifier.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger processIdentifier;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataProcessIdentifier(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger processIdentifier,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger processIdentifier) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.processIdentifier = processIdentifier;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getProcessIdentifier() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataProcessIdentifier");
     // Create the instance
-    return new BACnetConstructedDataProcessIdentifierBuilderImpl(
-        processIdentifier, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataProcessIdentifierBuilderImpl(processIdentifier);
   }
 
   public static class BACnetConstructedDataProcessIdentifierBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger processIdentifier;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataProcessIdentifierBuilderImpl(
-        BACnetApplicationTagUnsignedInteger processIdentifier,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger processIdentifier) {
       this.processIdentifier = processIdentifier;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataProcessIdentifier build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataProcessIdentifier bACnetConstructedDataProcessIdentifier =
           new BACnetConstructedDataProcessIdentifier(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              processIdentifier,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, processIdentifier);
       return bACnetConstructedDataProcessIdentifier;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProcessIdentifierFilter.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProcessIdentifierFilter.java
index 84d47d000d0..c44bb30819b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProcessIdentifierFilter.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProcessIdentifierFilter.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetProcessIdSelection processIdentifierFilter;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataProcessIdentifierFilter(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetProcessIdSelection processIdentifierFilter,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetProcessIdSelection processIdentifierFilter) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.processIdentifierFilter = processIdentifierFilter;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetProcessIdSelection getProcessIdentifierFilter() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataProcessIdentifierFilter");
     // Create the instance
-    return new BACnetConstructedDataProcessIdentifierFilterBuilderImpl(
-        processIdentifierFilter, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataProcessIdentifierFilterBuilderImpl(processIdentifierFilter);
   }
 
   public static class BACnetConstructedDataProcessIdentifierFilterBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetProcessIdSelection processIdentifierFilter;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataProcessIdentifierFilterBuilderImpl(
-        BACnetProcessIdSelection processIdentifierFilter,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetProcessIdSelection processIdentifierFilter) {
       this.processIdentifierFilter = processIdentifierFilter;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataProcessIdentifierFilter build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataProcessIdentifierFilter bACnetConstructedDataProcessIdentifierFilter =
           new BACnetConstructedDataProcessIdentifierFilter(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              processIdentifierFilter,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, processIdentifierFilter);
       return bACnetConstructedDataProcessIdentifierFilter;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProfileLocation.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProfileLocation.java
index 3bf063fafe5..6462bbda858 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProfileLocation.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProfileLocation.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString profileLocation;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataProfileLocation(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString profileLocation,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString profileLocation) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.profileLocation = profileLocation;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getProfileLocation() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataProfileLocation");
     // Create the instance
-    return new BACnetConstructedDataProfileLocationBuilderImpl(
-        profileLocation, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataProfileLocationBuilderImpl(profileLocation);
   }
 
   public static class BACnetConstructedDataProfileLocationBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString profileLocation;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataProfileLocationBuilderImpl(
-        BACnetApplicationTagCharacterString profileLocation,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString profileLocation) {
       this.profileLocation = profileLocation;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataProfileLocation build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataProfileLocation bACnetConstructedDataProfileLocation =
           new BACnetConstructedDataProfileLocation(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              profileLocation,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, profileLocation);
       return bACnetConstructedDataProfileLocation;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProfileName.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProfileName.java
index 6d680ec8ccf..a7f9d9c1ba9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProfileName.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProfileName.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString profileName;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataProfileName(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString profileName,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString profileName) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.profileName = profileName;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getProfileName() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataProfileName");
     // Create the instance
-    return new BACnetConstructedDataProfileNameBuilderImpl(
-        profileName, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataProfileNameBuilderImpl(profileName);
   }
 
   public static class BACnetConstructedDataProfileNameBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString profileName;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataProfileNameBuilderImpl(
-        BACnetApplicationTagCharacterString profileName,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString profileName) {
       this.profileName = profileName;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataProfileName build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataProfileName bACnetConstructedDataProfileName =
           new BACnetConstructedDataProfileName(
-              openingTag, peekedTagHeader, closingTag, profileName, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, profileName);
       return bACnetConstructedDataProfileName;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramAll.java
index d1e85632b07..631726bd384 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataProgramAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataProgramAll");
     // Create the instance
-    return new BACnetConstructedDataProgramAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataProgramAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataProgramAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataProgramAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataProgramAllBuilderImpl() {}
 
     public BACnetConstructedDataProgramAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataProgramAll bACnetConstructedDataProgramAll =
-          new BACnetConstructedDataProgramAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataProgramAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataProgramAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramChange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramChange.java
index f5b5db067b6..494e2da5b98 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramChange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramChange.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetProgramRequestTagged programChange;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataProgramChange(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetProgramRequestTagged programChange,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetProgramRequestTagged programChange) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.programChange = programChange;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetProgramRequestTagged getProgramChange() {
@@ -134,39 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataProgramChange");
     // Create the instance
-    return new BACnetConstructedDataProgramChangeBuilderImpl(
-        programChange, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataProgramChangeBuilderImpl(programChange);
   }
 
   public static class BACnetConstructedDataProgramChangeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetProgramRequestTagged programChange;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataProgramChangeBuilderImpl(
-        BACnetProgramRequestTagged programChange,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataProgramChangeBuilderImpl(BACnetProgramRequestTagged programChange) {
       this.programChange = programChange;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataProgramChange build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataProgramChange bACnetConstructedDataProgramChange =
           new BACnetConstructedDataProgramChange(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              programChange,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, programChange);
       return bACnetConstructedDataProgramChange;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramLocation.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramLocation.java
index 99353aa62d2..64153a48dbf 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramLocation.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramLocation.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString programLocation;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataProgramLocation(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString programLocation,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString programLocation) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.programLocation = programLocation;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getProgramLocation() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataProgramLocation");
     // Create the instance
-    return new BACnetConstructedDataProgramLocationBuilderImpl(
-        programLocation, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataProgramLocationBuilderImpl(programLocation);
   }
 
   public static class BACnetConstructedDataProgramLocationBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString programLocation;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataProgramLocationBuilderImpl(
-        BACnetApplicationTagCharacterString programLocation,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString programLocation) {
       this.programLocation = programLocation;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataProgramLocation build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataProgramLocation bACnetConstructedDataProgramLocation =
           new BACnetConstructedDataProgramLocation(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              programLocation,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, programLocation);
       return bACnetConstructedDataProgramLocation;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramState.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramState.java
index 752ddab948d..3ab5c0299aa 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramState.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProgramState.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetProgramStateTagged programState;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataProgramState(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetProgramStateTagged programState,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetProgramStateTagged programState) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.programState = programState;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetProgramStateTagged getProgramState() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataProgramState");
     // Create the instance
-    return new BACnetConstructedDataProgramStateBuilderImpl(
-        programState, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataProgramStateBuilderImpl(programState);
   }
 
   public static class BACnetConstructedDataProgramStateBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetProgramStateTagged programState;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataProgramStateBuilderImpl(
-        BACnetProgramStateTagged programState,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataProgramStateBuilderImpl(BACnetProgramStateTagged programState) {
       this.programState = programState;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataProgramState build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataProgramState bACnetConstructedDataProgramState =
           new BACnetConstructedDataProgramState(
-              openingTag, peekedTagHeader, closingTag, programState, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, programState);
       return bACnetConstructedDataProgramState;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPropertyList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPropertyList.java
index 61419043819..1463bc09da5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPropertyList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPropertyList.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetPropertyIdentifierTagged> propertyList;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPropertyList(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetPropertyIdentifierTagged> propertyList,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetPropertyIdentifierTagged> propertyList) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.propertyList = propertyList;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (propertyList)
     writeComplexTypeArrayField("propertyList", propertyList, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPropertyList");
     // Create the instance
-    return new BACnetConstructedDataPropertyListBuilderImpl(
-        numberOfDataElements, propertyList, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPropertyListBuilderImpl(numberOfDataElements, propertyList);
   }
 
   public static class BACnetConstructedDataPropertyListBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetPropertyIdentifierTagged> propertyList;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPropertyListBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetPropertyIdentifierTagged> propertyList,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetPropertyIdentifierTagged> propertyList) {
       this.numberOfDataElements = numberOfDataElements;
       this.propertyList = propertyList;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPropertyList build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPropertyList bACnetConstructedDataPropertyList =
           new BACnetConstructedDataPropertyList(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              propertyList,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, propertyList);
       return bACnetConstructedDataPropertyList;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProportionalConstant.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProportionalConstant.java
index 957ec1d35cf..4c0521682d3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProportionalConstant.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProportionalConstant.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal proportionalConstant;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataProportionalConstant(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal proportionalConstant,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal proportionalConstant) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.proportionalConstant = proportionalConstant;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getProportionalConstant() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataProportionalConstant");
     // Create the instance
-    return new BACnetConstructedDataProportionalConstantBuilderImpl(
-        proportionalConstant, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataProportionalConstantBuilderImpl(proportionalConstant);
   }
 
   public static class BACnetConstructedDataProportionalConstantBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal proportionalConstant;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataProportionalConstantBuilderImpl(
-        BACnetApplicationTagReal proportionalConstant,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal proportionalConstant) {
       this.proportionalConstant = proportionalConstant;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataProportionalConstant build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataProportionalConstant bACnetConstructedDataProportionalConstant =
           new BACnetConstructedDataProportionalConstant(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              proportionalConstant,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, proportionalConstant);
       return bACnetConstructedDataProportionalConstant;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProportionalConstantUnits.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProportionalConstantUnits.java
index 3a9b7f5f11f..d6bab47e5dd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProportionalConstantUnits.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProportionalConstantUnits.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetEngineeringUnitsTagged units;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataProportionalConstantUnits(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetEngineeringUnitsTagged units,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetEngineeringUnitsTagged units) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.units = units;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetEngineeringUnitsTagged getUnits() {
@@ -135,35 +127,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataProportionalConstantUnits");
     // Create the instance
-    return new BACnetConstructedDataProportionalConstantUnitsBuilderImpl(
-        units, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataProportionalConstantUnitsBuilderImpl(units);
   }
 
   public static class BACnetConstructedDataProportionalConstantUnitsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetEngineeringUnitsTagged units;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataProportionalConstantUnitsBuilderImpl(
-        BACnetEngineeringUnitsTagged units,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetEngineeringUnitsTagged units) {
       this.units = units;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataProportionalConstantUnits build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataProportionalConstantUnits
           bACnetConstructedDataProportionalConstantUnits =
               new BACnetConstructedDataProportionalConstantUnits(
-                  openingTag, peekedTagHeader, closingTag, units, tagNumber, arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, units);
       return bACnetConstructedDataProportionalConstantUnits;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolLevel.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolLevel.java
index 3fd14df52e6..b49e97153cc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolLevel.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolLevel.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetProtocolLevelTagged protocolLevel;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataProtocolLevel(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetProtocolLevelTagged protocolLevel,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetProtocolLevelTagged protocolLevel) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.protocolLevel = protocolLevel;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetProtocolLevelTagged getProtocolLevel() {
@@ -134,39 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataProtocolLevel");
     // Create the instance
-    return new BACnetConstructedDataProtocolLevelBuilderImpl(
-        protocolLevel, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataProtocolLevelBuilderImpl(protocolLevel);
   }
 
   public static class BACnetConstructedDataProtocolLevelBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetProtocolLevelTagged protocolLevel;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataProtocolLevelBuilderImpl(
-        BACnetProtocolLevelTagged protocolLevel,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataProtocolLevelBuilderImpl(BACnetProtocolLevelTagged protocolLevel) {
       this.protocolLevel = protocolLevel;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataProtocolLevel build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataProtocolLevel bACnetConstructedDataProtocolLevel =
           new BACnetConstructedDataProtocolLevel(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              protocolLevel,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, protocolLevel);
       return bACnetConstructedDataProtocolLevel;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolObjectTypesSupported.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolObjectTypesSupported.java
index 6f1339ec690..59a57175724 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolObjectTypesSupported.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolObjectTypesSupported.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetObjectTypesSupportedTagged protocolObjectTypesSupported;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataProtocolObjectTypesSupported(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetObjectTypesSupportedTagged protocolObjectTypesSupported,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetObjectTypesSupportedTagged protocolObjectTypesSupported) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.protocolObjectTypesSupported = protocolObjectTypesSupported;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetObjectTypesSupportedTagged getProtocolObjectTypesSupported() {
@@ -138,39 +130,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataProtocolObjectTypesSupported");
     // Create the instance
     return new BACnetConstructedDataProtocolObjectTypesSupportedBuilderImpl(
-        protocolObjectTypesSupported, tagNumber, arrayIndexArgument);
+        protocolObjectTypesSupported);
   }
 
   public static class BACnetConstructedDataProtocolObjectTypesSupportedBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetObjectTypesSupportedTagged protocolObjectTypesSupported;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataProtocolObjectTypesSupportedBuilderImpl(
-        BACnetObjectTypesSupportedTagged protocolObjectTypesSupported,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetObjectTypesSupportedTagged protocolObjectTypesSupported) {
       this.protocolObjectTypesSupported = protocolObjectTypesSupported;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataProtocolObjectTypesSupported build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataProtocolObjectTypesSupported
           bACnetConstructedDataProtocolObjectTypesSupported =
               new BACnetConstructedDataProtocolObjectTypesSupported(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  protocolObjectTypesSupported,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, protocolObjectTypesSupported);
       return bACnetConstructedDataProtocolObjectTypesSupported;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolRevision.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolRevision.java
index 9843e94a3df..05fbcaaea7e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolRevision.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolRevision.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger protocolRevision;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataProtocolRevision(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger protocolRevision,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger protocolRevision) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.protocolRevision = protocolRevision;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getProtocolRevision() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataProtocolRevision");
     // Create the instance
-    return new BACnetConstructedDataProtocolRevisionBuilderImpl(
-        protocolRevision, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataProtocolRevisionBuilderImpl(protocolRevision);
   }
 
   public static class BACnetConstructedDataProtocolRevisionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger protocolRevision;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataProtocolRevisionBuilderImpl(
-        BACnetApplicationTagUnsignedInteger protocolRevision,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger protocolRevision) {
       this.protocolRevision = protocolRevision;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataProtocolRevision build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataProtocolRevision bACnetConstructedDataProtocolRevision =
           new BACnetConstructedDataProtocolRevision(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              protocolRevision,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, protocolRevision);
       return bACnetConstructedDataProtocolRevision;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolServicesSupported.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolServicesSupported.java
index 5470d0aa853..a920d6b99ba 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolServicesSupported.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolServicesSupported.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetServicesSupportedTagged protocolServicesSupported;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataProtocolServicesSupported(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetServicesSupportedTagged protocolServicesSupported,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetServicesSupportedTagged protocolServicesSupported) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.protocolServicesSupported = protocolServicesSupported;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetServicesSupportedTagged getProtocolServicesSupported() {
@@ -137,40 +129,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataProtocolServicesSupported");
     // Create the instance
-    return new BACnetConstructedDataProtocolServicesSupportedBuilderImpl(
-        protocolServicesSupported, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataProtocolServicesSupportedBuilderImpl(protocolServicesSupported);
   }
 
   public static class BACnetConstructedDataProtocolServicesSupportedBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetServicesSupportedTagged protocolServicesSupported;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataProtocolServicesSupportedBuilderImpl(
-        BACnetServicesSupportedTagged protocolServicesSupported,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetServicesSupportedTagged protocolServicesSupported) {
       this.protocolServicesSupported = protocolServicesSupported;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataProtocolServicesSupported build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataProtocolServicesSupported
           bACnetConstructedDataProtocolServicesSupported =
               new BACnetConstructedDataProtocolServicesSupported(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  protocolServicesSupported,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, protocolServicesSupported);
       return bACnetConstructedDataProtocolServicesSupported;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolVersion.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolVersion.java
index 9e917995b9b..a3f9b7ed593 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolVersion.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataProtocolVersion.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger protocolVersion;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataProtocolVersion(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger protocolVersion,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger protocolVersion) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.protocolVersion = protocolVersion;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getProtocolVersion() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataProtocolVersion");
     // Create the instance
-    return new BACnetConstructedDataProtocolVersionBuilderImpl(
-        protocolVersion, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataProtocolVersionBuilderImpl(protocolVersion);
   }
 
   public static class BACnetConstructedDataProtocolVersionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger protocolVersion;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataProtocolVersionBuilderImpl(
-        BACnetApplicationTagUnsignedInteger protocolVersion,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger protocolVersion) {
       this.protocolVersion = protocolVersion;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataProtocolVersion build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataProtocolVersion bACnetConstructedDataProtocolVersion =
           new BACnetConstructedDataProtocolVersion(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              protocolVersion,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, protocolVersion);
       return bACnetConstructedDataProtocolVersion;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseConverterAdjustValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseConverterAdjustValue.java
index ddd9ed7e1a6..5d130de3c8e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseConverterAdjustValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseConverterAdjustValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal adjustValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPulseConverterAdjustValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal adjustValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal adjustValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.adjustValue = adjustValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getAdjustValue() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPulseConverterAdjustValue");
     // Create the instance
-    return new BACnetConstructedDataPulseConverterAdjustValueBuilderImpl(
-        adjustValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPulseConverterAdjustValueBuilderImpl(adjustValue);
   }
 
   public static class BACnetConstructedDataPulseConverterAdjustValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal adjustValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPulseConverterAdjustValueBuilderImpl(
-        BACnetApplicationTagReal adjustValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal adjustValue) {
       this.adjustValue = adjustValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPulseConverterAdjustValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPulseConverterAdjustValue
           bACnetConstructedDataPulseConverterAdjustValue =
               new BACnetConstructedDataPulseConverterAdjustValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  adjustValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, adjustValue);
       return bACnetConstructedDataPulseConverterAdjustValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseConverterAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseConverterAll.java
index 12c9b7688fc..9fee09591a8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseConverterAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseConverterAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPulseConverterAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPulseConverterAll");
     // Create the instance
-    return new BACnetConstructedDataPulseConverterAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPulseConverterAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataPulseConverterAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataPulseConverterAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataPulseConverterAllBuilderImpl() {}
 
     public BACnetConstructedDataPulseConverterAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPulseConverterAll bACnetConstructedDataPulseConverterAll =
-          new BACnetConstructedDataPulseConverterAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataPulseConverterAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataPulseConverterAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseConverterPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseConverterPresentValue.java
index c278a94199a..9a0c40978cf 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseConverterPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseConverterPresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPulseConverterPresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getPresentValue() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPulseConverterPresentValue");
     // Create the instance
-    return new BACnetConstructedDataPulseConverterPresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPulseConverterPresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataPulseConverterPresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPulseConverterPresentValueBuilderImpl(
-        BACnetApplicationTagReal presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagReal presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPulseConverterPresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPulseConverterPresentValue
           bACnetConstructedDataPulseConverterPresentValue =
               new BACnetConstructedDataPulseConverterPresentValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  presentValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataPulseConverterPresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseRate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseRate.java
index 41e96195b57..5e687268692 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseRate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataPulseRate.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger pulseRate;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataPulseRate(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger pulseRate,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger pulseRate) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.pulseRate = pulseRate;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getPulseRate() {
@@ -134,33 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataPulseRate");
     // Create the instance
-    return new BACnetConstructedDataPulseRateBuilderImpl(pulseRate, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataPulseRateBuilderImpl(pulseRate);
   }
 
   public static class BACnetConstructedDataPulseRateBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger pulseRate;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataPulseRateBuilderImpl(
-        BACnetApplicationTagUnsignedInteger pulseRate,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger pulseRate) {
       this.pulseRate = pulseRate;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataPulseRate build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataPulseRate bACnetConstructedDataPulseRate =
-          new BACnetConstructedDataPulseRate(
-              openingTag, peekedTagHeader, closingTag, pulseRate, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataPulseRate(openingTag, peekedTagHeader, closingTag, pulseRate);
       return bACnetConstructedDataPulseRate;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReadOnly.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReadOnly.java
index 872f6dfd02c..120aee5ee64 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReadOnly.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReadOnly.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean readOnly;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataReadOnly(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean readOnly,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean readOnly) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.readOnly = readOnly;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getReadOnly() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataReadOnly");
     // Create the instance
-    return new BACnetConstructedDataReadOnlyBuilderImpl(readOnly, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataReadOnlyBuilderImpl(readOnly);
   }
 
   public static class BACnetConstructedDataReadOnlyBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean readOnly;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataReadOnlyBuilderImpl(
-        BACnetApplicationTagBoolean readOnly,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataReadOnlyBuilderImpl(BACnetApplicationTagBoolean readOnly) {
       this.readOnly = readOnly;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataReadOnly build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataReadOnly bACnetConstructedDataReadOnly =
-          new BACnetConstructedDataReadOnly(
-              openingTag, peekedTagHeader, closingTag, readOnly, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataReadOnly(openingTag, peekedTagHeader, closingTag, readOnly);
       return bACnetConstructedDataReadOnly;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReasonForDisable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReasonForDisable.java
index 29bda8ed852..fbbcd822387 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReasonForDisable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReasonForDisable.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetAccessCredentialDisableReasonTagged> reasonForDisable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataReasonForDisable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetAccessCredentialDisableReasonTagged> reasonForDisable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetAccessCredentialDisableReasonTagged> reasonForDisable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.reasonForDisable = reasonForDisable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetAccessCredentialDisableReasonTagged> getReasonForDisable() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataReasonForDisable");
     // Create the instance
-    return new BACnetConstructedDataReasonForDisableBuilderImpl(
-        reasonForDisable, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataReasonForDisableBuilderImpl(reasonForDisable);
   }
 
   public static class BACnetConstructedDataReasonForDisableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetAccessCredentialDisableReasonTagged> reasonForDisable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataReasonForDisableBuilderImpl(
-        List<BACnetAccessCredentialDisableReasonTagged> reasonForDisable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetAccessCredentialDisableReasonTagged> reasonForDisable) {
       this.reasonForDisable = reasonForDisable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataReasonForDisable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataReasonForDisable bACnetConstructedDataReasonForDisable =
           new BACnetConstructedDataReasonForDisable(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              reasonForDisable,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, reasonForDisable);
       return bACnetConstructedDataReasonForDisable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReasonForHalt.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReasonForHalt.java
index 983a7f771a0..983048a431a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReasonForHalt.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReasonForHalt.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetProgramErrorTagged programError;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataReasonForHalt(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetProgramErrorTagged programError,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetProgramErrorTagged programError) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.programError = programError;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetProgramErrorTagged getProgramError() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataReasonForHalt");
     // Create the instance
-    return new BACnetConstructedDataReasonForHaltBuilderImpl(
-        programError, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataReasonForHaltBuilderImpl(programError);
   }
 
   public static class BACnetConstructedDataReasonForHaltBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetProgramErrorTagged programError;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataReasonForHaltBuilderImpl(
-        BACnetProgramErrorTagged programError,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataReasonForHaltBuilderImpl(BACnetProgramErrorTagged programError) {
       this.programError = programError;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataReasonForHalt build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataReasonForHalt bACnetConstructedDataReasonForHalt =
           new BACnetConstructedDataReasonForHalt(
-              openingTag, peekedTagHeader, closingTag, programError, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, programError);
       return bACnetConstructedDataReasonForHalt;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRecipientList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRecipientList.java
index 12c99633994..1491f2500db 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRecipientList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRecipientList.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetDestination> recipientList;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataRecipientList(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetDestination> recipientList,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDestination> recipientList) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.recipientList = recipientList;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetDestination> getRecipientList() {
@@ -126,39 +118,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataRecipientList");
     // Create the instance
-    return new BACnetConstructedDataRecipientListBuilderImpl(
-        recipientList, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataRecipientListBuilderImpl(recipientList);
   }
 
   public static class BACnetConstructedDataRecipientListBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetDestination> recipientList;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataRecipientListBuilderImpl(
-        List<BACnetDestination> recipientList,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataRecipientListBuilderImpl(List<BACnetDestination> recipientList) {
       this.recipientList = recipientList;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataRecipientList build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataRecipientList bACnetConstructedDataRecipientList =
           new BACnetConstructedDataRecipientList(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              recipientList,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, recipientList);
       return bACnetConstructedDataRecipientList;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRecordCount.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRecordCount.java
index ef252f5c4f2..925b6bb770f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRecordCount.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRecordCount.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger recordCount;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataRecordCount(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger recordCount,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger recordCount) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.recordCount = recordCount;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getRecordCount() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataRecordCount");
     // Create the instance
-    return new BACnetConstructedDataRecordCountBuilderImpl(
-        recordCount, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataRecordCountBuilderImpl(recordCount);
   }
 
   public static class BACnetConstructedDataRecordCountBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger recordCount;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataRecordCountBuilderImpl(
-        BACnetApplicationTagUnsignedInteger recordCount,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger recordCount) {
       this.recordCount = recordCount;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataRecordCount build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataRecordCount bACnetConstructedDataRecordCount =
           new BACnetConstructedDataRecordCount(
-              openingTag, peekedTagHeader, closingTag, recordCount, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, recordCount);
       return bACnetConstructedDataRecordCount;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRecordsSinceNotification.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRecordsSinceNotification.java
index 096c2b24486..33c8c85792c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRecordsSinceNotification.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRecordsSinceNotification.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger recordsSinceNotifications;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataRecordsSinceNotification(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger recordsSinceNotifications,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger recordsSinceNotifications) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.recordsSinceNotifications = recordsSinceNotifications;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getRecordsSinceNotifications() {
@@ -137,39 +129,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataRecordsSinceNotification");
     // Create the instance
-    return new BACnetConstructedDataRecordsSinceNotificationBuilderImpl(
-        recordsSinceNotifications, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataRecordsSinceNotificationBuilderImpl(recordsSinceNotifications);
   }
 
   public static class BACnetConstructedDataRecordsSinceNotificationBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger recordsSinceNotifications;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataRecordsSinceNotificationBuilderImpl(
-        BACnetApplicationTagUnsignedInteger recordsSinceNotifications,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger recordsSinceNotifications) {
       this.recordsSinceNotifications = recordsSinceNotifications;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataRecordsSinceNotification build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataRecordsSinceNotification bACnetConstructedDataRecordsSinceNotification =
           new BACnetConstructedDataRecordsSinceNotification(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              recordsSinceNotifications,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, recordsSinceNotifications);
       return bACnetConstructedDataRecordsSinceNotification;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReferencePort.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReferencePort.java
index 6fb8bdac949..1169b7f8434 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReferencePort.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReferencePort.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger referencePort;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataReferencePort(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger referencePort,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger referencePort) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.referencePort = referencePort;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getReferencePort() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataReferencePort");
     // Create the instance
-    return new BACnetConstructedDataReferencePortBuilderImpl(
-        referencePort, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataReferencePortBuilderImpl(referencePort);
   }
 
   public static class BACnetConstructedDataReferencePortBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger referencePort;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataReferencePortBuilderImpl(
-        BACnetApplicationTagUnsignedInteger referencePort,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger referencePort) {
       this.referencePort = referencePort;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataReferencePort build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataReferencePort bACnetConstructedDataReferencePort =
           new BACnetConstructedDataReferencePort(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              referencePort,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, referencePort);
       return bACnetConstructedDataReferencePort;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRegisteredCarCall.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRegisteredCarCall.java
index 2ae2c07824a..b56c27c1342 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRegisteredCarCall.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRegisteredCarCall.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetLiftCarCallList> registeredCarCall;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataRegisteredCarCall(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetLiftCarCallList> registeredCarCall,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLiftCarCallList> registeredCarCall) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.registeredCarCall = registeredCarCall;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (registeredCarCall)
     writeComplexTypeArrayField("registeredCarCall", registeredCarCall, writeBuffer);
@@ -171,42 +159,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataRegisteredCarCall");
     // Create the instance
     return new BACnetConstructedDataRegisteredCarCallBuilderImpl(
-        numberOfDataElements, registeredCarCall, tagNumber, arrayIndexArgument);
+        numberOfDataElements, registeredCarCall);
   }
 
   public static class BACnetConstructedDataRegisteredCarCallBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetLiftCarCallList> registeredCarCall;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataRegisteredCarCallBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetLiftCarCallList> registeredCarCall,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetLiftCarCallList> registeredCarCall) {
       this.numberOfDataElements = numberOfDataElements;
       this.registeredCarCall = registeredCarCall;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataRegisteredCarCall build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataRegisteredCarCall bACnetConstructedDataRegisteredCarCall =
           new BACnetConstructedDataRegisteredCarCall(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              registeredCarCall,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, registeredCarCall);
       return bACnetConstructedDataRegisteredCarCall;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReliability.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReliability.java
index 54b3d3d6bd3..fe4aa67b9ee 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReliability.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReliability.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetReliabilityTagged reliability;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataReliability(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetReliabilityTagged reliability,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetReliabilityTagged reliability) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.reliability = reliability;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetReliabilityTagged getReliability() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataReliability");
     // Create the instance
-    return new BACnetConstructedDataReliabilityBuilderImpl(
-        reliability, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataReliabilityBuilderImpl(reliability);
   }
 
   public static class BACnetConstructedDataReliabilityBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetReliabilityTagged reliability;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataReliabilityBuilderImpl(
-        BACnetReliabilityTagged reliability,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataReliabilityBuilderImpl(BACnetReliabilityTagged reliability) {
       this.reliability = reliability;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataReliability build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataReliability bACnetConstructedDataReliability =
           new BACnetConstructedDataReliability(
-              openingTag, peekedTagHeader, closingTag, reliability, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, reliability);
       return bACnetConstructedDataReliability;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReliabilityEvaluationInhibit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReliabilityEvaluationInhibit.java
index ff1ec90252f..e8ef05e3ccd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReliabilityEvaluationInhibit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataReliabilityEvaluationInhibit.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean reliabilityEvaluationInhibit;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataReliabilityEvaluationInhibit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean reliabilityEvaluationInhibit,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean reliabilityEvaluationInhibit) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.reliabilityEvaluationInhibit = reliabilityEvaluationInhibit;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getReliabilityEvaluationInhibit() {
@@ -136,39 +128,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataReliabilityEvaluationInhibit");
     // Create the instance
     return new BACnetConstructedDataReliabilityEvaluationInhibitBuilderImpl(
-        reliabilityEvaluationInhibit, tagNumber, arrayIndexArgument);
+        reliabilityEvaluationInhibit);
   }
 
   public static class BACnetConstructedDataReliabilityEvaluationInhibitBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean reliabilityEvaluationInhibit;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataReliabilityEvaluationInhibitBuilderImpl(
-        BACnetApplicationTagBoolean reliabilityEvaluationInhibit,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean reliabilityEvaluationInhibit) {
       this.reliabilityEvaluationInhibit = reliabilityEvaluationInhibit;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataReliabilityEvaluationInhibit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataReliabilityEvaluationInhibit
           bACnetConstructedDataReliabilityEvaluationInhibit =
               new BACnetConstructedDataReliabilityEvaluationInhibit(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  reliabilityEvaluationInhibit,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, reliabilityEvaluationInhibit);
       return bACnetConstructedDataReliabilityEvaluationInhibit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRelinquishDefault.java
index 24bb0ed33a4..282b36d9937 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getRelinquishDefault() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagUnsignedInteger relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataRelinquishDefault bACnetConstructedDataRelinquishDefault =
           new BACnetConstructedDataRelinquishDefault(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              relinquishDefault,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRepresents.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRepresents.java
index 23e36522d6d..af330c21165 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRepresents.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRepresents.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDeviceObjectReference represents;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataRepresents(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDeviceObjectReference represents,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDeviceObjectReference represents) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.represents = represents;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDeviceObjectReference getRepresents() {
@@ -130,34 +122,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataRepresents");
     // Create the instance
-    return new BACnetConstructedDataRepresentsBuilderImpl(
-        represents, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataRepresentsBuilderImpl(represents);
   }
 
   public static class BACnetConstructedDataRepresentsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDeviceObjectReference represents;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataRepresentsBuilderImpl(
-        BACnetDeviceObjectReference represents,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataRepresentsBuilderImpl(BACnetDeviceObjectReference represents) {
       this.represents = represents;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataRepresents build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataRepresents bACnetConstructedDataRepresents =
-          new BACnetConstructedDataRepresents(
-              openingTag, peekedTagHeader, closingTag, represents, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataRepresents(openingTag, peekedTagHeader, closingTag, represents);
       return bACnetConstructedDataRepresents;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRequestedShedLevel.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRequestedShedLevel.java
index 2bfaffd506f..5d314746aee 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRequestedShedLevel.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRequestedShedLevel.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetShedLevel requestedShedLevel;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataRequestedShedLevel(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetShedLevel requestedShedLevel,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetShedLevel requestedShedLevel) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.requestedShedLevel = requestedShedLevel;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetShedLevel getRequestedShedLevel() {
@@ -131,39 +123,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataRequestedShedLevel");
     // Create the instance
-    return new BACnetConstructedDataRequestedShedLevelBuilderImpl(
-        requestedShedLevel, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataRequestedShedLevelBuilderImpl(requestedShedLevel);
   }
 
   public static class BACnetConstructedDataRequestedShedLevelBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetShedLevel requestedShedLevel;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataRequestedShedLevelBuilderImpl(
-        BACnetShedLevel requestedShedLevel,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataRequestedShedLevelBuilderImpl(BACnetShedLevel requestedShedLevel) {
       this.requestedShedLevel = requestedShedLevel;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataRequestedShedLevel build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataRequestedShedLevel bACnetConstructedDataRequestedShedLevel =
           new BACnetConstructedDataRequestedShedLevel(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              requestedShedLevel,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, requestedShedLevel);
       return bACnetConstructedDataRequestedShedLevel;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRequestedUpdateInterval.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRequestedUpdateInterval.java
index 5cdf02000eb..eee680b42a9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRequestedUpdateInterval.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRequestedUpdateInterval.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger requestedUpdateInterval;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataRequestedUpdateInterval(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger requestedUpdateInterval,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger requestedUpdateInterval) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.requestedUpdateInterval = requestedUpdateInterval;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getRequestedUpdateInterval() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataRequestedUpdateInterval");
     // Create the instance
-    return new BACnetConstructedDataRequestedUpdateIntervalBuilderImpl(
-        requestedUpdateInterval, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataRequestedUpdateIntervalBuilderImpl(requestedUpdateInterval);
   }
 
   public static class BACnetConstructedDataRequestedUpdateIntervalBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger requestedUpdateInterval;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataRequestedUpdateIntervalBuilderImpl(
-        BACnetApplicationTagUnsignedInteger requestedUpdateInterval,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger requestedUpdateInterval) {
       this.requestedUpdateInterval = requestedUpdateInterval;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataRequestedUpdateInterval build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataRequestedUpdateInterval bACnetConstructedDataRequestedUpdateInterval =
           new BACnetConstructedDataRequestedUpdateInterval(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              requestedUpdateInterval,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, requestedUpdateInterval);
       return bACnetConstructedDataRequestedUpdateInterval;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRequired.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRequired.java
index c8233d1d4aa..2d1fb7a9343 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRequired.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRequired.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.REQUIRED;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataRequired(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataRequired");
     // Create the instance
-    return new BACnetConstructedDataRequiredBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataRequiredBuilderImpl();
   }
 
   public static class BACnetConstructedDataRequiredBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataRequiredBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataRequiredBuilderImpl() {}
 
     public BACnetConstructedDataRequired build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataRequired bACnetConstructedDataRequired =
-          new BACnetConstructedDataRequired(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataRequired(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataRequired;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataResolution.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataResolution.java
index a01509337d7..8395a244522 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataResolution.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataResolution.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal resolution;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataResolution(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal resolution,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal resolution) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.resolution = resolution;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getResolution() {
@@ -132,34 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataResolution");
     // Create the instance
-    return new BACnetConstructedDataResolutionBuilderImpl(
-        resolution, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataResolutionBuilderImpl(resolution);
   }
 
   public static class BACnetConstructedDataResolutionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal resolution;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataResolutionBuilderImpl(
-        BACnetApplicationTagReal resolution,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataResolutionBuilderImpl(BACnetApplicationTagReal resolution) {
       this.resolution = resolution;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataResolution build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataResolution bACnetConstructedDataResolution =
-          new BACnetConstructedDataResolution(
-              openingTag, peekedTagHeader, closingTag, resolution, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataResolution(openingTag, peekedTagHeader, closingTag, resolution);
       return bACnetConstructedDataResolution;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRestartNotificationRecipients.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRestartNotificationRecipients.java
index e5817b81669..340653196c2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRestartNotificationRecipients.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRestartNotificationRecipients.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetRecipient> restartNotificationRecipients;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataRestartNotificationRecipients(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetRecipient> restartNotificationRecipients,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetRecipient> restartNotificationRecipients) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.restartNotificationRecipients = restartNotificationRecipients;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetRecipient> getRestartNotificationRecipients() {
@@ -129,39 +121,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataRestartNotificationRecipients");
     // Create the instance
     return new BACnetConstructedDataRestartNotificationRecipientsBuilderImpl(
-        restartNotificationRecipients, tagNumber, arrayIndexArgument);
+        restartNotificationRecipients);
   }
 
   public static class BACnetConstructedDataRestartNotificationRecipientsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetRecipient> restartNotificationRecipients;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataRestartNotificationRecipientsBuilderImpl(
-        List<BACnetRecipient> restartNotificationRecipients,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetRecipient> restartNotificationRecipients) {
       this.restartNotificationRecipients = restartNotificationRecipients;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataRestartNotificationRecipients build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataRestartNotificationRecipients
           bACnetConstructedDataRestartNotificationRecipients =
               new BACnetConstructedDataRestartNotificationRecipients(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  restartNotificationRecipients,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, restartNotificationRecipients);
       return bACnetConstructedDataRestartNotificationRecipients;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRestoreCompletionTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRestoreCompletionTime.java
index 58547ed31f2..5f98552c232 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRestoreCompletionTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRestoreCompletionTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger completionTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataRestoreCompletionTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger completionTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger completionTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.completionTime = completionTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getCompletionTime() {
@@ -135,39 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataRestoreCompletionTime");
     // Create the instance
-    return new BACnetConstructedDataRestoreCompletionTimeBuilderImpl(
-        completionTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataRestoreCompletionTimeBuilderImpl(completionTime);
   }
 
   public static class BACnetConstructedDataRestoreCompletionTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger completionTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataRestoreCompletionTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger completionTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger completionTime) {
       this.completionTime = completionTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataRestoreCompletionTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataRestoreCompletionTime bACnetConstructedDataRestoreCompletionTime =
           new BACnetConstructedDataRestoreCompletionTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              completionTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, completionTime);
       return bACnetConstructedDataRestoreCompletionTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRestorePreparationTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRestorePreparationTime.java
index 2397b80e32a..655df83c5c2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRestorePreparationTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRestorePreparationTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger restorePreparationTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataRestorePreparationTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger restorePreparationTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger restorePreparationTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.restorePreparationTime = restorePreparationTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getRestorePreparationTime() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataRestorePreparationTime");
     // Create the instance
-    return new BACnetConstructedDataRestorePreparationTimeBuilderImpl(
-        restorePreparationTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataRestorePreparationTimeBuilderImpl(restorePreparationTime);
   }
 
   public static class BACnetConstructedDataRestorePreparationTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger restorePreparationTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataRestorePreparationTimeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger restorePreparationTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger restorePreparationTime) {
       this.restorePreparationTime = restorePreparationTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataRestorePreparationTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataRestorePreparationTime bACnetConstructedDataRestorePreparationTime =
           new BACnetConstructedDataRestorePreparationTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              restorePreparationTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, restorePreparationTime);
       return bACnetConstructedDataRestorePreparationTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRoutingTable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRoutingTable.java
index fda094c9bfa..f13dce611c0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRoutingTable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataRoutingTable.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetRouterEntry> routingTable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataRoutingTable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetRouterEntry> routingTable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetRouterEntry> routingTable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.routingTable = routingTable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetRouterEntry> getRoutingTable() {
@@ -126,34 +118,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataRoutingTable");
     // Create the instance
-    return new BACnetConstructedDataRoutingTableBuilderImpl(
-        routingTable, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataRoutingTableBuilderImpl(routingTable);
   }
 
   public static class BACnetConstructedDataRoutingTableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetRouterEntry> routingTable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataRoutingTableBuilderImpl(
-        List<BACnetRouterEntry> routingTable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataRoutingTableBuilderImpl(List<BACnetRouterEntry> routingTable) {
       this.routingTable = routingTable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataRoutingTable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataRoutingTable bACnetConstructedDataRoutingTable =
           new BACnetConstructedDataRoutingTable(
-              openingTag, peekedTagHeader, closingTag, routingTable, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, routingTable);
       return bACnetConstructedDataRoutingTable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScale.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScale.java
index 2acae8a588c..44fec6bb0c6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScale.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScale.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetScale scale;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataScale(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetScale scale,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetScale scale) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.scale = scale;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetScale getScale() {
@@ -128,31 +120,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataScale");
     // Create the instance
-    return new BACnetConstructedDataScaleBuilderImpl(scale, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataScaleBuilderImpl(scale);
   }
 
   public static class BACnetConstructedDataScaleBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetScale scale;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataScaleBuilderImpl(
-        BACnetScale scale, Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataScaleBuilderImpl(BACnetScale scale) {
       this.scale = scale;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataScale build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataScale bACnetConstructedDataScale =
-          new BACnetConstructedDataScale(
-              openingTag, peekedTagHeader, closingTag, scale, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataScale(openingTag, peekedTagHeader, closingTag, scale);
       return bACnetConstructedDataScale;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScaleFactor.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScaleFactor.java
index bf21a04bde5..7e3b6f072ac 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScaleFactor.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScaleFactor.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal scaleFactor;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataScaleFactor(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal scaleFactor,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal scaleFactor) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.scaleFactor = scaleFactor;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getScaleFactor() {
@@ -132,34 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataScaleFactor");
     // Create the instance
-    return new BACnetConstructedDataScaleFactorBuilderImpl(
-        scaleFactor, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataScaleFactorBuilderImpl(scaleFactor);
   }
 
   public static class BACnetConstructedDataScaleFactorBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal scaleFactor;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataScaleFactorBuilderImpl(
-        BACnetApplicationTagReal scaleFactor,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataScaleFactorBuilderImpl(BACnetApplicationTagReal scaleFactor) {
       this.scaleFactor = scaleFactor;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataScaleFactor build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataScaleFactor bACnetConstructedDataScaleFactor =
           new BACnetConstructedDataScaleFactor(
-              openingTag, peekedTagHeader, closingTag, scaleFactor, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, scaleFactor);
       return bACnetConstructedDataScaleFactor;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScheduleAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScheduleAll.java
index 044d3b5aaf4..f62fde2a0fb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScheduleAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScheduleAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataScheduleAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataScheduleAll");
     // Create the instance
-    return new BACnetConstructedDataScheduleAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataScheduleAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataScheduleAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataScheduleAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataScheduleAllBuilderImpl() {}
 
     public BACnetConstructedDataScheduleAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataScheduleAll bACnetConstructedDataScheduleAll =
-          new BACnetConstructedDataScheduleAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataScheduleAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataScheduleAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScheduleDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScheduleDefault.java
index 052b0658b9c..c3790765f9d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScheduleDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataScheduleDefault.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetConstructedDataElement scheduleDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataScheduleDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetConstructedDataElement scheduleDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetConstructedDataElement scheduleDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.scheduleDefault = scheduleDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetConstructedDataElement getScheduleDefault() {
@@ -137,39 +129,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataScheduleDefault");
     // Create the instance
-    return new BACnetConstructedDataScheduleDefaultBuilderImpl(
-        scheduleDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataScheduleDefaultBuilderImpl(scheduleDefault);
   }
 
   public static class BACnetConstructedDataScheduleDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetConstructedDataElement scheduleDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataScheduleDefaultBuilderImpl(
-        BACnetConstructedDataElement scheduleDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetConstructedDataElement scheduleDefault) {
       this.scheduleDefault = scheduleDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataScheduleDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataScheduleDefault bACnetConstructedDataScheduleDefault =
           new BACnetConstructedDataScheduleDefault(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              scheduleDefault,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, scheduleDefault);
       return bACnetConstructedDataScheduleDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSchedulePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSchedulePresentValue.java
index 1c930031637..19ccc8e2d55 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSchedulePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSchedulePresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetConstructedDataElement presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSchedulePresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetConstructedDataElement presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetConstructedDataElement presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetConstructedDataElement getPresentValue() {
@@ -139,34 +131,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataSchedulePresentValue");
     // Create the instance
-    return new BACnetConstructedDataSchedulePresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataSchedulePresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataSchedulePresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetConstructedDataElement presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSchedulePresentValueBuilderImpl(
-        BACnetConstructedDataElement presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetConstructedDataElement presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSchedulePresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSchedulePresentValue bACnetConstructedDataSchedulePresentValue =
           new BACnetConstructedDataSchedulePresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataSchedulePresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSecuredStatus.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSecuredStatus.java
index 863b2bce8f9..ad0ddea2ebc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSecuredStatus.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSecuredStatus.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDoorSecuredStatusTagged securedStatus;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSecuredStatus(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDoorSecuredStatusTagged securedStatus,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDoorSecuredStatusTagged securedStatus) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.securedStatus = securedStatus;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDoorSecuredStatusTagged getSecuredStatus() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataSecuredStatus");
     // Create the instance
-    return new BACnetConstructedDataSecuredStatusBuilderImpl(
-        securedStatus, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataSecuredStatusBuilderImpl(securedStatus);
   }
 
   public static class BACnetConstructedDataSecuredStatusBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDoorSecuredStatusTagged securedStatus;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSecuredStatusBuilderImpl(
-        BACnetDoorSecuredStatusTagged securedStatus,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDoorSecuredStatusTagged securedStatus) {
       this.securedStatus = securedStatus;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSecuredStatus build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSecuredStatus bACnetConstructedDataSecuredStatus =
           new BACnetConstructedDataSecuredStatus(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              securedStatus,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, securedStatus);
       return bACnetConstructedDataSecuredStatus;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSecurityPDUTimeout.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSecurityPDUTimeout.java
index f567b28067c..e7cf3450e4e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSecurityPDUTimeout.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSecurityPDUTimeout.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger securityPduTimeout;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSecurityPDUTimeout(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger securityPduTimeout,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger securityPduTimeout) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.securityPduTimeout = securityPduTimeout;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getSecurityPduTimeout() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataSecurityPDUTimeout");
     // Create the instance
-    return new BACnetConstructedDataSecurityPDUTimeoutBuilderImpl(
-        securityPduTimeout, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataSecurityPDUTimeoutBuilderImpl(securityPduTimeout);
   }
 
   public static class BACnetConstructedDataSecurityPDUTimeoutBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger securityPduTimeout;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSecurityPDUTimeoutBuilderImpl(
-        BACnetApplicationTagUnsignedInteger securityPduTimeout,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger securityPduTimeout) {
       this.securityPduTimeout = securityPduTimeout;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSecurityPDUTimeout build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSecurityPDUTimeout bACnetConstructedDataSecurityPDUTimeout =
           new BACnetConstructedDataSecurityPDUTimeout(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              securityPduTimeout,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, securityPduTimeout);
       return bACnetConstructedDataSecurityPDUTimeout;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSecurityTimeWindow.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSecurityTimeWindow.java
index 7bcd0f07b78..ae6af4c75a8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSecurityTimeWindow.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSecurityTimeWindow.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger securityTimeWindow;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSecurityTimeWindow(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger securityTimeWindow,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger securityTimeWindow) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.securityTimeWindow = securityTimeWindow;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getSecurityTimeWindow() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataSecurityTimeWindow");
     // Create the instance
-    return new BACnetConstructedDataSecurityTimeWindowBuilderImpl(
-        securityTimeWindow, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataSecurityTimeWindowBuilderImpl(securityTimeWindow);
   }
 
   public static class BACnetConstructedDataSecurityTimeWindowBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger securityTimeWindow;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSecurityTimeWindowBuilderImpl(
-        BACnetApplicationTagUnsignedInteger securityTimeWindow,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger securityTimeWindow) {
       this.securityTimeWindow = securityTimeWindow;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSecurityTimeWindow build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSecurityTimeWindow bACnetConstructedDataSecurityTimeWindow =
           new BACnetConstructedDataSecurityTimeWindow(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              securityTimeWindow,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, securityTimeWindow);
       return bACnetConstructedDataSecurityTimeWindow;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSegmentationSupported.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSegmentationSupported.java
index acc3e3d5163..2bdc2cc2714 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSegmentationSupported.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSegmentationSupported.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetSegmentationTagged segmentationSupported;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSegmentationSupported(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetSegmentationTagged segmentationSupported,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetSegmentationTagged segmentationSupported) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.segmentationSupported = segmentationSupported;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetSegmentationTagged getSegmentationSupported() {
@@ -135,39 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataSegmentationSupported");
     // Create the instance
-    return new BACnetConstructedDataSegmentationSupportedBuilderImpl(
-        segmentationSupported, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataSegmentationSupportedBuilderImpl(segmentationSupported);
   }
 
   public static class BACnetConstructedDataSegmentationSupportedBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetSegmentationTagged segmentationSupported;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSegmentationSupportedBuilderImpl(
-        BACnetSegmentationTagged segmentationSupported,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetSegmentationTagged segmentationSupported) {
       this.segmentationSupported = segmentationSupported;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSegmentationSupported build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSegmentationSupported bACnetConstructedDataSegmentationSupported =
           new BACnetConstructedDataSegmentationSupported(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              segmentationSupported,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, segmentationSupported);
       return bACnetConstructedDataSegmentationSupported;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSerialNumber.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSerialNumber.java
index 3ca6eab85ee..1dd9e9bb654 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSerialNumber.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSerialNumber.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString serialNumber;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSerialNumber(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString serialNumber,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString serialNumber) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.serialNumber = serialNumber;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getSerialNumber() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataSerialNumber");
     // Create the instance
-    return new BACnetConstructedDataSerialNumberBuilderImpl(
-        serialNumber, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataSerialNumberBuilderImpl(serialNumber);
   }
 
   public static class BACnetConstructedDataSerialNumberBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString serialNumber;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSerialNumberBuilderImpl(
-        BACnetApplicationTagCharacterString serialNumber,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString serialNumber) {
       this.serialNumber = serialNumber;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSerialNumber build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSerialNumber bACnetConstructedDataSerialNumber =
           new BACnetConstructedDataSerialNumber(
-              openingTag, peekedTagHeader, closingTag, serialNumber, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, serialNumber);
       return bACnetConstructedDataSerialNumber;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSetpoint.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSetpoint.java
index 88aa694ff79..91227268833 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSetpoint.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSetpoint.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal setpoint;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSetpoint(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal setpoint,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal setpoint) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.setpoint = setpoint;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getSetpoint() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataSetpoint");
     // Create the instance
-    return new BACnetConstructedDataSetpointBuilderImpl(setpoint, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataSetpointBuilderImpl(setpoint);
   }
 
   public static class BACnetConstructedDataSetpointBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal setpoint;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataSetpointBuilderImpl(
-        BACnetApplicationTagReal setpoint,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataSetpointBuilderImpl(BACnetApplicationTagReal setpoint) {
       this.setpoint = setpoint;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSetpoint build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSetpoint bACnetConstructedDataSetpoint =
-          new BACnetConstructedDataSetpoint(
-              openingTag, peekedTagHeader, closingTag, setpoint, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataSetpoint(openingTag, peekedTagHeader, closingTag, setpoint);
       return bACnetConstructedDataSetpoint;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSetpointReference.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSetpointReference.java
index a5d8f29f06d..df2497c4380 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSetpointReference.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSetpointReference.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetSetpointReference setpointReference;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSetpointReference(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetSetpointReference setpointReference,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetSetpointReference setpointReference) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.setpointReference = setpointReference;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetSetpointReference getSetpointReference() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataSetpointReference");
     // Create the instance
-    return new BACnetConstructedDataSetpointReferenceBuilderImpl(
-        setpointReference, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataSetpointReferenceBuilderImpl(setpointReference);
   }
 
   public static class BACnetConstructedDataSetpointReferenceBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetSetpointReference setpointReference;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSetpointReferenceBuilderImpl(
-        BACnetSetpointReference setpointReference,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetSetpointReference setpointReference) {
       this.setpointReference = setpointReference;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSetpointReference build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSetpointReference bACnetConstructedDataSetpointReference =
           new BACnetConstructedDataSetpointReference(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              setpointReference,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, setpointReference);
       return bACnetConstructedDataSetpointReference;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSetting.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSetting.java
index ac2e5f085bf..fe42907b169 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSetting.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSetting.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger setting;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSetting(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger setting,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger setting) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.setting = setting;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getSetting() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataSetting");
     // Create the instance
-    return new BACnetConstructedDataSettingBuilderImpl(setting, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataSettingBuilderImpl(setting);
   }
 
   public static class BACnetConstructedDataSettingBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger setting;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataSettingBuilderImpl(
-        BACnetApplicationTagUnsignedInteger setting,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataSettingBuilderImpl(BACnetApplicationTagUnsignedInteger setting) {
       this.setting = setting;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSetting build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSetting bACnetConstructedDataSetting =
-          new BACnetConstructedDataSetting(
-              openingTag, peekedTagHeader, closingTag, setting, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataSetting(openingTag, peekedTagHeader, closingTag, setting);
       return bACnetConstructedDataSetting;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataShedDuration.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataShedDuration.java
index c4f28b9cf49..4a373a3e0f1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataShedDuration.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataShedDuration.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger shedDuration;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataShedDuration(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger shedDuration,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger shedDuration) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.shedDuration = shedDuration;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getShedDuration() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataShedDuration");
     // Create the instance
-    return new BACnetConstructedDataShedDurationBuilderImpl(
-        shedDuration, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataShedDurationBuilderImpl(shedDuration);
   }
 
   public static class BACnetConstructedDataShedDurationBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger shedDuration;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataShedDurationBuilderImpl(
-        BACnetApplicationTagUnsignedInteger shedDuration,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger shedDuration) {
       this.shedDuration = shedDuration;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataShedDuration build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataShedDuration bACnetConstructedDataShedDuration =
           new BACnetConstructedDataShedDuration(
-              openingTag, peekedTagHeader, closingTag, shedDuration, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, shedDuration);
       return bACnetConstructedDataShedDuration;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataShedLevelDescriptions.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataShedLevelDescriptions.java
index 68275e352e0..8ef4aea2e2d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataShedLevelDescriptions.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataShedLevelDescriptions.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagCharacterString> shedLevelDescriptions;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataShedLevelDescriptions(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagCharacterString> shedLevelDescriptions,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagCharacterString> shedLevelDescriptions) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.shedLevelDescriptions = shedLevelDescriptions;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (shedLevelDescriptions)
     writeComplexTypeArrayField("shedLevelDescriptions", shedLevelDescriptions, writeBuffer);
@@ -175,42 +163,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataShedLevelDescriptions");
     // Create the instance
     return new BACnetConstructedDataShedLevelDescriptionsBuilderImpl(
-        numberOfDataElements, shedLevelDescriptions, tagNumber, arrayIndexArgument);
+        numberOfDataElements, shedLevelDescriptions);
   }
 
   public static class BACnetConstructedDataShedLevelDescriptionsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagCharacterString> shedLevelDescriptions;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataShedLevelDescriptionsBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagCharacterString> shedLevelDescriptions,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagCharacterString> shedLevelDescriptions) {
       this.numberOfDataElements = numberOfDataElements;
       this.shedLevelDescriptions = shedLevelDescriptions;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataShedLevelDescriptions build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataShedLevelDescriptions bACnetConstructedDataShedLevelDescriptions =
           new BACnetConstructedDataShedLevelDescriptions(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              shedLevelDescriptions,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, shedLevelDescriptions);
       return bACnetConstructedDataShedLevelDescriptions;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataShedLevels.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataShedLevels.java
index e23cab47d4b..3b9b8bd76b8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataShedLevels.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataShedLevels.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagUnsignedInteger> shedLevels;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataShedLevels(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagUnsignedInteger> shedLevels,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagUnsignedInteger> shedLevels) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.shedLevels = shedLevels;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (shedLevels)
     writeComplexTypeArrayField("shedLevels", shedLevels, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataShedLevels");
     // Create the instance
-    return new BACnetConstructedDataShedLevelsBuilderImpl(
-        numberOfDataElements, shedLevels, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataShedLevelsBuilderImpl(numberOfDataElements, shedLevels);
   }
 
   public static class BACnetConstructedDataShedLevelsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagUnsignedInteger> shedLevels;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataShedLevelsBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagUnsignedInteger> shedLevels,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagUnsignedInteger> shedLevels) {
       this.numberOfDataElements = numberOfDataElements;
       this.shedLevels = shedLevels;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataShedLevels build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataShedLevels bACnetConstructedDataShedLevels =
           new BACnetConstructedDataShedLevels(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              shedLevels,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, shedLevels);
       return bACnetConstructedDataShedLevels;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSilenced.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSilenced.java
index b666e7150d3..18d5ff2dc2f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSilenced.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSilenced.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetSilencedStateTagged silenced;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSilenced(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetSilencedStateTagged silenced,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetSilencedStateTagged silenced) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.silenced = silenced;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetSilencedStateTagged getSilenced() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataSilenced");
     // Create the instance
-    return new BACnetConstructedDataSilencedBuilderImpl(silenced, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataSilencedBuilderImpl(silenced);
   }
 
   public static class BACnetConstructedDataSilencedBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetSilencedStateTagged silenced;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataSilencedBuilderImpl(
-        BACnetSilencedStateTagged silenced,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataSilencedBuilderImpl(BACnetSilencedStateTagged silenced) {
       this.silenced = silenced;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSilenced build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSilenced bACnetConstructedDataSilenced =
-          new BACnetConstructedDataSilenced(
-              openingTag, peekedTagHeader, closingTag, silenced, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataSilenced(openingTag, peekedTagHeader, closingTag, silenced);
       return bACnetConstructedDataSilenced;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSlaveAddressBinding.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSlaveAddressBinding.java
index 84ebf7b8b22..88abb5cec8c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSlaveAddressBinding.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSlaveAddressBinding.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetAddressBinding> slaveAddressBinding;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSlaveAddressBinding(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetAddressBinding> slaveAddressBinding,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetAddressBinding> slaveAddressBinding) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.slaveAddressBinding = slaveAddressBinding;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetAddressBinding> getSlaveAddressBinding() {
@@ -127,39 +119,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataSlaveAddressBinding");
     // Create the instance
-    return new BACnetConstructedDataSlaveAddressBindingBuilderImpl(
-        slaveAddressBinding, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataSlaveAddressBindingBuilderImpl(slaveAddressBinding);
   }
 
   public static class BACnetConstructedDataSlaveAddressBindingBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetAddressBinding> slaveAddressBinding;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSlaveAddressBindingBuilderImpl(
-        List<BACnetAddressBinding> slaveAddressBinding,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetAddressBinding> slaveAddressBinding) {
       this.slaveAddressBinding = slaveAddressBinding;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSlaveAddressBinding build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSlaveAddressBinding bACnetConstructedDataSlaveAddressBinding =
           new BACnetConstructedDataSlaveAddressBinding(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              slaveAddressBinding,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, slaveAddressBinding);
       return bACnetConstructedDataSlaveAddressBinding;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSlaveProxyEnable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSlaveProxyEnable.java
index e75f0d35018..4cf825c7e50 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSlaveProxyEnable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSlaveProxyEnable.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean slaveProxyEnable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSlaveProxyEnable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean slaveProxyEnable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean slaveProxyEnable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.slaveProxyEnable = slaveProxyEnable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getSlaveProxyEnable() {
@@ -133,39 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataSlaveProxyEnable");
     // Create the instance
-    return new BACnetConstructedDataSlaveProxyEnableBuilderImpl(
-        slaveProxyEnable, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataSlaveProxyEnableBuilderImpl(slaveProxyEnable);
   }
 
   public static class BACnetConstructedDataSlaveProxyEnableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean slaveProxyEnable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSlaveProxyEnableBuilderImpl(
-        BACnetApplicationTagBoolean slaveProxyEnable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagBoolean slaveProxyEnable) {
       this.slaveProxyEnable = slaveProxyEnable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSlaveProxyEnable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSlaveProxyEnable bACnetConstructedDataSlaveProxyEnable =
           new BACnetConstructedDataSlaveProxyEnable(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              slaveProxyEnable,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, slaveProxyEnable);
       return bACnetConstructedDataSlaveProxyEnable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStartTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStartTime.java
index 75d9c715450..da8773542ed 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStartTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStartTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime startTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataStartTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime startTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime startTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.startTime = startTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getStartTime() {
@@ -128,33 +120,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataStartTime");
     // Create the instance
-    return new BACnetConstructedDataStartTimeBuilderImpl(startTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataStartTimeBuilderImpl(startTime);
   }
 
   public static class BACnetConstructedDataStartTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime startTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataStartTimeBuilderImpl(
-        BACnetDateTime startTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataStartTimeBuilderImpl(BACnetDateTime startTime) {
       this.startTime = startTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataStartTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataStartTime bACnetConstructedDataStartTime =
-          new BACnetConstructedDataStartTime(
-              openingTag, peekedTagHeader, closingTag, startTime, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataStartTime(openingTag, peekedTagHeader, closingTag, startTime);
       return bACnetConstructedDataStartTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStateChangeValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStateChangeValues.java
index eac40ec5ce6..51782dda921 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStateChangeValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStateChangeValues.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetTimerStateChangeValue> stateChangeValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataStateChangeValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetTimerStateChangeValue> stateChangeValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetTimerStateChangeValue> stateChangeValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.stateChangeValues = stateChangeValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (stateChangeValues)
     writeComplexTypeArrayField("stateChangeValues", stateChangeValues, writeBuffer);
@@ -179,42 +167,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataStateChangeValues");
     // Create the instance
     return new BACnetConstructedDataStateChangeValuesBuilderImpl(
-        numberOfDataElements, stateChangeValues, tagNumber, arrayIndexArgument);
+        numberOfDataElements, stateChangeValues);
   }
 
   public static class BACnetConstructedDataStateChangeValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetTimerStateChangeValue> stateChangeValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataStateChangeValuesBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetTimerStateChangeValue> stateChangeValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetTimerStateChangeValue> stateChangeValues) {
       this.numberOfDataElements = numberOfDataElements;
       this.stateChangeValues = stateChangeValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataStateChangeValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataStateChangeValues bACnetConstructedDataStateChangeValues =
           new BACnetConstructedDataStateChangeValues(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              stateChangeValues,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, stateChangeValues);
       return bACnetConstructedDataStateChangeValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStateDescription.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStateDescription.java
index 3fe8b984579..8ec5e2f44d5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStateDescription.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStateDescription.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString stateDescription;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataStateDescription(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString stateDescription,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString stateDescription) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.stateDescription = stateDescription;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getStateDescription() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataStateDescription");
     // Create the instance
-    return new BACnetConstructedDataStateDescriptionBuilderImpl(
-        stateDescription, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataStateDescriptionBuilderImpl(stateDescription);
   }
 
   public static class BACnetConstructedDataStateDescriptionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString stateDescription;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataStateDescriptionBuilderImpl(
-        BACnetApplicationTagCharacterString stateDescription,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString stateDescription) {
       this.stateDescription = stateDescription;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataStateDescription build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataStateDescription bACnetConstructedDataStateDescription =
           new BACnetConstructedDataStateDescription(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              stateDescription,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, stateDescription);
       return bACnetConstructedDataStateDescription;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStateText.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStateText.java
index 6e11885fcb9..0e51f3611f7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStateText.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStateText.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagCharacterString> stateText;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataStateText(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagCharacterString> stateText,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagCharacterString> stateText) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.stateText = stateText;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (stateText)
     writeComplexTypeArrayField("stateText", stateText, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataStateText");
     // Create the instance
-    return new BACnetConstructedDataStateTextBuilderImpl(
-        numberOfDataElements, stateText, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataStateTextBuilderImpl(numberOfDataElements, stateText);
   }
 
   public static class BACnetConstructedDataStateTextBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagCharacterString> stateText;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataStateTextBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagCharacterString> stateText,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagCharacterString> stateText) {
       this.numberOfDataElements = numberOfDataElements;
       this.stateText = stateText;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataStateText build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataStateText bACnetConstructedDataStateText =
           new BACnetConstructedDataStateText(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              stateText,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, stateText);
       return bACnetConstructedDataStateText;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStatusFlags.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStatusFlags.java
index 4b972b8e485..30169f4ba64 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStatusFlags.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStatusFlags.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetStatusFlagsTagged statusFlags;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataStatusFlags(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetStatusFlagsTagged statusFlags,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetStatusFlagsTagged statusFlags) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.statusFlags = statusFlags;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetStatusFlagsTagged getStatusFlags() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataStatusFlags");
     // Create the instance
-    return new BACnetConstructedDataStatusFlagsBuilderImpl(
-        statusFlags, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataStatusFlagsBuilderImpl(statusFlags);
   }
 
   public static class BACnetConstructedDataStatusFlagsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetStatusFlagsTagged statusFlags;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataStatusFlagsBuilderImpl(
-        BACnetStatusFlagsTagged statusFlags,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataStatusFlagsBuilderImpl(BACnetStatusFlagsTagged statusFlags) {
       this.statusFlags = statusFlags;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataStatusFlags build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataStatusFlags bACnetConstructedDataStatusFlags =
           new BACnetConstructedDataStatusFlags(
-              openingTag, peekedTagHeader, closingTag, statusFlags, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, statusFlags);
       return bACnetConstructedDataStatusFlags;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStopTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStopTime.java
index 3222a9b0c1c..b888957b3dc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStopTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStopTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime stopTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataStopTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime stopTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime stopTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.stopTime = stopTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getStopTime() {
@@ -128,33 +120,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataStopTime");
     // Create the instance
-    return new BACnetConstructedDataStopTimeBuilderImpl(stopTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataStopTimeBuilderImpl(stopTime);
   }
 
   public static class BACnetConstructedDataStopTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime stopTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataStopTimeBuilderImpl(
-        BACnetDateTime stopTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataStopTimeBuilderImpl(BACnetDateTime stopTime) {
       this.stopTime = stopTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataStopTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataStopTime bACnetConstructedDataStopTime =
-          new BACnetConstructedDataStopTime(
-              openingTag, peekedTagHeader, closingTag, stopTime, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataStopTime(openingTag, peekedTagHeader, closingTag, stopTime);
       return bACnetConstructedDataStopTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStopWhenFull.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStopWhenFull.java
index 0c211b81a00..7a0ac3d8cf0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStopWhenFull.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStopWhenFull.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean stopWhenFull;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataStopWhenFull(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean stopWhenFull,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean stopWhenFull) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.stopWhenFull = stopWhenFull;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getStopWhenFull() {
@@ -132,34 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataStopWhenFull");
     // Create the instance
-    return new BACnetConstructedDataStopWhenFullBuilderImpl(
-        stopWhenFull, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataStopWhenFullBuilderImpl(stopWhenFull);
   }
 
   public static class BACnetConstructedDataStopWhenFullBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean stopWhenFull;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataStopWhenFullBuilderImpl(
-        BACnetApplicationTagBoolean stopWhenFull,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataStopWhenFullBuilderImpl(BACnetApplicationTagBoolean stopWhenFull) {
       this.stopWhenFull = stopWhenFull;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataStopWhenFull build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataStopWhenFull bACnetConstructedDataStopWhenFull =
           new BACnetConstructedDataStopWhenFull(
-              openingTag, peekedTagHeader, closingTag, stopWhenFull, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, stopWhenFull);
       return bACnetConstructedDataStopWhenFull;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStrikeCount.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStrikeCount.java
index bb6b4573678..c40d5a6c271 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStrikeCount.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStrikeCount.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger strikeCount;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataStrikeCount(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger strikeCount,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger strikeCount) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.strikeCount = strikeCount;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getStrikeCount() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataStrikeCount");
     // Create the instance
-    return new BACnetConstructedDataStrikeCountBuilderImpl(
-        strikeCount, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataStrikeCountBuilderImpl(strikeCount);
   }
 
   public static class BACnetConstructedDataStrikeCountBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger strikeCount;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataStrikeCountBuilderImpl(
-        BACnetApplicationTagUnsignedInteger strikeCount,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger strikeCount) {
       this.strikeCount = strikeCount;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataStrikeCount build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataStrikeCount bACnetConstructedDataStrikeCount =
           new BACnetConstructedDataStrikeCount(
-              openingTag, peekedTagHeader, closingTag, strikeCount, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, strikeCount);
       return bACnetConstructedDataStrikeCount;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStructuredObjectList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStructuredObjectList.java
index b5043e5ca1a..143e989d415 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStructuredObjectList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStructuredObjectList.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagObjectIdentifier> structuredObjectList;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataStructuredObjectList(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagObjectIdentifier> structuredObjectList,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagObjectIdentifier> structuredObjectList) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.structuredObjectList = structuredObjectList;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (structuredObjectList)
     writeComplexTypeArrayField("structuredObjectList", structuredObjectList, writeBuffer);
@@ -175,42 +163,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataStructuredObjectList");
     // Create the instance
     return new BACnetConstructedDataStructuredObjectListBuilderImpl(
-        numberOfDataElements, structuredObjectList, tagNumber, arrayIndexArgument);
+        numberOfDataElements, structuredObjectList);
   }
 
   public static class BACnetConstructedDataStructuredObjectListBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagObjectIdentifier> structuredObjectList;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataStructuredObjectListBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagObjectIdentifier> structuredObjectList,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagObjectIdentifier> structuredObjectList) {
       this.numberOfDataElements = numberOfDataElements;
       this.structuredObjectList = structuredObjectList;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataStructuredObjectList build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataStructuredObjectList bACnetConstructedDataStructuredObjectList =
           new BACnetConstructedDataStructuredObjectList(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              structuredObjectList,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, structuredObjectList);
       return bACnetConstructedDataStructuredObjectList;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStructuredViewAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStructuredViewAll.java
index 36da47f4630..fe046468867 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStructuredViewAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataStructuredViewAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataStructuredViewAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataStructuredViewAll");
     // Create the instance
-    return new BACnetConstructedDataStructuredViewAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataStructuredViewAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataStructuredViewAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataStructuredViewAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataStructuredViewAllBuilderImpl() {}
 
     public BACnetConstructedDataStructuredViewAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataStructuredViewAll bACnetConstructedDataStructuredViewAll =
-          new BACnetConstructedDataStructuredViewAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataStructuredViewAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataStructuredViewAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateAnnotations.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateAnnotations.java
index 7e76b4d9f38..8a123e4ee85 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateAnnotations.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateAnnotations.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagCharacterString> subordinateAnnotations;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSubordinateAnnotations(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagCharacterString> subordinateAnnotations,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagCharacterString> subordinateAnnotations) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.subordinateAnnotations = subordinateAnnotations;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (subordinateAnnotations)
     writeComplexTypeArrayField("subordinateAnnotations", subordinateAnnotations, writeBuffer);
@@ -175,42 +163,30 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataSubordinateAnnotations");
     // Create the instance
     return new BACnetConstructedDataSubordinateAnnotationsBuilderImpl(
-        numberOfDataElements, subordinateAnnotations, tagNumber, arrayIndexArgument);
+        numberOfDataElements, subordinateAnnotations);
   }
 
   public static class BACnetConstructedDataSubordinateAnnotationsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagCharacterString> subordinateAnnotations;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSubordinateAnnotationsBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagCharacterString> subordinateAnnotations,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagCharacterString> subordinateAnnotations) {
       this.numberOfDataElements = numberOfDataElements;
       this.subordinateAnnotations = subordinateAnnotations;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSubordinateAnnotations build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSubordinateAnnotations bACnetConstructedDataSubordinateAnnotations =
           new BACnetConstructedDataSubordinateAnnotations(
               openingTag,
               peekedTagHeader,
               closingTag,
               numberOfDataElements,
-              subordinateAnnotations,
-              tagNumber,
-              arrayIndexArgument);
+              subordinateAnnotations);
       return bACnetConstructedDataSubordinateAnnotations;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateList.java
index 2b2e2bb9cb8..ac7515707d5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateList.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetDeviceObjectReference> subordinateList;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSubordinateList(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetDeviceObjectReference> subordinateList,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDeviceObjectReference> subordinateList) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.subordinateList = subordinateList;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (subordinateList)
     writeComplexTypeArrayField("subordinateList", subordinateList, writeBuffer);
@@ -170,42 +158,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataSubordinateList");
     // Create the instance
     return new BACnetConstructedDataSubordinateListBuilderImpl(
-        numberOfDataElements, subordinateList, tagNumber, arrayIndexArgument);
+        numberOfDataElements, subordinateList);
   }
 
   public static class BACnetConstructedDataSubordinateListBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetDeviceObjectReference> subordinateList;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSubordinateListBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetDeviceObjectReference> subordinateList,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDeviceObjectReference> subordinateList) {
       this.numberOfDataElements = numberOfDataElements;
       this.subordinateList = subordinateList;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSubordinateList build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSubordinateList bACnetConstructedDataSubordinateList =
           new BACnetConstructedDataSubordinateList(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              subordinateList,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, subordinateList);
       return bACnetConstructedDataSubordinateList;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateNodeTypes.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateNodeTypes.java
index 58b86c93165..c47ef546b08 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateNodeTypes.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateNodeTypes.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetNodeTypeTagged> subordinateNodeTypes;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSubordinateNodeTypes(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetNodeTypeTagged> subordinateNodeTypes,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetNodeTypeTagged> subordinateNodeTypes) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.subordinateNodeTypes = subordinateNodeTypes;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (subordinateNodeTypes)
     writeComplexTypeArrayField("subordinateNodeTypes", subordinateNodeTypes, writeBuffer);
@@ -175,42 +163,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataSubordinateNodeTypes");
     // Create the instance
     return new BACnetConstructedDataSubordinateNodeTypesBuilderImpl(
-        numberOfDataElements, subordinateNodeTypes, tagNumber, arrayIndexArgument);
+        numberOfDataElements, subordinateNodeTypes);
   }
 
   public static class BACnetConstructedDataSubordinateNodeTypesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetNodeTypeTagged> subordinateNodeTypes;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSubordinateNodeTypesBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetNodeTypeTagged> subordinateNodeTypes,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetNodeTypeTagged> subordinateNodeTypes) {
       this.numberOfDataElements = numberOfDataElements;
       this.subordinateNodeTypes = subordinateNodeTypes;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSubordinateNodeTypes build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSubordinateNodeTypes bACnetConstructedDataSubordinateNodeTypes =
           new BACnetConstructedDataSubordinateNodeTypes(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              subordinateNodeTypes,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, subordinateNodeTypes);
       return bACnetConstructedDataSubordinateNodeTypes;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateRelationships.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateRelationships.java
index 48b16e61e79..fc1c1ade63c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateRelationships.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateRelationships.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetRelationshipTagged> subordinateRelationships;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSubordinateRelationships(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetRelationshipTagged> subordinateRelationships,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetRelationshipTagged> subordinateRelationships) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.subordinateRelationships = subordinateRelationships;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (subordinateRelationships)
     writeComplexTypeArrayField("subordinateRelationships", subordinateRelationships, writeBuffer);
@@ -175,42 +163,30 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataSubordinateRelationships");
     // Create the instance
     return new BACnetConstructedDataSubordinateRelationshipsBuilderImpl(
-        numberOfDataElements, subordinateRelationships, tagNumber, arrayIndexArgument);
+        numberOfDataElements, subordinateRelationships);
   }
 
   public static class BACnetConstructedDataSubordinateRelationshipsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetRelationshipTagged> subordinateRelationships;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSubordinateRelationshipsBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetRelationshipTagged> subordinateRelationships,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetRelationshipTagged> subordinateRelationships) {
       this.numberOfDataElements = numberOfDataElements;
       this.subordinateRelationships = subordinateRelationships;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSubordinateRelationships build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSubordinateRelationships bACnetConstructedDataSubordinateRelationships =
           new BACnetConstructedDataSubordinateRelationships(
               openingTag,
               peekedTagHeader,
               closingTag,
               numberOfDataElements,
-              subordinateRelationships,
-              tagNumber,
-              arrayIndexArgument);
+              subordinateRelationships);
       return bACnetConstructedDataSubordinateRelationships;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateTags.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateTags.java
index 1fcd87b24b2..b02585809b2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateTags.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubordinateTags.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetNameValueCollection> subordinateList;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSubordinateTags(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetNameValueCollection> subordinateList,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetNameValueCollection> subordinateList) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.subordinateList = subordinateList;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (subordinateList)
     writeComplexTypeArrayField("subordinateList", subordinateList, writeBuffer);
@@ -171,42 +159,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataSubordinateTags");
     // Create the instance
     return new BACnetConstructedDataSubordinateTagsBuilderImpl(
-        numberOfDataElements, subordinateList, tagNumber, arrayIndexArgument);
+        numberOfDataElements, subordinateList);
   }
 
   public static class BACnetConstructedDataSubordinateTagsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetNameValueCollection> subordinateList;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSubordinateTagsBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetNameValueCollection> subordinateList,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetNameValueCollection> subordinateList) {
       this.numberOfDataElements = numberOfDataElements;
       this.subordinateList = subordinateList;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSubordinateTags build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSubordinateTags bACnetConstructedDataSubordinateTags =
           new BACnetConstructedDataSubordinateTags(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              subordinateList,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, subordinateList);
       return bACnetConstructedDataSubordinateTags;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubscribedRecipients.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubscribedRecipients.java
index 1bf23a708db..1e627d6c022 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubscribedRecipients.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSubscribedRecipients.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetEventNotificationSubscription> subscribedRecipients;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSubscribedRecipients(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetEventNotificationSubscription> subscribedRecipients,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetEventNotificationSubscription> subscribedRecipients) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.subscribedRecipients = subscribedRecipients;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetEventNotificationSubscription> getSubscribedRecipients() {
@@ -128,39 +120,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataSubscribedRecipients");
     // Create the instance
-    return new BACnetConstructedDataSubscribedRecipientsBuilderImpl(
-        subscribedRecipients, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataSubscribedRecipientsBuilderImpl(subscribedRecipients);
   }
 
   public static class BACnetConstructedDataSubscribedRecipientsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetEventNotificationSubscription> subscribedRecipients;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSubscribedRecipientsBuilderImpl(
-        List<BACnetEventNotificationSubscription> subscribedRecipients,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetEventNotificationSubscription> subscribedRecipients) {
       this.subscribedRecipients = subscribedRecipients;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSubscribedRecipients build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSubscribedRecipients bACnetConstructedDataSubscribedRecipients =
           new BACnetConstructedDataSubscribedRecipients(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              subscribedRecipients,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, subscribedRecipients);
       return bACnetConstructedDataSubscribedRecipients;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSupportedFormatClasses.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSupportedFormatClasses.java
index 31963513f33..ee8496c907f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSupportedFormatClasses.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSupportedFormatClasses.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetApplicationTagUnsignedInteger> supportedFormats;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSupportedFormatClasses(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetApplicationTagUnsignedInteger> supportedFormats,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagUnsignedInteger> supportedFormats) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.supportedFormats = supportedFormats;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (supportedFormats)
     writeComplexTypeArrayField("supportedFormats", supportedFormats, writeBuffer);
@@ -175,42 +163,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataSupportedFormatClasses");
     // Create the instance
     return new BACnetConstructedDataSupportedFormatClassesBuilderImpl(
-        numberOfDataElements, supportedFormats, tagNumber, arrayIndexArgument);
+        numberOfDataElements, supportedFormats);
   }
 
   public static class BACnetConstructedDataSupportedFormatClassesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetApplicationTagUnsignedInteger> supportedFormats;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSupportedFormatClassesBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetApplicationTagUnsignedInteger> supportedFormats,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagUnsignedInteger> supportedFormats) {
       this.numberOfDataElements = numberOfDataElements;
       this.supportedFormats = supportedFormats;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSupportedFormatClasses build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSupportedFormatClasses bACnetConstructedDataSupportedFormatClasses =
           new BACnetConstructedDataSupportedFormatClasses(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              supportedFormats,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, supportedFormats);
       return bACnetConstructedDataSupportedFormatClasses;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSupportedFormats.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSupportedFormats.java
index d3bb003e237..c3a0972ae1f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSupportedFormats.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSupportedFormats.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetAuthenticationFactorFormat> supportedFormats;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSupportedFormats(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetAuthenticationFactorFormat> supportedFormats,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetAuthenticationFactorFormat> supportedFormats) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.supportedFormats = supportedFormats;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (supportedFormats)
     writeComplexTypeArrayField("supportedFormats", supportedFormats, writeBuffer);
@@ -171,42 +159,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataSupportedFormats");
     // Create the instance
     return new BACnetConstructedDataSupportedFormatsBuilderImpl(
-        numberOfDataElements, supportedFormats, tagNumber, arrayIndexArgument);
+        numberOfDataElements, supportedFormats);
   }
 
   public static class BACnetConstructedDataSupportedFormatsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetAuthenticationFactorFormat> supportedFormats;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSupportedFormatsBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetAuthenticationFactorFormat> supportedFormats,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetAuthenticationFactorFormat> supportedFormats) {
       this.numberOfDataElements = numberOfDataElements;
       this.supportedFormats = supportedFormats;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSupportedFormats build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSupportedFormats bACnetConstructedDataSupportedFormats =
           new BACnetConstructedDataSupportedFormats(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              supportedFormats,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, supportedFormats);
       return bACnetConstructedDataSupportedFormats;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSupportedSecurityAlgorithms.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSupportedSecurityAlgorithms.java
index 68e2ecbc426..fa1617d5d0e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSupportedSecurityAlgorithms.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSupportedSecurityAlgorithms.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetApplicationTagUnsignedInteger> supportedSecurityAlgorithms;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSupportedSecurityAlgorithms(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetApplicationTagUnsignedInteger> supportedSecurityAlgorithms,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetApplicationTagUnsignedInteger> supportedSecurityAlgorithms) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.supportedSecurityAlgorithms = supportedSecurityAlgorithms;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetApplicationTagUnsignedInteger> getSupportedSecurityAlgorithms() {
@@ -133,39 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataSupportedSecurityAlgorithms");
     // Create the instance
     return new BACnetConstructedDataSupportedSecurityAlgorithmsBuilderImpl(
-        supportedSecurityAlgorithms, tagNumber, arrayIndexArgument);
+        supportedSecurityAlgorithms);
   }
 
   public static class BACnetConstructedDataSupportedSecurityAlgorithmsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetApplicationTagUnsignedInteger> supportedSecurityAlgorithms;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataSupportedSecurityAlgorithmsBuilderImpl(
-        List<BACnetApplicationTagUnsignedInteger> supportedSecurityAlgorithms,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetApplicationTagUnsignedInteger> supportedSecurityAlgorithms) {
       this.supportedSecurityAlgorithms = supportedSecurityAlgorithms;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSupportedSecurityAlgorithms build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSupportedSecurityAlgorithms
           bACnetConstructedDataSupportedSecurityAlgorithms =
               new BACnetConstructedDataSupportedSecurityAlgorithms(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  supportedSecurityAlgorithms,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, supportedSecurityAlgorithms);
       return bACnetConstructedDataSupportedSecurityAlgorithms;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSystemStatus.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSystemStatus.java
index 862c3dd3bf0..4c295574bd0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSystemStatus.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataSystemStatus.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDeviceStatusTagged systemStatus;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataSystemStatus(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDeviceStatusTagged systemStatus,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDeviceStatusTagged systemStatus) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.systemStatus = systemStatus;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDeviceStatusTagged getSystemStatus() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataSystemStatus");
     // Create the instance
-    return new BACnetConstructedDataSystemStatusBuilderImpl(
-        systemStatus, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataSystemStatusBuilderImpl(systemStatus);
   }
 
   public static class BACnetConstructedDataSystemStatusBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDeviceStatusTagged systemStatus;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataSystemStatusBuilderImpl(
-        BACnetDeviceStatusTagged systemStatus,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataSystemStatusBuilderImpl(BACnetDeviceStatusTagged systemStatus) {
       this.systemStatus = systemStatus;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataSystemStatus build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataSystemStatus bACnetConstructedDataSystemStatus =
           new BACnetConstructedDataSystemStatus(
-              openingTag, peekedTagHeader, closingTag, systemStatus, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, systemStatus);
       return bACnetConstructedDataSystemStatus;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTags.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTags.java
index e431443f2b7..9d052703589 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTags.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTags.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetNameValue> tags;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTags(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetNameValue> tags,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetNameValue> tags) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.tags = tags;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (tags)
     writeComplexTypeArrayField("tags", tags, writeBuffer);
@@ -169,43 +157,25 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTags");
     // Create the instance
-    return new BACnetConstructedDataTagsBuilderImpl(
-        numberOfDataElements, tags, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTagsBuilderImpl(numberOfDataElements, tags);
   }
 
   public static class BACnetConstructedDataTagsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetNameValue> tags;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTagsBuilderImpl(
-        BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetNameValue> tags,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger numberOfDataElements, List<BACnetNameValue> tags) {
       this.numberOfDataElements = numberOfDataElements;
       this.tags = tags;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTags build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTags bACnetConstructedDataTags =
           new BACnetConstructedDataTags(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              tags,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, tags);
       return bACnetConstructedDataTags;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataThreatAuthority.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataThreatAuthority.java
index 525e49d5ed3..856a3096233 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataThreatAuthority.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataThreatAuthority.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetAccessThreatLevel threatAuthority;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataThreatAuthority(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetAccessThreatLevel threatAuthority,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetAccessThreatLevel threatAuthority) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.threatAuthority = threatAuthority;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetAccessThreatLevel getThreatAuthority() {
@@ -130,39 +122,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataThreatAuthority");
     // Create the instance
-    return new BACnetConstructedDataThreatAuthorityBuilderImpl(
-        threatAuthority, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataThreatAuthorityBuilderImpl(threatAuthority);
   }
 
   public static class BACnetConstructedDataThreatAuthorityBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetAccessThreatLevel threatAuthority;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataThreatAuthorityBuilderImpl(
-        BACnetAccessThreatLevel threatAuthority,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetAccessThreatLevel threatAuthority) {
       this.threatAuthority = threatAuthority;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataThreatAuthority build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataThreatAuthority bACnetConstructedDataThreatAuthority =
           new BACnetConstructedDataThreatAuthority(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              threatAuthority,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, threatAuthority);
       return bACnetConstructedDataThreatAuthority;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataThreatLevel.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataThreatLevel.java
index eb013a9b00b..d4a9dbdef05 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataThreatLevel.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataThreatLevel.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetAccessThreatLevel threatLevel;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataThreatLevel(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetAccessThreatLevel threatLevel,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetAccessThreatLevel threatLevel) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.threatLevel = threatLevel;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetAccessThreatLevel getThreatLevel() {
@@ -130,34 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataThreatLevel");
     // Create the instance
-    return new BACnetConstructedDataThreatLevelBuilderImpl(
-        threatLevel, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataThreatLevelBuilderImpl(threatLevel);
   }
 
   public static class BACnetConstructedDataThreatLevelBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetAccessThreatLevel threatLevel;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataThreatLevelBuilderImpl(
-        BACnetAccessThreatLevel threatLevel,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataThreatLevelBuilderImpl(BACnetAccessThreatLevel threatLevel) {
       this.threatLevel = threatLevel;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataThreatLevel build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataThreatLevel bACnetConstructedDataThreatLevel =
           new BACnetConstructedDataThreatLevel(
-              openingTag, peekedTagHeader, closingTag, threatLevel, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, threatLevel);
       return bACnetConstructedDataThreatLevel;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeDelay.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeDelay.java
index cddcdb424eb..72db184cabf 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeDelay.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeDelay.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger timeDelay;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimeDelay(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger timeDelay,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger timeDelay) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.timeDelay = timeDelay;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getTimeDelay() {
@@ -134,33 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimeDelay");
     // Create the instance
-    return new BACnetConstructedDataTimeDelayBuilderImpl(timeDelay, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimeDelayBuilderImpl(timeDelay);
   }
 
   public static class BACnetConstructedDataTimeDelayBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger timeDelay;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimeDelayBuilderImpl(
-        BACnetApplicationTagUnsignedInteger timeDelay,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger timeDelay) {
       this.timeDelay = timeDelay;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimeDelay build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimeDelay bACnetConstructedDataTimeDelay =
-          new BACnetConstructedDataTimeDelay(
-              openingTag, peekedTagHeader, closingTag, timeDelay, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataTimeDelay(openingTag, peekedTagHeader, closingTag, timeDelay);
       return bACnetConstructedDataTimeDelay;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeDelayNormal.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeDelayNormal.java
index 2b87a31df36..64bf8045e99 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeDelayNormal.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeDelayNormal.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger timeDelayNormal;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimeDelayNormal(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger timeDelayNormal,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger timeDelayNormal) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.timeDelayNormal = timeDelayNormal;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getTimeDelayNormal() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimeDelayNormal");
     // Create the instance
-    return new BACnetConstructedDataTimeDelayNormalBuilderImpl(
-        timeDelayNormal, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimeDelayNormalBuilderImpl(timeDelayNormal);
   }
 
   public static class BACnetConstructedDataTimeDelayNormalBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger timeDelayNormal;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimeDelayNormalBuilderImpl(
-        BACnetApplicationTagUnsignedInteger timeDelayNormal,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger timeDelayNormal) {
       this.timeDelayNormal = timeDelayNormal;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimeDelayNormal build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimeDelayNormal bACnetConstructedDataTimeDelayNormal =
           new BACnetConstructedDataTimeDelayNormal(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              timeDelayNormal,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, timeDelayNormal);
       return bACnetConstructedDataTimeDelayNormal;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfActiveTimeReset.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfActiveTimeReset.java
index 078ce2eabd3..547ac04be78 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfActiveTimeReset.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfActiveTimeReset.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime timeOfActiveTimeReset;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimeOfActiveTimeReset(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime timeOfActiveTimeReset,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime timeOfActiveTimeReset) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.timeOfActiveTimeReset = timeOfActiveTimeReset;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getTimeOfActiveTimeReset() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimeOfActiveTimeReset");
     // Create the instance
-    return new BACnetConstructedDataTimeOfActiveTimeResetBuilderImpl(
-        timeOfActiveTimeReset, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimeOfActiveTimeResetBuilderImpl(timeOfActiveTimeReset);
   }
 
   public static class BACnetConstructedDataTimeOfActiveTimeResetBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime timeOfActiveTimeReset;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimeOfActiveTimeResetBuilderImpl(
-        BACnetDateTime timeOfActiveTimeReset,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDateTime timeOfActiveTimeReset) {
       this.timeOfActiveTimeReset = timeOfActiveTimeReset;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimeOfActiveTimeReset build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimeOfActiveTimeReset bACnetConstructedDataTimeOfActiveTimeReset =
           new BACnetConstructedDataTimeOfActiveTimeReset(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              timeOfActiveTimeReset,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, timeOfActiveTimeReset);
       return bACnetConstructedDataTimeOfActiveTimeReset;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfDeviceRestart.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfDeviceRestart.java
index a42be64a643..40c8de8f83e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfDeviceRestart.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfDeviceRestart.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetTimeStamp timeOfDeviceRestart;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimeOfDeviceRestart(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetTimeStamp timeOfDeviceRestart,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetTimeStamp timeOfDeviceRestart) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.timeOfDeviceRestart = timeOfDeviceRestart;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetTimeStamp getTimeOfDeviceRestart() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimeOfDeviceRestart");
     // Create the instance
-    return new BACnetConstructedDataTimeOfDeviceRestartBuilderImpl(
-        timeOfDeviceRestart, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimeOfDeviceRestartBuilderImpl(timeOfDeviceRestart);
   }
 
   public static class BACnetConstructedDataTimeOfDeviceRestartBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetTimeStamp timeOfDeviceRestart;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimeOfDeviceRestartBuilderImpl(
-        BACnetTimeStamp timeOfDeviceRestart,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetTimeStamp timeOfDeviceRestart) {
       this.timeOfDeviceRestart = timeOfDeviceRestart;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimeOfDeviceRestart build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimeOfDeviceRestart bACnetConstructedDataTimeOfDeviceRestart =
           new BACnetConstructedDataTimeOfDeviceRestart(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              timeOfDeviceRestart,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, timeOfDeviceRestart);
       return bACnetConstructedDataTimeOfDeviceRestart;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfStateCountReset.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfStateCountReset.java
index 527c81db982..2e4b355de56 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfStateCountReset.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfStateCountReset.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime timeOfStateCountReset;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimeOfStateCountReset(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime timeOfStateCountReset,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime timeOfStateCountReset) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.timeOfStateCountReset = timeOfStateCountReset;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getTimeOfStateCountReset() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimeOfStateCountReset");
     // Create the instance
-    return new BACnetConstructedDataTimeOfStateCountResetBuilderImpl(
-        timeOfStateCountReset, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimeOfStateCountResetBuilderImpl(timeOfStateCountReset);
   }
 
   public static class BACnetConstructedDataTimeOfStateCountResetBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime timeOfStateCountReset;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimeOfStateCountResetBuilderImpl(
-        BACnetDateTime timeOfStateCountReset,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDateTime timeOfStateCountReset) {
       this.timeOfStateCountReset = timeOfStateCountReset;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimeOfStateCountReset build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimeOfStateCountReset bACnetConstructedDataTimeOfStateCountReset =
           new BACnetConstructedDataTimeOfStateCountReset(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              timeOfStateCountReset,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, timeOfStateCountReset);
       return bACnetConstructedDataTimeOfStateCountReset;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfStrikeCountReset.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfStrikeCountReset.java
index 271de0c20a3..e3b68520f1b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfStrikeCountReset.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeOfStrikeCountReset.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime timeOfStrikeCountReset;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimeOfStrikeCountReset(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime timeOfStrikeCountReset,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime timeOfStrikeCountReset) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.timeOfStrikeCountReset = timeOfStrikeCountReset;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getTimeOfStrikeCountReset() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimeOfStrikeCountReset");
     // Create the instance
-    return new BACnetConstructedDataTimeOfStrikeCountResetBuilderImpl(
-        timeOfStrikeCountReset, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimeOfStrikeCountResetBuilderImpl(timeOfStrikeCountReset);
   }
 
   public static class BACnetConstructedDataTimeOfStrikeCountResetBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime timeOfStrikeCountReset;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimeOfStrikeCountResetBuilderImpl(
-        BACnetDateTime timeOfStrikeCountReset,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDateTime timeOfStrikeCountReset) {
       this.timeOfStrikeCountReset = timeOfStrikeCountReset;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimeOfStrikeCountReset build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimeOfStrikeCountReset bACnetConstructedDataTimeOfStrikeCountReset =
           new BACnetConstructedDataTimeOfStrikeCountReset(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              timeOfStrikeCountReset,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, timeOfStrikeCountReset);
       return bACnetConstructedDataTimeOfStrikeCountReset;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimePatternValuePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimePatternValuePresentValue.java
index b3076e2eadf..6c5246afebd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimePatternValuePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimePatternValuePresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagTime presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimePatternValuePresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagTime presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagTime presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagTime getPresentValue() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimePatternValuePresentValue");
     // Create the instance
-    return new BACnetConstructedDataTimePatternValuePresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimePatternValuePresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataTimePatternValuePresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagTime presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimePatternValuePresentValueBuilderImpl(
-        BACnetApplicationTagTime presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagTime presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimePatternValuePresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimePatternValuePresentValue
           bACnetConstructedDataTimePatternValuePresentValue =
               new BACnetConstructedDataTimePatternValuePresentValue(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  presentValue,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataTimePatternValuePresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimePatternValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimePatternValueRelinquishDefault.java
index d87eb846dd3..d4ec28308ef 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimePatternValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimePatternValueRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagTime relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimePatternValueRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagTime relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagTime relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagTime getRelinquishDefault() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimePatternValueRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataTimePatternValueRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimePatternValueRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataTimePatternValueRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagTime relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimePatternValueRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagTime relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagTime relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimePatternValueRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimePatternValueRelinquishDefault
           bACnetConstructedDataTimePatternValueRelinquishDefault =
               new BACnetConstructedDataTimePatternValueRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataTimePatternValueRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeSynchronizationInterval.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeSynchronizationInterval.java
index 957124cbc22..8331d2f2082 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeSynchronizationInterval.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeSynchronizationInterval.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger timeSynchronization;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimeSynchronizationInterval(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger timeSynchronization,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger timeSynchronization) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.timeSynchronization = timeSynchronization;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getTimeSynchronization() {
@@ -136,40 +128,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimeSynchronizationInterval");
     // Create the instance
-    return new BACnetConstructedDataTimeSynchronizationIntervalBuilderImpl(
-        timeSynchronization, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimeSynchronizationIntervalBuilderImpl(timeSynchronization);
   }
 
   public static class BACnetConstructedDataTimeSynchronizationIntervalBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger timeSynchronization;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimeSynchronizationIntervalBuilderImpl(
-        BACnetApplicationTagUnsignedInteger timeSynchronization,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger timeSynchronization) {
       this.timeSynchronization = timeSynchronization;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimeSynchronizationInterval build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimeSynchronizationInterval
           bACnetConstructedDataTimeSynchronizationInterval =
               new BACnetConstructedDataTimeSynchronizationInterval(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  timeSynchronization,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, timeSynchronization);
       return bACnetConstructedDataTimeSynchronizationInterval;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeSynchronizationRecipients.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeSynchronizationRecipients.java
index 4bd6d0518c0..ba8b59e2bef 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeSynchronizationRecipients.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeSynchronizationRecipients.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetRecipient> timeSynchronizationRecipients;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimeSynchronizationRecipients(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetRecipient> timeSynchronizationRecipients,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetRecipient> timeSynchronizationRecipients) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.timeSynchronizationRecipients = timeSynchronizationRecipients;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetRecipient> getTimeSynchronizationRecipients() {
@@ -129,39 +121,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataTimeSynchronizationRecipients");
     // Create the instance
     return new BACnetConstructedDataTimeSynchronizationRecipientsBuilderImpl(
-        timeSynchronizationRecipients, tagNumber, arrayIndexArgument);
+        timeSynchronizationRecipients);
   }
 
   public static class BACnetConstructedDataTimeSynchronizationRecipientsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetRecipient> timeSynchronizationRecipients;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimeSynchronizationRecipientsBuilderImpl(
-        List<BACnetRecipient> timeSynchronizationRecipients,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetRecipient> timeSynchronizationRecipients) {
       this.timeSynchronizationRecipients = timeSynchronizationRecipients;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimeSynchronizationRecipients build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimeSynchronizationRecipients
           bACnetConstructedDataTimeSynchronizationRecipients =
               new BACnetConstructedDataTimeSynchronizationRecipients(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  timeSynchronizationRecipients,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, timeSynchronizationRecipients);
       return bACnetConstructedDataTimeSynchronizationRecipients;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeValueAll.java
index 9da85189d6a..6363d19eb0c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeValueAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimeValueAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimeValueAll");
     // Create the instance
-    return new BACnetConstructedDataTimeValueAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimeValueAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataTimeValueAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataTimeValueAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataTimeValueAllBuilderImpl() {}
 
     public BACnetConstructedDataTimeValueAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimeValueAll bACnetConstructedDataTimeValueAll =
-          new BACnetConstructedDataTimeValueAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataTimeValueAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataTimeValueAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeValuePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeValuePresentValue.java
index 86a59acd9f7..c8c5ab464a8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeValuePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeValuePresentValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagTime presentValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimeValuePresentValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagTime presentValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagTime presentValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.presentValue = presentValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagTime getPresentValue() {
@@ -133,34 +125,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimeValuePresentValue");
     // Create the instance
-    return new BACnetConstructedDataTimeValuePresentValueBuilderImpl(
-        presentValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimeValuePresentValueBuilderImpl(presentValue);
   }
 
   public static class BACnetConstructedDataTimeValuePresentValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagTime presentValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimeValuePresentValueBuilderImpl(
-        BACnetApplicationTagTime presentValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagTime presentValue) {
       this.presentValue = presentValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimeValuePresentValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimeValuePresentValue bACnetConstructedDataTimeValuePresentValue =
           new BACnetConstructedDataTimeValuePresentValue(
-              openingTag, peekedTagHeader, closingTag, presentValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, presentValue);
       return bACnetConstructedDataTimeValuePresentValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeValueRelinquishDefault.java
index 934d2ed393c..fe49451491b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimeValueRelinquishDefault.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagTime relinquishDefault;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimeValueRelinquishDefault(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagTime relinquishDefault,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagTime relinquishDefault) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.relinquishDefault = relinquishDefault;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagTime getRelinquishDefault() {
@@ -133,40 +125,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimeValueRelinquishDefault");
     // Create the instance
-    return new BACnetConstructedDataTimeValueRelinquishDefaultBuilderImpl(
-        relinquishDefault, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimeValueRelinquishDefaultBuilderImpl(relinquishDefault);
   }
 
   public static class BACnetConstructedDataTimeValueRelinquishDefaultBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagTime relinquishDefault;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimeValueRelinquishDefaultBuilderImpl(
-        BACnetApplicationTagTime relinquishDefault,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagTime relinquishDefault) {
       this.relinquishDefault = relinquishDefault;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimeValueRelinquishDefault build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimeValueRelinquishDefault
           bACnetConstructedDataTimeValueRelinquishDefault =
               new BACnetConstructedDataTimeValueRelinquishDefault(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  relinquishDefault,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, relinquishDefault);
       return bACnetConstructedDataTimeValueRelinquishDefault;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimepatternValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimepatternValueAll.java
index 985c937d96a..9e8daddfdf8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimepatternValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimepatternValueAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimepatternValueAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimepatternValueAll");
     // Create the instance
-    return new BACnetConstructedDataTimepatternValueAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimepatternValueAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataTimepatternValueAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataTimepatternValueAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataTimepatternValueAllBuilderImpl() {}
 
     public BACnetConstructedDataTimepatternValueAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimepatternValueAll bACnetConstructedDataTimepatternValueAll =
-          new BACnetConstructedDataTimepatternValueAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataTimepatternValueAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataTimepatternValueAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerAlarmValues.java
index 43567369de1..0350f26e214 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerAlarmValues.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetTimerStateTagged> alarmValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimerAlarmValues(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetTimerStateTagged> alarmValues,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetTimerStateTagged> alarmValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.alarmValues = alarmValues;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetTimerStateTagged> getAlarmValues() {
@@ -131,34 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimerAlarmValues");
     // Create the instance
-    return new BACnetConstructedDataTimerAlarmValuesBuilderImpl(
-        alarmValues, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimerAlarmValuesBuilderImpl(alarmValues);
   }
 
   public static class BACnetConstructedDataTimerAlarmValuesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetTimerStateTagged> alarmValues;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimerAlarmValuesBuilderImpl(
-        List<BACnetTimerStateTagged> alarmValues,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetTimerStateTagged> alarmValues) {
       this.alarmValues = alarmValues;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimerAlarmValues build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimerAlarmValues bACnetConstructedDataTimerAlarmValues =
           new BACnetConstructedDataTimerAlarmValues(
-              openingTag, peekedTagHeader, closingTag, alarmValues, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, alarmValues);
       return bACnetConstructedDataTimerAlarmValues;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerAll.java
index 7a28a080227..51e8b9fcc87 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimerAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimerAll");
     // Create the instance
-    return new BACnetConstructedDataTimerAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimerAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataTimerAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataTimerAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataTimerAllBuilderImpl() {}
 
     public BACnetConstructedDataTimerAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimerAll bACnetConstructedDataTimerAll =
-          new BACnetConstructedDataTimerAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataTimerAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataTimerAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerMaxPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerMaxPresValue.java
index 9ca319e1ac3..7fb0b81a18c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerMaxPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerMaxPresValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger maxPresValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimerMaxPresValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger maxPresValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger maxPresValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.maxPresValue = maxPresValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMaxPresValue() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimerMaxPresValue");
     // Create the instance
-    return new BACnetConstructedDataTimerMaxPresValueBuilderImpl(
-        maxPresValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimerMaxPresValueBuilderImpl(maxPresValue);
   }
 
   public static class BACnetConstructedDataTimerMaxPresValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger maxPresValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimerMaxPresValueBuilderImpl(
-        BACnetApplicationTagUnsignedInteger maxPresValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger maxPresValue) {
       this.maxPresValue = maxPresValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimerMaxPresValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimerMaxPresValue bACnetConstructedDataTimerMaxPresValue =
           new BACnetConstructedDataTimerMaxPresValue(
-              openingTag, peekedTagHeader, closingTag, maxPresValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, maxPresValue);
       return bACnetConstructedDataTimerMaxPresValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerMinPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerMinPresValue.java
index 82d6d03e1f3..cb6496c88c1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerMinPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerMinPresValue.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger minPresValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimerMinPresValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger minPresValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger minPresValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.minPresValue = minPresValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getMinPresValue() {
@@ -135,34 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimerMinPresValue");
     // Create the instance
-    return new BACnetConstructedDataTimerMinPresValueBuilderImpl(
-        minPresValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimerMinPresValueBuilderImpl(minPresValue);
   }
 
   public static class BACnetConstructedDataTimerMinPresValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger minPresValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimerMinPresValueBuilderImpl(
-        BACnetApplicationTagUnsignedInteger minPresValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger minPresValue) {
       this.minPresValue = minPresValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimerMinPresValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimerMinPresValue bACnetConstructedDataTimerMinPresValue =
           new BACnetConstructedDataTimerMinPresValue(
-              openingTag, peekedTagHeader, closingTag, minPresValue, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, minPresValue);
       return bACnetConstructedDataTimerMinPresValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerResolution.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerResolution.java
index 6826ada456f..99f86e442b8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerResolution.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerResolution.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger resolution;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimerResolution(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger resolution,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger resolution) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.resolution = resolution;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getResolution() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimerResolution");
     // Create the instance
-    return new BACnetConstructedDataTimerResolutionBuilderImpl(
-        resolution, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimerResolutionBuilderImpl(resolution);
   }
 
   public static class BACnetConstructedDataTimerResolutionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger resolution;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTimerResolutionBuilderImpl(
-        BACnetApplicationTagUnsignedInteger resolution,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger resolution) {
       this.resolution = resolution;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimerResolution build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimerResolution bACnetConstructedDataTimerResolution =
           new BACnetConstructedDataTimerResolution(
-              openingTag, peekedTagHeader, closingTag, resolution, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, resolution);
       return bACnetConstructedDataTimerResolution;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerRunning.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerRunning.java
index dd19a995291..42a946b92e0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerRunning.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerRunning.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean timerRunning;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimerRunning(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean timerRunning,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean timerRunning) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.timerRunning = timerRunning;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getTimerRunning() {
@@ -132,34 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimerRunning");
     // Create the instance
-    return new BACnetConstructedDataTimerRunningBuilderImpl(
-        timerRunning, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimerRunningBuilderImpl(timerRunning);
   }
 
   public static class BACnetConstructedDataTimerRunningBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean timerRunning;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataTimerRunningBuilderImpl(
-        BACnetApplicationTagBoolean timerRunning,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataTimerRunningBuilderImpl(BACnetApplicationTagBoolean timerRunning) {
       this.timerRunning = timerRunning;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimerRunning build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimerRunning bACnetConstructedDataTimerRunning =
           new BACnetConstructedDataTimerRunning(
-              openingTag, peekedTagHeader, closingTag, timerRunning, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, timerRunning);
       return bACnetConstructedDataTimerRunning;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerState.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerState.java
index 9bdf2380738..6571cb9af5a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerState.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTimerState.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetTimerStateTagged timerState;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTimerState(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetTimerStateTagged timerState,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetTimerStateTagged timerState) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.timerState = timerState;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetTimerStateTagged getTimerState() {
@@ -134,34 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTimerState");
     // Create the instance
-    return new BACnetConstructedDataTimerStateBuilderImpl(
-        timerState, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTimerStateBuilderImpl(timerState);
   }
 
   public static class BACnetConstructedDataTimerStateBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetTimerStateTagged timerState;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataTimerStateBuilderImpl(
-        BACnetTimerStateTagged timerState,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataTimerStateBuilderImpl(BACnetTimerStateTagged timerState) {
       this.timerState = timerState;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTimerState build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTimerState bACnetConstructedDataTimerState =
-          new BACnetConstructedDataTimerState(
-              openingTag, peekedTagHeader, closingTag, timerState, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataTimerState(openingTag, peekedTagHeader, closingTag, timerState);
       return bACnetConstructedDataTimerState;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTotalRecordCount.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTotalRecordCount.java
index cec8269e004..1df8f92d37a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTotalRecordCount.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTotalRecordCount.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger totalRecordCount;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTotalRecordCount(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger totalRecordCount,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger totalRecordCount) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.totalRecordCount = totalRecordCount;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getTotalRecordCount() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTotalRecordCount");
     // Create the instance
-    return new BACnetConstructedDataTotalRecordCountBuilderImpl(
-        totalRecordCount, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTotalRecordCountBuilderImpl(totalRecordCount);
   }
 
   public static class BACnetConstructedDataTotalRecordCountBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger totalRecordCount;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTotalRecordCountBuilderImpl(
-        BACnetApplicationTagUnsignedInteger totalRecordCount,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger totalRecordCount) {
       this.totalRecordCount = totalRecordCount;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTotalRecordCount build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTotalRecordCount bACnetConstructedDataTotalRecordCount =
           new BACnetConstructedDataTotalRecordCount(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              totalRecordCount,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, totalRecordCount);
       return bACnetConstructedDataTotalRecordCount;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTraceFlag.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTraceFlag.java
index 477d6a9b114..17d84e91150 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTraceFlag.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTraceFlag.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean traceFlag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTraceFlag(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean traceFlag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean traceFlag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.traceFlag = traceFlag;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getTraceFlag() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTraceFlag");
     // Create the instance
-    return new BACnetConstructedDataTraceFlagBuilderImpl(traceFlag, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTraceFlagBuilderImpl(traceFlag);
   }
 
   public static class BACnetConstructedDataTraceFlagBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean traceFlag;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataTraceFlagBuilderImpl(
-        BACnetApplicationTagBoolean traceFlag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataTraceFlagBuilderImpl(BACnetApplicationTagBoolean traceFlag) {
       this.traceFlag = traceFlag;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTraceFlag build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTraceFlag bACnetConstructedDataTraceFlag =
-          new BACnetConstructedDataTraceFlag(
-              openingTag, peekedTagHeader, closingTag, traceFlag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataTraceFlag(openingTag, peekedTagHeader, closingTag, traceFlag);
       return bACnetConstructedDataTraceFlag;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrackingValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrackingValue.java
index 09f5becce83..9621d83410a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrackingValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrackingValue.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLifeSafetyStateTagged trackingValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTrackingValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLifeSafetyStateTagged trackingValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLifeSafetyStateTagged trackingValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.trackingValue = trackingValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLifeSafetyStateTagged getTrackingValue() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTrackingValue");
     // Create the instance
-    return new BACnetConstructedDataTrackingValueBuilderImpl(
-        trackingValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTrackingValueBuilderImpl(trackingValue);
   }
 
   public static class BACnetConstructedDataTrackingValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLifeSafetyStateTagged trackingValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTrackingValueBuilderImpl(
-        BACnetLifeSafetyStateTagged trackingValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetLifeSafetyStateTagged trackingValue) {
       this.trackingValue = trackingValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTrackingValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTrackingValue bACnetConstructedDataTrackingValue =
           new BACnetConstructedDataTrackingValue(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              trackingValue,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, trackingValue);
       return bACnetConstructedDataTrackingValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTransactionNotificationClass.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTransactionNotificationClass.java
index d891668e4ff..390063d9038 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTransactionNotificationClass.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTransactionNotificationClass.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger transactionNotificationClass;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTransactionNotificationClass(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger transactionNotificationClass,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger transactionNotificationClass) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.transactionNotificationClass = transactionNotificationClass;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getTransactionNotificationClass() {
@@ -138,39 +130,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataTransactionNotificationClass");
     // Create the instance
     return new BACnetConstructedDataTransactionNotificationClassBuilderImpl(
-        transactionNotificationClass, tagNumber, arrayIndexArgument);
+        transactionNotificationClass);
   }
 
   public static class BACnetConstructedDataTransactionNotificationClassBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger transactionNotificationClass;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTransactionNotificationClassBuilderImpl(
-        BACnetApplicationTagUnsignedInteger transactionNotificationClass,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger transactionNotificationClass) {
       this.transactionNotificationClass = transactionNotificationClass;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTransactionNotificationClass build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTransactionNotificationClass
           bACnetConstructedDataTransactionNotificationClass =
               new BACnetConstructedDataTransactionNotificationClass(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  transactionNotificationClass,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, transactionNotificationClass);
       return bACnetConstructedDataTransactionNotificationClass;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTransition.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTransition.java
index f2a6fedde2b..e96850b1cd6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTransition.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTransition.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetLightingTransitionTagged transition;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTransition(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLightingTransitionTagged transition,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetLightingTransitionTagged transition) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.transition = transition;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetLightingTransitionTagged getTransition() {
@@ -134,34 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTransition");
     // Create the instance
-    return new BACnetConstructedDataTransitionBuilderImpl(
-        transition, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTransitionBuilderImpl(transition);
   }
 
   public static class BACnetConstructedDataTransitionBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetLightingTransitionTagged transition;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataTransitionBuilderImpl(
-        BACnetLightingTransitionTagged transition,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataTransitionBuilderImpl(BACnetLightingTransitionTagged transition) {
       this.transition = transition;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTransition build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTransition bACnetConstructedDataTransition =
-          new BACnetConstructedDataTransition(
-              openingTag, peekedTagHeader, closingTag, transition, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataTransition(openingTag, peekedTagHeader, closingTag, transition);
       return bACnetConstructedDataTransition;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogAll.java
index 9ac307a64a1..6648bc37537 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogAll.java
@@ -46,19 +46,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTrendLogAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -103,29 +93,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTrendLogAll");
     // Create the instance
-    return new BACnetConstructedDataTrendLogAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTrendLogAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataTrendLogAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataTrendLogAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataTrendLogAllBuilderImpl() {}
 
     public BACnetConstructedDataTrendLogAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTrendLogAll bACnetConstructedDataTrendLogAll =
-          new BACnetConstructedDataTrendLogAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataTrendLogAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataTrendLogAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogLogBuffer.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogLogBuffer.java
index f753c2c9188..d6a1f097f3e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogLogBuffer.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogLogBuffer.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetLogRecord> floorText;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTrendLogLogBuffer(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetLogRecord> floorText,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLogRecord> floorText) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.floorText = floorText;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetLogRecord> getFloorText() {
@@ -127,34 +119,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTrendLogLogBuffer");
     // Create the instance
-    return new BACnetConstructedDataTrendLogLogBufferBuilderImpl(
-        floorText, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTrendLogLogBufferBuilderImpl(floorText);
   }
 
   public static class BACnetConstructedDataTrendLogLogBufferBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetLogRecord> floorText;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataTrendLogLogBufferBuilderImpl(
-        List<BACnetLogRecord> floorText,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataTrendLogLogBufferBuilderImpl(List<BACnetLogRecord> floorText) {
       this.floorText = floorText;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTrendLogLogBuffer build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTrendLogLogBuffer bACnetConstructedDataTrendLogLogBuffer =
           new BACnetConstructedDataTrendLogLogBuffer(
-              openingTag, peekedTagHeader, closingTag, floorText, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, floorText);
       return bACnetConstructedDataTrendLogLogBuffer;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogLogDeviceObjectProperty.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogLogDeviceObjectProperty.java
index 343b919656e..c3ebe119c6b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogLogDeviceObjectProperty.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogLogDeviceObjectProperty.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDeviceObjectPropertyReference logDeviceObjectProperty;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTrendLogLogDeviceObjectProperty(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDeviceObjectPropertyReference logDeviceObjectProperty,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDeviceObjectPropertyReference logDeviceObjectProperty) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.logDeviceObjectProperty = logDeviceObjectProperty;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDeviceObjectPropertyReference getLogDeviceObjectProperty() {
@@ -134,39 +126,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataTrendLogLogDeviceObjectProperty");
     // Create the instance
     return new BACnetConstructedDataTrendLogLogDeviceObjectPropertyBuilderImpl(
-        logDeviceObjectProperty, tagNumber, arrayIndexArgument);
+        logDeviceObjectProperty);
   }
 
   public static class BACnetConstructedDataTrendLogLogDeviceObjectPropertyBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDeviceObjectPropertyReference logDeviceObjectProperty;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTrendLogLogDeviceObjectPropertyBuilderImpl(
-        BACnetDeviceObjectPropertyReference logDeviceObjectProperty,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetDeviceObjectPropertyReference logDeviceObjectProperty) {
       this.logDeviceObjectProperty = logDeviceObjectProperty;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTrendLogLogDeviceObjectProperty build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTrendLogLogDeviceObjectProperty
           bACnetConstructedDataTrendLogLogDeviceObjectProperty =
               new BACnetConstructedDataTrendLogLogDeviceObjectProperty(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  logDeviceObjectProperty,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, logDeviceObjectProperty);
       return bACnetConstructedDataTrendLogLogDeviceObjectProperty;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogMultipleAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogMultipleAll.java
index 0fae9430a84..b075ce9d685 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogMultipleAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogMultipleAll.java
@@ -47,19 +47,9 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
     return BACnetPropertyIdentifier.ALL;
   }
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTrendLogMultipleAll(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
   }
 
   @Override
@@ -104,29 +94,18 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTrendLogMultipleAll");
     // Create the instance
-    return new BACnetConstructedDataTrendLogMultipleAllBuilderImpl(tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTrendLogMultipleAllBuilderImpl();
   }
 
   public static class BACnetConstructedDataTrendLogMultipleAllBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataTrendLogMultipleAllBuilderImpl(
-        Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
-    }
+    public BACnetConstructedDataTrendLogMultipleAllBuilderImpl() {}
 
     public BACnetConstructedDataTrendLogMultipleAll build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTrendLogMultipleAll bACnetConstructedDataTrendLogMultipleAll =
-          new BACnetConstructedDataTrendLogMultipleAll(
-              openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataTrendLogMultipleAll(openingTag, peekedTagHeader, closingTag);
       return bACnetConstructedDataTrendLogMultipleAll;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogMultipleLogBuffer.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogMultipleLogBuffer.java
index d0c205bf8cd..7427f715569 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogMultipleLogBuffer.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogMultipleLogBuffer.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetLogMultipleRecord> floorText;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTrendLogMultipleLogBuffer(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetLogMultipleRecord> floorText,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetLogMultipleRecord> floorText) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.floorText = floorText;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetLogMultipleRecord> getFloorText() {
@@ -127,40 +119,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTrendLogMultipleLogBuffer");
     // Create the instance
-    return new BACnetConstructedDataTrendLogMultipleLogBufferBuilderImpl(
-        floorText, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTrendLogMultipleLogBufferBuilderImpl(floorText);
   }
 
   public static class BACnetConstructedDataTrendLogMultipleLogBufferBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetLogMultipleRecord> floorText;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTrendLogMultipleLogBufferBuilderImpl(
-        List<BACnetLogMultipleRecord> floorText,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetLogMultipleRecord> floorText) {
       this.floorText = floorText;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTrendLogMultipleLogBuffer build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTrendLogMultipleLogBuffer
           bACnetConstructedDataTrendLogMultipleLogBuffer =
               new BACnetConstructedDataTrendLogMultipleLogBuffer(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  floorText,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, floorText);
       return bACnetConstructedDataTrendLogMultipleLogBuffer;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.java
index 709f08d2fe6..99e109ecc56 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetDeviceObjectPropertyReference> groupMembers;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetDeviceObjectPropertyReference> groupMembers,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDeviceObjectPropertyReference> groupMembers) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.groupMembers = groupMembers;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (groupMembers)
     writeComplexTypeArrayField("groupMembers", groupMembers, writeBuffer);
@@ -172,43 +160,27 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty");
     // Create the instance
     return new BACnetConstructedDataTrendLogMultipleLogDeviceObjectPropertyBuilderImpl(
-        numberOfDataElements, groupMembers, tagNumber, arrayIndexArgument);
+        numberOfDataElements, groupMembers);
   }
 
   public static class BACnetConstructedDataTrendLogMultipleLogDeviceObjectPropertyBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetDeviceObjectPropertyReference> groupMembers;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataTrendLogMultipleLogDeviceObjectPropertyBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetDeviceObjectPropertyReference> groupMembers,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDeviceObjectPropertyReference> groupMembers) {
       this.numberOfDataElements = numberOfDataElements;
       this.groupMembers = groupMembers;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty
           bACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty =
               new BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  numberOfDataElements,
-                  groupMembers,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, numberOfDataElements, groupMembers);
       return bACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrigger.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrigger.java
index 426b532a454..8e421c68b20 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrigger.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataTrigger.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagBoolean trigger;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataTrigger(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean trigger,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagBoolean trigger) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.trigger = trigger;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagBoolean getTrigger() {
@@ -132,33 +124,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataTrigger");
     // Create the instance
-    return new BACnetConstructedDataTriggerBuilderImpl(trigger, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataTriggerBuilderImpl(trigger);
   }
 
   public static class BACnetConstructedDataTriggerBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagBoolean trigger;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataTriggerBuilderImpl(
-        BACnetApplicationTagBoolean trigger,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataTriggerBuilderImpl(BACnetApplicationTagBoolean trigger) {
       this.trigger = trigger;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataTrigger build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataTrigger bACnetConstructedDataTrigger =
-          new BACnetConstructedDataTrigger(
-              openingTag, peekedTagHeader, closingTag, trigger, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataTrigger(openingTag, peekedTagHeader, closingTag, trigger);
       return bACnetConstructedDataTrigger;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUTCOffset.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUTCOffset.java
index e148f8f0e48..bddf515a8dd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUTCOffset.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUTCOffset.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger utcOffset;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataUTCOffset(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger utcOffset,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger utcOffset) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.utcOffset = utcOffset;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getUtcOffset() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataUTCOffset");
     // Create the instance
-    return new BACnetConstructedDataUTCOffsetBuilderImpl(utcOffset, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataUTCOffsetBuilderImpl(utcOffset);
   }
 
   public static class BACnetConstructedDataUTCOffsetBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger utcOffset;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataUTCOffsetBuilderImpl(
-        BACnetApplicationTagSignedInteger utcOffset,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataUTCOffsetBuilderImpl(BACnetApplicationTagSignedInteger utcOffset) {
       this.utcOffset = utcOffset;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataUTCOffset build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataUTCOffset bACnetConstructedDataUTCOffset =
-          new BACnetConstructedDataUTCOffset(
-              openingTag, peekedTagHeader, closingTag, utcOffset, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataUTCOffset(openingTag, peekedTagHeader, closingTag, utcOffset);
       return bACnetConstructedDataUTCOffset;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUTCTimeSynchronizationRecipients.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUTCTimeSynchronizationRecipients.java
index f46f51ee20b..fbeb46b42ef 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUTCTimeSynchronizationRecipients.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUTCTimeSynchronizationRecipients.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetRecipient> utcTimeSynchronizationRecipients;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataUTCTimeSynchronizationRecipients(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetRecipient> utcTimeSynchronizationRecipients,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetRecipient> utcTimeSynchronizationRecipients) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.utcTimeSynchronizationRecipients = utcTimeSynchronizationRecipients;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetRecipient> getUtcTimeSynchronizationRecipients() {
@@ -129,39 +121,24 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataUTCTimeSynchronizationRecipients");
     // Create the instance
     return new BACnetConstructedDataUTCTimeSynchronizationRecipientsBuilderImpl(
-        utcTimeSynchronizationRecipients, tagNumber, arrayIndexArgument);
+        utcTimeSynchronizationRecipients);
   }
 
   public static class BACnetConstructedDataUTCTimeSynchronizationRecipientsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetRecipient> utcTimeSynchronizationRecipients;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataUTCTimeSynchronizationRecipientsBuilderImpl(
-        List<BACnetRecipient> utcTimeSynchronizationRecipients,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetRecipient> utcTimeSynchronizationRecipients) {
       this.utcTimeSynchronizationRecipients = utcTimeSynchronizationRecipients;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataUTCTimeSynchronizationRecipients build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataUTCTimeSynchronizationRecipients
           bACnetConstructedDataUTCTimeSynchronizationRecipients =
               new BACnetConstructedDataUTCTimeSynchronizationRecipients(
-                  openingTag,
-                  peekedTagHeader,
-                  closingTag,
-                  utcTimeSynchronizationRecipients,
-                  tagNumber,
-                  arrayIndexArgument);
+                  openingTag, peekedTagHeader, closingTag, utcTimeSynchronizationRecipients);
       return bACnetConstructedDataUTCTimeSynchronizationRecipients;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUnits.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUnits.java
index 257eac7b2a3..71e4c7474ea 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUnits.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUnits.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetEngineeringUnitsTagged units;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataUnits(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetEngineeringUnitsTagged units,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetEngineeringUnitsTagged units) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.units = units;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetEngineeringUnitsTagged getUnits() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataUnits");
     // Create the instance
-    return new BACnetConstructedDataUnitsBuilderImpl(units, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataUnitsBuilderImpl(units);
   }
 
   public static class BACnetConstructedDataUnitsBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetEngineeringUnitsTagged units;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataUnitsBuilderImpl(
-        BACnetEngineeringUnitsTagged units,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataUnitsBuilderImpl(BACnetEngineeringUnitsTagged units) {
       this.units = units;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataUnits build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataUnits bACnetConstructedDataUnits =
-          new BACnetConstructedDataUnits(
-              openingTag, peekedTagHeader, closingTag, units, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataUnits(openingTag, peekedTagHeader, closingTag, units);
       return bACnetConstructedDataUnits;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUnspecified.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUnspecified.java
index 9b1af856ced..26d2d195eb5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUnspecified.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUnspecified.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetConstructedDataElement> data;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataUnspecified(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetConstructedDataElement> data,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetConstructedDataElement> data) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.data = data;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (data)
     writeComplexTypeArrayField("data", data, writeBuffer);
@@ -176,43 +164,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataUnspecified");
     // Create the instance
-    return new BACnetConstructedDataUnspecifiedBuilderImpl(
-        numberOfDataElements, data, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataUnspecifiedBuilderImpl(numberOfDataElements, data);
   }
 
   public static class BACnetConstructedDataUnspecifiedBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetConstructedDataElement> data;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataUnspecifiedBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetConstructedDataElement> data,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetConstructedDataElement> data) {
       this.numberOfDataElements = numberOfDataElements;
       this.data = data;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataUnspecified build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataUnspecified bACnetConstructedDataUnspecified =
           new BACnetConstructedDataUnspecified(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              data,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, data);
       return bACnetConstructedDataUnspecified;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUpdateInterval.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUpdateInterval.java
index ecc2affb904..18a0c36ca27 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUpdateInterval.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUpdateInterval.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger updateInterval;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataUpdateInterval(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger updateInterval,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger updateInterval) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.updateInterval = updateInterval;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getUpdateInterval() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataUpdateInterval");
     // Create the instance
-    return new BACnetConstructedDataUpdateIntervalBuilderImpl(
-        updateInterval, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataUpdateIntervalBuilderImpl(updateInterval);
   }
 
   public static class BACnetConstructedDataUpdateIntervalBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger updateInterval;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataUpdateIntervalBuilderImpl(
-        BACnetApplicationTagUnsignedInteger updateInterval,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger updateInterval) {
       this.updateInterval = updateInterval;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataUpdateInterval build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataUpdateInterval bACnetConstructedDataUpdateInterval =
           new BACnetConstructedDataUpdateInterval(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              updateInterval,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, updateInterval);
       return bACnetConstructedDataUpdateInterval;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUpdateKeySetTimeout.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUpdateKeySetTimeout.java
index bb1f128399a..21ef266c413 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUpdateKeySetTimeout.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUpdateKeySetTimeout.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger updateKeySetTimeout;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataUpdateKeySetTimeout(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger updateKeySetTimeout,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger updateKeySetTimeout) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.updateKeySetTimeout = updateKeySetTimeout;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getUpdateKeySetTimeout() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataUpdateKeySetTimeout");
     // Create the instance
-    return new BACnetConstructedDataUpdateKeySetTimeoutBuilderImpl(
-        updateKeySetTimeout, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataUpdateKeySetTimeoutBuilderImpl(updateKeySetTimeout);
   }
 
   public static class BACnetConstructedDataUpdateKeySetTimeoutBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger updateKeySetTimeout;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataUpdateKeySetTimeoutBuilderImpl(
-        BACnetApplicationTagUnsignedInteger updateKeySetTimeout,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger updateKeySetTimeout) {
       this.updateKeySetTimeout = updateKeySetTimeout;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataUpdateKeySetTimeout build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataUpdateKeySetTimeout bACnetConstructedDataUpdateKeySetTimeout =
           new BACnetConstructedDataUpdateKeySetTimeout(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              updateKeySetTimeout,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, updateKeySetTimeout);
       return bACnetConstructedDataUpdateKeySetTimeout;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUpdateTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUpdateTime.java
index 10a5fe87437..8c48beeda57 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUpdateTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUpdateTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime updateTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataUpdateTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime updateTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime updateTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.updateTime = updateTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getUpdateTime() {
@@ -128,34 +120,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataUpdateTime");
     // Create the instance
-    return new BACnetConstructedDataUpdateTimeBuilderImpl(
-        updateTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataUpdateTimeBuilderImpl(updateTime);
   }
 
   public static class BACnetConstructedDataUpdateTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime updateTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataUpdateTimeBuilderImpl(
-        BACnetDateTime updateTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataUpdateTimeBuilderImpl(BACnetDateTime updateTime) {
       this.updateTime = updateTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataUpdateTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataUpdateTime bACnetConstructedDataUpdateTime =
-          new BACnetConstructedDataUpdateTime(
-              openingTag, peekedTagHeader, closingTag, updateTime, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataUpdateTime(openingTag, peekedTagHeader, closingTag, updateTime);
       return bACnetConstructedDataUpdateTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserExternalIdentifier.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserExternalIdentifier.java
index 7ca405a4b6c..cd68ad97203 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserExternalIdentifier.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserExternalIdentifier.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString userExternalIdentifier;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataUserExternalIdentifier(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString userExternalIdentifier,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString userExternalIdentifier) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.userExternalIdentifier = userExternalIdentifier;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getUserExternalIdentifier() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataUserExternalIdentifier");
     // Create the instance
-    return new BACnetConstructedDataUserExternalIdentifierBuilderImpl(
-        userExternalIdentifier, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataUserExternalIdentifierBuilderImpl(userExternalIdentifier);
   }
 
   public static class BACnetConstructedDataUserExternalIdentifierBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString userExternalIdentifier;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataUserExternalIdentifierBuilderImpl(
-        BACnetApplicationTagCharacterString userExternalIdentifier,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString userExternalIdentifier) {
       this.userExternalIdentifier = userExternalIdentifier;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataUserExternalIdentifier build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataUserExternalIdentifier bACnetConstructedDataUserExternalIdentifier =
           new BACnetConstructedDataUserExternalIdentifier(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              userExternalIdentifier,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, userExternalIdentifier);
       return bACnetConstructedDataUserExternalIdentifier;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserInformationReference.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserInformationReference.java
index e06b19553b5..b433bc3f0aa 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserInformationReference.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserInformationReference.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString userInformationReference;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataUserInformationReference(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString userInformationReference,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString userInformationReference) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.userInformationReference = userInformationReference;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getUserInformationReference() {
@@ -137,39 +129,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataUserInformationReference");
     // Create the instance
-    return new BACnetConstructedDataUserInformationReferenceBuilderImpl(
-        userInformationReference, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataUserInformationReferenceBuilderImpl(userInformationReference);
   }
 
   public static class BACnetConstructedDataUserInformationReferenceBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString userInformationReference;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataUserInformationReferenceBuilderImpl(
-        BACnetApplicationTagCharacterString userInformationReference,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString userInformationReference) {
       this.userInformationReference = userInformationReference;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataUserInformationReference build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataUserInformationReference bACnetConstructedDataUserInformationReference =
           new BACnetConstructedDataUserInformationReference(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              userInformationReference,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, userInformationReference);
       return bACnetConstructedDataUserInformationReference;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserName.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserName.java
index bf7b4a6c127..4e1f008156c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserName.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserName.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString userName;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataUserName(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString userName,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString userName) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.userName = userName;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getUserName() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataUserName");
     // Create the instance
-    return new BACnetConstructedDataUserNameBuilderImpl(userName, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataUserNameBuilderImpl(userName);
   }
 
   public static class BACnetConstructedDataUserNameBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString userName;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataUserNameBuilderImpl(
-        BACnetApplicationTagCharacterString userName,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataUserNameBuilderImpl(BACnetApplicationTagCharacterString userName) {
       this.userName = userName;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataUserName build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataUserName bACnetConstructedDataUserName =
-          new BACnetConstructedDataUserName(
-              openingTag, peekedTagHeader, closingTag, userName, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataUserName(openingTag, peekedTagHeader, closingTag, userName);
       return bACnetConstructedDataUserName;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserType.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserType.java
index 27f70ee8ba1..98a87e51991 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserType.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUserType.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetAccessUserTypeTagged userType;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataUserType(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetAccessUserTypeTagged userType,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetAccessUserTypeTagged userType) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.userType = userType;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetAccessUserTypeTagged getUserType() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataUserType");
     // Create the instance
-    return new BACnetConstructedDataUserTypeBuilderImpl(userType, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataUserTypeBuilderImpl(userType);
   }
 
   public static class BACnetConstructedDataUserTypeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetAccessUserTypeTagged userType;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataUserTypeBuilderImpl(
-        BACnetAccessUserTypeTagged userType,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataUserTypeBuilderImpl(BACnetAccessUserTypeTagged userType) {
       this.userType = userType;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataUserType build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataUserType bACnetConstructedDataUserType =
-          new BACnetConstructedDataUserType(
-              openingTag, peekedTagHeader, closingTag, userType, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataUserType(openingTag, peekedTagHeader, closingTag, userType);
       return bACnetConstructedDataUserType;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUsesRemaining.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUsesRemaining.java
index 38496b7b5c3..2b0e9e91859 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUsesRemaining.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataUsesRemaining.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger usesRemaining;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataUsesRemaining(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger usesRemaining,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger usesRemaining) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.usesRemaining = usesRemaining;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getUsesRemaining() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataUsesRemaining");
     // Create the instance
-    return new BACnetConstructedDataUsesRemainingBuilderImpl(
-        usesRemaining, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataUsesRemainingBuilderImpl(usesRemaining);
   }
 
   public static class BACnetConstructedDataUsesRemainingBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger usesRemaining;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataUsesRemainingBuilderImpl(
-        BACnetApplicationTagSignedInteger usesRemaining,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagSignedInteger usesRemaining) {
       this.usesRemaining = usesRemaining;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataUsesRemaining build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataUsesRemaining bACnetConstructedDataUsesRemaining =
           new BACnetConstructedDataUsesRemaining(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              usesRemaining,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, usesRemaining);
       return bACnetConstructedDataUsesRemaining;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVTClassesSupported.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVTClassesSupported.java
index df176fe082c..3640707878f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVTClassesSupported.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVTClassesSupported.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetVTClassTagged> vtClassesSupported;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataVTClassesSupported(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetVTClassTagged> vtClassesSupported,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetVTClassTagged> vtClassesSupported) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.vtClassesSupported = vtClassesSupported;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetVTClassTagged> getVtClassesSupported() {
@@ -131,39 +123,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataVTClassesSupported");
     // Create the instance
-    return new BACnetConstructedDataVTClassesSupportedBuilderImpl(
-        vtClassesSupported, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataVTClassesSupportedBuilderImpl(vtClassesSupported);
   }
 
   public static class BACnetConstructedDataVTClassesSupportedBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetVTClassTagged> vtClassesSupported;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataVTClassesSupportedBuilderImpl(
-        List<BACnetVTClassTagged> vtClassesSupported,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetVTClassTagged> vtClassesSupported) {
       this.vtClassesSupported = vtClassesSupported;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataVTClassesSupported build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataVTClassesSupported bACnetConstructedDataVTClassesSupported =
           new BACnetConstructedDataVTClassesSupported(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              vtClassesSupported,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, vtClassesSupported);
       return bACnetConstructedDataVTClassesSupported;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValidSamples.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValidSamples.java
index 8fbc3853f9e..4a8a23c9b59 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValidSamples.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValidSamples.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger validSamples;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataValidSamples(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger validSamples,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger validSamples) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.validSamples = validSamples;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getValidSamples() {
@@ -134,34 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataValidSamples");
     // Create the instance
-    return new BACnetConstructedDataValidSamplesBuilderImpl(
-        validSamples, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataValidSamplesBuilderImpl(validSamples);
   }
 
   public static class BACnetConstructedDataValidSamplesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger validSamples;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataValidSamplesBuilderImpl(
-        BACnetApplicationTagUnsignedInteger validSamples,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger validSamples) {
       this.validSamples = validSamples;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataValidSamples build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataValidSamples bACnetConstructedDataValidSamples =
           new BACnetConstructedDataValidSamples(
-              openingTag, peekedTagHeader, closingTag, validSamples, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, validSamples);
       return bACnetConstructedDataValidSamples;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueBeforeChange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueBeforeChange.java
index 0d1f6fb9643..a118805579c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueBeforeChange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueBeforeChange.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger valuesBeforeChange;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataValueBeforeChange(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger valuesBeforeChange,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger valuesBeforeChange) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.valuesBeforeChange = valuesBeforeChange;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getValuesBeforeChange() {
@@ -136,39 +128,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataValueBeforeChange");
     // Create the instance
-    return new BACnetConstructedDataValueBeforeChangeBuilderImpl(
-        valuesBeforeChange, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataValueBeforeChangeBuilderImpl(valuesBeforeChange);
   }
 
   public static class BACnetConstructedDataValueBeforeChangeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger valuesBeforeChange;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataValueBeforeChangeBuilderImpl(
-        BACnetApplicationTagUnsignedInteger valuesBeforeChange,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger valuesBeforeChange) {
       this.valuesBeforeChange = valuesBeforeChange;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataValueBeforeChange build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataValueBeforeChange bACnetConstructedDataValueBeforeChange =
           new BACnetConstructedDataValueBeforeChange(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              valuesBeforeChange,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, valuesBeforeChange);
       return bACnetConstructedDataValueBeforeChange;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueChangeTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueChangeTime.java
index 21dd91259b5..f771fe7f484 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueChangeTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueChangeTime.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDateTime valueChangeTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataValueChangeTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTime valueChangeTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDateTime valueChangeTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.valueChangeTime = valueChangeTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDateTime getValueChangeTime() {
@@ -130,39 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataValueChangeTime");
     // Create the instance
-    return new BACnetConstructedDataValueChangeTimeBuilderImpl(
-        valueChangeTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataValueChangeTimeBuilderImpl(valueChangeTime);
   }
 
   public static class BACnetConstructedDataValueChangeTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDateTime valueChangeTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataValueChangeTimeBuilderImpl(
-        BACnetDateTime valueChangeTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataValueChangeTimeBuilderImpl(BACnetDateTime valueChangeTime) {
       this.valueChangeTime = valueChangeTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataValueChangeTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataValueChangeTime bACnetConstructedDataValueChangeTime =
           new BACnetConstructedDataValueChangeTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              valueChangeTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, valueChangeTime);
       return bACnetConstructedDataValueChangeTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueSet.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueSet.java
index ddee36aa877..2163bc24242 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueSet.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueSet.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger valueSet;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataValueSet(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger valueSet,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger valueSet) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.valueSet = valueSet;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getValueSet() {
@@ -134,33 +126,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataValueSet");
     // Create the instance
-    return new BACnetConstructedDataValueSetBuilderImpl(valueSet, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataValueSetBuilderImpl(valueSet);
   }
 
   public static class BACnetConstructedDataValueSetBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger valueSet;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataValueSetBuilderImpl(
-        BACnetApplicationTagUnsignedInteger valueSet,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataValueSetBuilderImpl(BACnetApplicationTagUnsignedInteger valueSet) {
       this.valueSet = valueSet;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataValueSet build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataValueSet bACnetConstructedDataValueSet =
-          new BACnetConstructedDataValueSet(
-              openingTag, peekedTagHeader, closingTag, valueSet, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataValueSet(openingTag, peekedTagHeader, closingTag, valueSet);
       return bACnetConstructedDataValueSet;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueSource.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueSource.java
index 652e9600492..a9f32a7ceef 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueSource.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueSource.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetValueSource valueSource;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataValueSource(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetValueSource valueSource,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetValueSource valueSource) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.valueSource = valueSource;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetValueSource getValueSource() {
@@ -130,34 +122,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataValueSource");
     // Create the instance
-    return new BACnetConstructedDataValueSourceBuilderImpl(
-        valueSource, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataValueSourceBuilderImpl(valueSource);
   }
 
   public static class BACnetConstructedDataValueSourceBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetValueSource valueSource;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataValueSourceBuilderImpl(
-        BACnetValueSource valueSource,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataValueSourceBuilderImpl(BACnetValueSource valueSource) {
       this.valueSource = valueSource;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataValueSource build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataValueSource bACnetConstructedDataValueSource =
           new BACnetConstructedDataValueSource(
-              openingTag, peekedTagHeader, closingTag, valueSource, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, valueSource);
       return bACnetConstructedDataValueSource;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueSourceArray.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueSourceArray.java
index 89391c63361..e504f0a9eeb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueSourceArray.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataValueSourceArray.java
@@ -52,23 +52,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetValueSource> vtClassesSupported;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataValueSourceArray(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetValueSource> vtClassesSupported,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetValueSource> vtClassesSupported) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.vtClassesSupported = vtClassesSupported;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -97,11 +89,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (vtClassesSupported)
     writeComplexTypeArrayField("vtClassesSupported", vtClassesSupported, writeBuffer);
@@ -175,42 +163,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
     readBuffer.closeContext("BACnetConstructedDataValueSourceArray");
     // Create the instance
     return new BACnetConstructedDataValueSourceArrayBuilderImpl(
-        numberOfDataElements, vtClassesSupported, tagNumber, arrayIndexArgument);
+        numberOfDataElements, vtClassesSupported);
   }
 
   public static class BACnetConstructedDataValueSourceArrayBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetValueSource> vtClassesSupported;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataValueSourceArrayBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetValueSource> vtClassesSupported,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetValueSource> vtClassesSupported) {
       this.numberOfDataElements = numberOfDataElements;
       this.vtClassesSupported = vtClassesSupported;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataValueSourceArray build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataValueSourceArray bACnetConstructedDataValueSourceArray =
           new BACnetConstructedDataValueSourceArray(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              vtClassesSupported,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, vtClassesSupported);
       return bACnetConstructedDataValueSourceArray;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVarianceValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVarianceValue.java
index 849b46d7eab..e3b687294bf 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVarianceValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVarianceValue.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagReal varianceValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataVarianceValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal varianceValue,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagReal varianceValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.varianceValue = varianceValue;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagReal getVarianceValue() {
@@ -132,39 +124,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataVarianceValue");
     // Create the instance
-    return new BACnetConstructedDataVarianceValueBuilderImpl(
-        varianceValue, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataVarianceValueBuilderImpl(varianceValue);
   }
 
   public static class BACnetConstructedDataVarianceValueBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagReal varianceValue;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataVarianceValueBuilderImpl(
-        BACnetApplicationTagReal varianceValue,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataVarianceValueBuilderImpl(BACnetApplicationTagReal varianceValue) {
       this.varianceValue = varianceValue;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataVarianceValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataVarianceValue bACnetConstructedDataVarianceValue =
           new BACnetConstructedDataVarianceValue(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              varianceValue,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, varianceValue);
       return bACnetConstructedDataVarianceValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVendorIdentifier.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVendorIdentifier.java
index bf3f2d80ce5..2d93c2738e7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVendorIdentifier.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVendorIdentifier.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetVendorIdTagged vendorIdentifier;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataVendorIdentifier(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetVendorIdTagged vendorIdentifier,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetVendorIdTagged vendorIdentifier) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.vendorIdentifier = vendorIdentifier;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetVendorIdTagged getVendorIdentifier() {
@@ -135,39 +127,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataVendorIdentifier");
     // Create the instance
-    return new BACnetConstructedDataVendorIdentifierBuilderImpl(
-        vendorIdentifier, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataVendorIdentifierBuilderImpl(vendorIdentifier);
   }
 
   public static class BACnetConstructedDataVendorIdentifierBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetVendorIdTagged vendorIdentifier;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataVendorIdentifierBuilderImpl(
-        BACnetVendorIdTagged vendorIdentifier,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataVendorIdentifierBuilderImpl(BACnetVendorIdTagged vendorIdentifier) {
       this.vendorIdentifier = vendorIdentifier;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataVendorIdentifier build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataVendorIdentifier bACnetConstructedDataVendorIdentifier =
           new BACnetConstructedDataVendorIdentifier(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              vendorIdentifier,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, vendorIdentifier);
       return bACnetConstructedDataVendorIdentifier;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVendorName.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVendorName.java
index 586e97de93b..902c8d29491 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVendorName.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVendorName.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagCharacterString vendorName;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataVendorName(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString vendorName,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagCharacterString vendorName) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.vendorName = vendorName;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagCharacterString getVendorName() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataVendorName");
     // Create the instance
-    return new BACnetConstructedDataVendorNameBuilderImpl(
-        vendorName, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataVendorNameBuilderImpl(vendorName);
   }
 
   public static class BACnetConstructedDataVendorNameBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagCharacterString vendorName;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataVendorNameBuilderImpl(
-        BACnetApplicationTagCharacterString vendorName,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagCharacterString vendorName) {
       this.vendorName = vendorName;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataVendorName build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataVendorName bACnetConstructedDataVendorName =
-          new BACnetConstructedDataVendorName(
-              openingTag, peekedTagHeader, closingTag, vendorName, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataVendorName(openingTag, peekedTagHeader, closingTag, vendorName);
       return bACnetConstructedDataVendorName;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVerificationTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVerificationTime.java
index fb53669c5a5..014223f55d3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVerificationTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVerificationTime.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagSignedInteger verificationTime;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataVerificationTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger verificationTime,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagSignedInteger verificationTime) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.verificationTime = verificationTime;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagSignedInteger getVerificationTime() {
@@ -135,39 +127,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataVerificationTime");
     // Create the instance
-    return new BACnetConstructedDataVerificationTimeBuilderImpl(
-        verificationTime, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataVerificationTimeBuilderImpl(verificationTime);
   }
 
   public static class BACnetConstructedDataVerificationTimeBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagSignedInteger verificationTime;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataVerificationTimeBuilderImpl(
-        BACnetApplicationTagSignedInteger verificationTime,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagSignedInteger verificationTime) {
       this.verificationTime = verificationTime;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataVerificationTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataVerificationTime bACnetConstructedDataVerificationTime =
           new BACnetConstructedDataVerificationTime(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              verificationTime,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, verificationTime);
       return bACnetConstructedDataVerificationTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVirtualMACAddressTable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVirtualMACAddressTable.java
index 307ccab918c..d70d5f0cd53 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVirtualMACAddressTable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataVirtualMACAddressTable.java
@@ -50,21 +50,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetVMACEntry> virtualMacAddressTable;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataVirtualMACAddressTable(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetVMACEntry> virtualMacAddressTable,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetVMACEntry> virtualMacAddressTable) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.virtualMacAddressTable = virtualMacAddressTable;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetVMACEntry> getVirtualMacAddressTable() {
@@ -127,39 +119,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataVirtualMACAddressTable");
     // Create the instance
-    return new BACnetConstructedDataVirtualMACAddressTableBuilderImpl(
-        virtualMacAddressTable, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataVirtualMACAddressTableBuilderImpl(virtualMacAddressTable);
   }
 
   public static class BACnetConstructedDataVirtualMACAddressTableBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetVMACEntry> virtualMacAddressTable;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataVirtualMACAddressTableBuilderImpl(
-        List<BACnetVMACEntry> virtualMacAddressTable,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetVMACEntry> virtualMacAddressTable) {
       this.virtualMacAddressTable = virtualMacAddressTable;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataVirtualMACAddressTable build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataVirtualMACAddressTable bACnetConstructedDataVirtualMACAddressTable =
           new BACnetConstructedDataVirtualMACAddressTable(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              virtualMacAddressTable,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, virtualMacAddressTable);
       return bACnetConstructedDataVirtualMACAddressTable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWeeklySchedule.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWeeklySchedule.java
index 5be2521c7b2..e4db36416b4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWeeklySchedule.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWeeklySchedule.java
@@ -51,23 +51,15 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetDailySchedule> weeklySchedule;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataWeeklySchedule(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetDailySchedule> weeklySchedule,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDailySchedule> weeklySchedule) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.numberOfDataElements = numberOfDataElements;
     this.weeklySchedule = weeklySchedule;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -96,11 +88,7 @@ protected void serializeBACnetConstructedDataChild(WriteBuffer writeBuffer)
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (weeklySchedule)
     writeComplexTypeArrayField("weeklySchedule", weeklySchedule, writeBuffer);
@@ -173,43 +161,26 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataWeeklySchedule");
     // Create the instance
-    return new BACnetConstructedDataWeeklyScheduleBuilderImpl(
-        numberOfDataElements, weeklySchedule, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataWeeklyScheduleBuilderImpl(numberOfDataElements, weeklySchedule);
   }
 
   public static class BACnetConstructedDataWeeklyScheduleBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger numberOfDataElements;
     private final List<BACnetDailySchedule> weeklySchedule;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataWeeklyScheduleBuilderImpl(
         BACnetApplicationTagUnsignedInteger numberOfDataElements,
-        List<BACnetDailySchedule> weeklySchedule,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        List<BACnetDailySchedule> weeklySchedule) {
       this.numberOfDataElements = numberOfDataElements;
       this.weeklySchedule = weeklySchedule;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataWeeklySchedule build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataWeeklySchedule bACnetConstructedDataWeeklySchedule =
           new BACnetConstructedDataWeeklySchedule(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              numberOfDataElements,
-              weeklySchedule,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, numberOfDataElements, weeklySchedule);
       return bACnetConstructedDataWeeklySchedule;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWindowInterval.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWindowInterval.java
index 996d1dae9d6..eb90fc76053 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWindowInterval.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWindowInterval.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger windowInterval;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataWindowInterval(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger windowInterval,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger windowInterval) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.windowInterval = windowInterval;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getWindowInterval() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataWindowInterval");
     // Create the instance
-    return new BACnetConstructedDataWindowIntervalBuilderImpl(
-        windowInterval, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataWindowIntervalBuilderImpl(windowInterval);
   }
 
   public static class BACnetConstructedDataWindowIntervalBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger windowInterval;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataWindowIntervalBuilderImpl(
-        BACnetApplicationTagUnsignedInteger windowInterval,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger windowInterval) {
       this.windowInterval = windowInterval;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataWindowInterval build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataWindowInterval bACnetConstructedDataWindowInterval =
           new BACnetConstructedDataWindowInterval(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              windowInterval,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, windowInterval);
       return bACnetConstructedDataWindowInterval;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWindowSamples.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWindowSamples.java
index f2cb3b3f083..8d7902f8032 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWindowSamples.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWindowSamples.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger windowSamples;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataWindowSamples(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger windowSamples,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetApplicationTagUnsignedInteger windowSamples) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.windowSamples = windowSamples;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getWindowSamples() {
@@ -134,39 +126,23 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataWindowSamples");
     // Create the instance
-    return new BACnetConstructedDataWindowSamplesBuilderImpl(
-        windowSamples, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataWindowSamplesBuilderImpl(windowSamples);
   }
 
   public static class BACnetConstructedDataWindowSamplesBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetApplicationTagUnsignedInteger windowSamples;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
     public BACnetConstructedDataWindowSamplesBuilderImpl(
-        BACnetApplicationTagUnsignedInteger windowSamples,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetApplicationTagUnsignedInteger windowSamples) {
       this.windowSamples = windowSamples;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataWindowSamples build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataWindowSamples bACnetConstructedDataWindowSamples =
           new BACnetConstructedDataWindowSamples(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              windowSamples,
-              tagNumber,
-              arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, windowSamples);
       return bACnetConstructedDataWindowSamples;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWriteStatus.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWriteStatus.java
index 54d42a6e1bb..2469c4a966e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWriteStatus.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataWriteStatus.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetWriteStatusTagged writeStatus;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataWriteStatus(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetWriteStatusTagged writeStatus,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetWriteStatusTagged writeStatus) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.writeStatus = writeStatus;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetWriteStatusTagged getWriteStatus() {
@@ -134,34 +126,22 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataWriteStatus");
     // Create the instance
-    return new BACnetConstructedDataWriteStatusBuilderImpl(
-        writeStatus, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataWriteStatusBuilderImpl(writeStatus);
   }
 
   public static class BACnetConstructedDataWriteStatusBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetWriteStatusTagged writeStatus;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataWriteStatusBuilderImpl(
-        BACnetWriteStatusTagged writeStatus,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataWriteStatusBuilderImpl(BACnetWriteStatusTagged writeStatus) {
       this.writeStatus = writeStatus;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataWriteStatus build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataWriteStatus bACnetConstructedDataWriteStatus =
           new BACnetConstructedDataWriteStatus(
-              openingTag, peekedTagHeader, closingTag, writeStatus, tagNumber, arrayIndexArgument);
+              openingTag, peekedTagHeader, closingTag, writeStatus);
       return bACnetConstructedDataWriteStatus;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataZoneFrom.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataZoneFrom.java
index 10cb02c8e56..7cc8483b3a0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataZoneFrom.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataZoneFrom.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDeviceObjectReference zoneFrom;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataZoneFrom(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDeviceObjectReference zoneFrom,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDeviceObjectReference zoneFrom) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.zoneFrom = zoneFrom;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDeviceObjectReference getZoneFrom() {
@@ -130,33 +122,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataZoneFrom");
     // Create the instance
-    return new BACnetConstructedDataZoneFromBuilderImpl(zoneFrom, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataZoneFromBuilderImpl(zoneFrom);
   }
 
   public static class BACnetConstructedDataZoneFromBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDeviceObjectReference zoneFrom;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataZoneFromBuilderImpl(
-        BACnetDeviceObjectReference zoneFrom,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataZoneFromBuilderImpl(BACnetDeviceObjectReference zoneFrom) {
       this.zoneFrom = zoneFrom;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataZoneFrom build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataZoneFrom bACnetConstructedDataZoneFrom =
-          new BACnetConstructedDataZoneFrom(
-              openingTag, peekedTagHeader, closingTag, zoneFrom, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataZoneFrom(openingTag, peekedTagHeader, closingTag, zoneFrom);
       return bACnetConstructedDataZoneFrom;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataZoneMembers.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataZoneMembers.java
index 075986b261c..03041942d47 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataZoneMembers.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataZoneMembers.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final List<BACnetDeviceObjectReference> members;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataZoneMembers(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      List<BACnetDeviceObjectReference> members,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      List<BACnetDeviceObjectReference> members) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.members = members;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public List<BACnetDeviceObjectReference> getMembers() {
@@ -126,33 +118,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataZoneMembers");
     // Create the instance
-    return new BACnetConstructedDataZoneMembersBuilderImpl(members, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataZoneMembersBuilderImpl(members);
   }
 
   public static class BACnetConstructedDataZoneMembersBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final List<BACnetDeviceObjectReference> members;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataZoneMembersBuilderImpl(
-        List<BACnetDeviceObjectReference> members,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataZoneMembersBuilderImpl(List<BACnetDeviceObjectReference> members) {
       this.members = members;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataZoneMembers build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataZoneMembers bACnetConstructedDataZoneMembers =
-          new BACnetConstructedDataZoneMembers(
-              openingTag, peekedTagHeader, closingTag, members, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataZoneMembers(openingTag, peekedTagHeader, closingTag, members);
       return bACnetConstructedDataZoneMembers;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataZoneTo.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataZoneTo.java
index 320124f06b9..4c0411454be 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataZoneTo.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataZoneTo.java
@@ -49,21 +49,13 @@ public BACnetPropertyIdentifier getPropertyIdentifierArgument() {
   // Properties.
   protected final BACnetDeviceObjectReference zoneTo;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetConstructedDataZoneTo(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDeviceObjectReference zoneTo,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, arrayIndexArgument);
+      BACnetDeviceObjectReference zoneTo) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.zoneTo = zoneTo;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetDeviceObjectReference getZoneTo() {
@@ -130,33 +122,21 @@ public static BACnetConstructedDataBuilder staticParseBACnetConstructedDataBuild
 
     readBuffer.closeContext("BACnetConstructedDataZoneTo");
     // Create the instance
-    return new BACnetConstructedDataZoneToBuilderImpl(zoneTo, tagNumber, arrayIndexArgument);
+    return new BACnetConstructedDataZoneToBuilderImpl(zoneTo);
   }
 
   public static class BACnetConstructedDataZoneToBuilderImpl
       implements BACnetConstructedData.BACnetConstructedDataBuilder {
     private final BACnetDeviceObjectReference zoneTo;
-    private final Short tagNumber;
-    private final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
 
-    public BACnetConstructedDataZoneToBuilderImpl(
-        BACnetDeviceObjectReference zoneTo,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+    public BACnetConstructedDataZoneToBuilderImpl(BACnetDeviceObjectReference zoneTo) {
       this.zoneTo = zoneTo;
-      this.tagNumber = tagNumber;
-      this.arrayIndexArgument = arrayIndexArgument;
     }
 
     public BACnetConstructedDataZoneTo build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetConstructedDataZoneTo bACnetConstructedDataZoneTo =
-          new BACnetConstructedDataZoneTo(
-              openingTag, peekedTagHeader, closingTag, zoneTo, tagNumber, arrayIndexArgument);
+          new BACnetConstructedDataZoneTo(openingTag, peekedTagHeader, closingTag, zoneTo);
       return bACnetConstructedDataZoneTo;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTag.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTag.java
index de823723265..31bb854a837 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTag.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTag.java
@@ -43,13 +43,9 @@ public abstract class BACnetContextTag implements Message {
   // Properties.
   protected final BACnetTagHeader header;
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
-  public BACnetContextTag(BACnetTagHeader header, Short tagNumberArgument) {
+  public BACnetContextTag(BACnetTagHeader header) {
     super();
     this.header = header;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public BACnetTagHeader getHeader() {
@@ -207,12 +203,12 @@ public static BACnetContextTag staticParse(
 
     readBuffer.closeContext("BACnetContextTag");
     // Create the instance
-    BACnetContextTag _bACnetContextTag = builder.build(header, tagNumberArgument);
+    BACnetContextTag _bACnetContextTag = builder.build(header);
     return _bACnetContextTag;
   }
 
   public interface BACnetContextTagBuilder {
-    BACnetContextTag build(BACnetTagHeader header, Short tagNumberArgument);
+    BACnetContextTag build(BACnetTagHeader header);
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagBitString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagBitString.java
index 6afc4d102ca..2b3d47a2917 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagBitString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagBitString.java
@@ -45,14 +45,9 @@ public BACnetDataType getDataType() {
   // Properties.
   protected final BACnetTagPayloadBitString payload;
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
-  public BACnetContextTagBitString(
-      BACnetTagHeader header, BACnetTagPayloadBitString payload, Short tagNumberArgument) {
-    super(header, tagNumberArgument);
+  public BACnetContextTagBitString(BACnetTagHeader header, BACnetTagPayloadBitString payload) {
+    super(header);
     this.payload = payload;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public BACnetTagPayloadBitString getPayload() {
@@ -110,23 +105,20 @@ public static BACnetContextTagBuilder staticParseBACnetContextTagBuilder(
 
     readBuffer.closeContext("BACnetContextTagBitString");
     // Create the instance
-    return new BACnetContextTagBitStringBuilderImpl(payload, tagNumberArgument);
+    return new BACnetContextTagBitStringBuilderImpl(payload);
   }
 
   public static class BACnetContextTagBitStringBuilderImpl
       implements BACnetContextTag.BACnetContextTagBuilder {
     private final BACnetTagPayloadBitString payload;
-    private final Short tagNumberArgument;
 
-    public BACnetContextTagBitStringBuilderImpl(
-        BACnetTagPayloadBitString payload, Short tagNumberArgument) {
+    public BACnetContextTagBitStringBuilderImpl(BACnetTagPayloadBitString payload) {
       this.payload = payload;
-      this.tagNumberArgument = tagNumberArgument;
     }
 
-    public BACnetContextTagBitString build(BACnetTagHeader header, Short tagNumberArgument) {
+    public BACnetContextTagBitString build(BACnetTagHeader header) {
       BACnetContextTagBitString bACnetContextTagBitString =
-          new BACnetContextTagBitString(header, payload, tagNumberArgument);
+          new BACnetContextTagBitString(header, payload);
       return bACnetContextTagBitString;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagBoolean.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagBoolean.java
index 08c16859583..e45d1abc9d2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagBoolean.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagBoolean.java
@@ -46,18 +46,11 @@ public BACnetDataType getDataType() {
   protected final short value;
   protected final BACnetTagPayloadBoolean payload;
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
   public BACnetContextTagBoolean(
-      BACnetTagHeader header,
-      short value,
-      BACnetTagPayloadBoolean payload,
-      Short tagNumberArgument) {
-    super(header, tagNumberArgument);
+      BACnetTagHeader header, short value, BACnetTagPayloadBoolean payload) {
+    super(header);
     this.value = value;
     this.payload = payload;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public short getValue() {
@@ -139,25 +132,22 @@ public static BACnetContextTagBuilder staticParseBACnetContextTagBuilder(
 
     readBuffer.closeContext("BACnetContextTagBoolean");
     // Create the instance
-    return new BACnetContextTagBooleanBuilderImpl(value, payload, tagNumberArgument);
+    return new BACnetContextTagBooleanBuilderImpl(value, payload);
   }
 
   public static class BACnetContextTagBooleanBuilderImpl
       implements BACnetContextTag.BACnetContextTagBuilder {
     private final short value;
     private final BACnetTagPayloadBoolean payload;
-    private final Short tagNumberArgument;
 
-    public BACnetContextTagBooleanBuilderImpl(
-        short value, BACnetTagPayloadBoolean payload, Short tagNumberArgument) {
+    public BACnetContextTagBooleanBuilderImpl(short value, BACnetTagPayloadBoolean payload) {
       this.value = value;
       this.payload = payload;
-      this.tagNumberArgument = tagNumberArgument;
     }
 
-    public BACnetContextTagBoolean build(BACnetTagHeader header, Short tagNumberArgument) {
+    public BACnetContextTagBoolean build(BACnetTagHeader header) {
       BACnetContextTagBoolean bACnetContextTagBoolean =
-          new BACnetContextTagBoolean(header, value, payload, tagNumberArgument);
+          new BACnetContextTagBoolean(header, value, payload);
       return bACnetContextTagBoolean;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagCharacterString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagCharacterString.java
index cff9c5b86ea..b6cd170a85c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagCharacterString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagCharacterString.java
@@ -45,14 +45,10 @@ public BACnetDataType getDataType() {
   // Properties.
   protected final BACnetTagPayloadCharacterString payload;
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
   public BACnetContextTagCharacterString(
-      BACnetTagHeader header, BACnetTagPayloadCharacterString payload, Short tagNumberArgument) {
-    super(header, tagNumberArgument);
+      BACnetTagHeader header, BACnetTagPayloadCharacterString payload) {
+    super(header);
     this.payload = payload;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public BACnetTagPayloadCharacterString getPayload() {
@@ -121,23 +117,20 @@ public static BACnetContextTagBuilder staticParseBACnetContextTagBuilder(
 
     readBuffer.closeContext("BACnetContextTagCharacterString");
     // Create the instance
-    return new BACnetContextTagCharacterStringBuilderImpl(payload, tagNumberArgument);
+    return new BACnetContextTagCharacterStringBuilderImpl(payload);
   }
 
   public static class BACnetContextTagCharacterStringBuilderImpl
       implements BACnetContextTag.BACnetContextTagBuilder {
     private final BACnetTagPayloadCharacterString payload;
-    private final Short tagNumberArgument;
 
-    public BACnetContextTagCharacterStringBuilderImpl(
-        BACnetTagPayloadCharacterString payload, Short tagNumberArgument) {
+    public BACnetContextTagCharacterStringBuilderImpl(BACnetTagPayloadCharacterString payload) {
       this.payload = payload;
-      this.tagNumberArgument = tagNumberArgument;
     }
 
-    public BACnetContextTagCharacterString build(BACnetTagHeader header, Short tagNumberArgument) {
+    public BACnetContextTagCharacterString build(BACnetTagHeader header) {
       BACnetContextTagCharacterString bACnetContextTagCharacterString =
-          new BACnetContextTagCharacterString(header, payload, tagNumberArgument);
+          new BACnetContextTagCharacterString(header, payload);
       return bACnetContextTagCharacterString;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagDate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagDate.java
index 9daa423aa01..db9b5a6796c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagDate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagDate.java
@@ -45,14 +45,9 @@ public BACnetDataType getDataType() {
   // Properties.
   protected final BACnetTagPayloadDate payload;
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
-  public BACnetContextTagDate(
-      BACnetTagHeader header, BACnetTagPayloadDate payload, Short tagNumberArgument) {
-    super(header, tagNumberArgument);
+  public BACnetContextTagDate(BACnetTagHeader header, BACnetTagPayloadDate payload) {
+    super(header);
     this.payload = payload;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public BACnetTagPayloadDate getPayload() {
@@ -102,22 +97,19 @@ public static BACnetContextTagBuilder staticParseBACnetContextTagBuilder(
 
     readBuffer.closeContext("BACnetContextTagDate");
     // Create the instance
-    return new BACnetContextTagDateBuilderImpl(payload, tagNumberArgument);
+    return new BACnetContextTagDateBuilderImpl(payload);
   }
 
   public static class BACnetContextTagDateBuilderImpl
       implements BACnetContextTag.BACnetContextTagBuilder {
     private final BACnetTagPayloadDate payload;
-    private final Short tagNumberArgument;
 
-    public BACnetContextTagDateBuilderImpl(BACnetTagPayloadDate payload, Short tagNumberArgument) {
+    public BACnetContextTagDateBuilderImpl(BACnetTagPayloadDate payload) {
       this.payload = payload;
-      this.tagNumberArgument = tagNumberArgument;
     }
 
-    public BACnetContextTagDate build(BACnetTagHeader header, Short tagNumberArgument) {
-      BACnetContextTagDate bACnetContextTagDate =
-          new BACnetContextTagDate(header, payload, tagNumberArgument);
+    public BACnetContextTagDate build(BACnetTagHeader header) {
+      BACnetContextTagDate bACnetContextTagDate = new BACnetContextTagDate(header, payload);
       return bACnetContextTagDate;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagDouble.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagDouble.java
index 7c75c14bc6b..59298fdda20 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagDouble.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagDouble.java
@@ -45,14 +45,9 @@ public BACnetDataType getDataType() {
   // Properties.
   protected final BACnetTagPayloadDouble payload;
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
-  public BACnetContextTagDouble(
-      BACnetTagHeader header, BACnetTagPayloadDouble payload, Short tagNumberArgument) {
-    super(header, tagNumberArgument);
+  public BACnetContextTagDouble(BACnetTagHeader header, BACnetTagPayloadDouble payload) {
+    super(header);
     this.payload = payload;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public BACnetTagPayloadDouble getPayload() {
@@ -114,23 +109,19 @@ public static BACnetContextTagBuilder staticParseBACnetContextTagBuilder(
 
     readBuffer.closeContext("BACnetContextTagDouble");
     // Create the instance
-    return new BACnetContextTagDoubleBuilderImpl(payload, tagNumberArgument);
+    return new BACnetContextTagDoubleBuilderImpl(payload);
   }
 
   public static class BACnetContextTagDoubleBuilderImpl
       implements BACnetContextTag.BACnetContextTagBuilder {
     private final BACnetTagPayloadDouble payload;
-    private final Short tagNumberArgument;
 
-    public BACnetContextTagDoubleBuilderImpl(
-        BACnetTagPayloadDouble payload, Short tagNumberArgument) {
+    public BACnetContextTagDoubleBuilderImpl(BACnetTagPayloadDouble payload) {
       this.payload = payload;
-      this.tagNumberArgument = tagNumberArgument;
     }
 
-    public BACnetContextTagDouble build(BACnetTagHeader header, Short tagNumberArgument) {
-      BACnetContextTagDouble bACnetContextTagDouble =
-          new BACnetContextTagDouble(header, payload, tagNumberArgument);
+    public BACnetContextTagDouble build(BACnetTagHeader header) {
+      BACnetContextTagDouble bACnetContextTagDouble = new BACnetContextTagDouble(header, payload);
       return bACnetContextTagDouble;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagEnumerated.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagEnumerated.java
index a26f376f041..886b842013e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagEnumerated.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagEnumerated.java
@@ -45,14 +45,9 @@ public BACnetDataType getDataType() {
   // Properties.
   protected final BACnetTagPayloadEnumerated payload;
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
-  public BACnetContextTagEnumerated(
-      BACnetTagHeader header, BACnetTagPayloadEnumerated payload, Short tagNumberArgument) {
-    super(header, tagNumberArgument);
+  public BACnetContextTagEnumerated(BACnetTagHeader header, BACnetTagPayloadEnumerated payload) {
+    super(header);
     this.payload = payload;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public BACnetTagPayloadEnumerated getPayload() {
@@ -121,23 +116,20 @@ public static BACnetContextTagBuilder staticParseBACnetContextTagBuilder(
 
     readBuffer.closeContext("BACnetContextTagEnumerated");
     // Create the instance
-    return new BACnetContextTagEnumeratedBuilderImpl(payload, tagNumberArgument);
+    return new BACnetContextTagEnumeratedBuilderImpl(payload);
   }
 
   public static class BACnetContextTagEnumeratedBuilderImpl
       implements BACnetContextTag.BACnetContextTagBuilder {
     private final BACnetTagPayloadEnumerated payload;
-    private final Short tagNumberArgument;
 
-    public BACnetContextTagEnumeratedBuilderImpl(
-        BACnetTagPayloadEnumerated payload, Short tagNumberArgument) {
+    public BACnetContextTagEnumeratedBuilderImpl(BACnetTagPayloadEnumerated payload) {
       this.payload = payload;
-      this.tagNumberArgument = tagNumberArgument;
     }
 
-    public BACnetContextTagEnumerated build(BACnetTagHeader header, Short tagNumberArgument) {
+    public BACnetContextTagEnumerated build(BACnetTagHeader header) {
       BACnetContextTagEnumerated bACnetContextTagEnumerated =
-          new BACnetContextTagEnumerated(header, payload, tagNumberArgument);
+          new BACnetContextTagEnumerated(header, payload);
       return bACnetContextTagEnumerated;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagNull.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagNull.java
index f3eabc39542..c45865782e5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagNull.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagNull.java
@@ -42,12 +42,8 @@ public BACnetDataType getDataType() {
     return BACnetDataType.NULL;
   }
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
-  public BACnetContextTagNull(BACnetTagHeader header, Short tagNumberArgument) {
-    super(header, tagNumberArgument);
-    this.tagNumberArgument = tagNumberArgument;
+  public BACnetContextTagNull(BACnetTagHeader header) {
+    super(header);
   }
 
   @Override
@@ -90,20 +86,16 @@ public static BACnetContextTagBuilder staticParseBACnetContextTagBuilder(
 
     readBuffer.closeContext("BACnetContextTagNull");
     // Create the instance
-    return new BACnetContextTagNullBuilderImpl(tagNumberArgument);
+    return new BACnetContextTagNullBuilderImpl();
   }
 
   public static class BACnetContextTagNullBuilderImpl
       implements BACnetContextTag.BACnetContextTagBuilder {
-    private final Short tagNumberArgument;
 
-    public BACnetContextTagNullBuilderImpl(Short tagNumberArgument) {
-      this.tagNumberArgument = tagNumberArgument;
-    }
+    public BACnetContextTagNullBuilderImpl() {}
 
-    public BACnetContextTagNull build(BACnetTagHeader header, Short tagNumberArgument) {
-      BACnetContextTagNull bACnetContextTagNull =
-          new BACnetContextTagNull(header, tagNumberArgument);
+    public BACnetContextTagNull build(BACnetTagHeader header) {
+      BACnetContextTagNull bACnetContextTagNull = new BACnetContextTagNull(header);
       return bACnetContextTagNull;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagObjectIdentifier.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagObjectIdentifier.java
index ed58459ba2f..e2c55bfb18b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagObjectIdentifier.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagObjectIdentifier.java
@@ -45,14 +45,10 @@ public BACnetDataType getDataType() {
   // Properties.
   protected final BACnetTagPayloadObjectIdentifier payload;
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
   public BACnetContextTagObjectIdentifier(
-      BACnetTagHeader header, BACnetTagPayloadObjectIdentifier payload, Short tagNumberArgument) {
-    super(header, tagNumberArgument);
+      BACnetTagHeader header, BACnetTagPayloadObjectIdentifier payload) {
+    super(header);
     this.payload = payload;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public BACnetTagPayloadObjectIdentifier getPayload() {
@@ -127,23 +123,20 @@ public static BACnetContextTagBuilder staticParseBACnetContextTagBuilder(
 
     readBuffer.closeContext("BACnetContextTagObjectIdentifier");
     // Create the instance
-    return new BACnetContextTagObjectIdentifierBuilderImpl(payload, tagNumberArgument);
+    return new BACnetContextTagObjectIdentifierBuilderImpl(payload);
   }
 
   public static class BACnetContextTagObjectIdentifierBuilderImpl
       implements BACnetContextTag.BACnetContextTagBuilder {
     private final BACnetTagPayloadObjectIdentifier payload;
-    private final Short tagNumberArgument;
 
-    public BACnetContextTagObjectIdentifierBuilderImpl(
-        BACnetTagPayloadObjectIdentifier payload, Short tagNumberArgument) {
+    public BACnetContextTagObjectIdentifierBuilderImpl(BACnetTagPayloadObjectIdentifier payload) {
       this.payload = payload;
-      this.tagNumberArgument = tagNumberArgument;
     }
 
-    public BACnetContextTagObjectIdentifier build(BACnetTagHeader header, Short tagNumberArgument) {
+    public BACnetContextTagObjectIdentifier build(BACnetTagHeader header) {
       BACnetContextTagObjectIdentifier bACnetContextTagObjectIdentifier =
-          new BACnetContextTagObjectIdentifier(header, payload, tagNumberArgument);
+          new BACnetContextTagObjectIdentifier(header, payload);
       return bACnetContextTagObjectIdentifier;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagOctetString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagOctetString.java
index 12364f42245..efdbe54eae5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagOctetString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagOctetString.java
@@ -45,14 +45,9 @@ public BACnetDataType getDataType() {
   // Properties.
   protected final BACnetTagPayloadOctetString payload;
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
-  public BACnetContextTagOctetString(
-      BACnetTagHeader header, BACnetTagPayloadOctetString payload, Short tagNumberArgument) {
-    super(header, tagNumberArgument);
+  public BACnetContextTagOctetString(BACnetTagHeader header, BACnetTagPayloadOctetString payload) {
+    super(header);
     this.payload = payload;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public BACnetTagPayloadOctetString getPayload() {
@@ -110,23 +105,20 @@ public static BACnetContextTagBuilder staticParseBACnetContextTagBuilder(
 
     readBuffer.closeContext("BACnetContextTagOctetString");
     // Create the instance
-    return new BACnetContextTagOctetStringBuilderImpl(payload, tagNumberArgument);
+    return new BACnetContextTagOctetStringBuilderImpl(payload);
   }
 
   public static class BACnetContextTagOctetStringBuilderImpl
       implements BACnetContextTag.BACnetContextTagBuilder {
     private final BACnetTagPayloadOctetString payload;
-    private final Short tagNumberArgument;
 
-    public BACnetContextTagOctetStringBuilderImpl(
-        BACnetTagPayloadOctetString payload, Short tagNumberArgument) {
+    public BACnetContextTagOctetStringBuilderImpl(BACnetTagPayloadOctetString payload) {
       this.payload = payload;
-      this.tagNumberArgument = tagNumberArgument;
     }
 
-    public BACnetContextTagOctetString build(BACnetTagHeader header, Short tagNumberArgument) {
+    public BACnetContextTagOctetString build(BACnetTagHeader header) {
       BACnetContextTagOctetString bACnetContextTagOctetString =
-          new BACnetContextTagOctetString(header, payload, tagNumberArgument);
+          new BACnetContextTagOctetString(header, payload);
       return bACnetContextTagOctetString;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagReal.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagReal.java
index c2c58f5999f..9412dcfe158 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagReal.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagReal.java
@@ -45,14 +45,9 @@ public BACnetDataType getDataType() {
   // Properties.
   protected final BACnetTagPayloadReal payload;
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
-  public BACnetContextTagReal(
-      BACnetTagHeader header, BACnetTagPayloadReal payload, Short tagNumberArgument) {
-    super(header, tagNumberArgument);
+  public BACnetContextTagReal(BACnetTagHeader header, BACnetTagPayloadReal payload) {
+    super(header);
     this.payload = payload;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public BACnetTagPayloadReal getPayload() {
@@ -113,22 +108,19 @@ public static BACnetContextTagBuilder staticParseBACnetContextTagBuilder(
 
     readBuffer.closeContext("BACnetContextTagReal");
     // Create the instance
-    return new BACnetContextTagRealBuilderImpl(payload, tagNumberArgument);
+    return new BACnetContextTagRealBuilderImpl(payload);
   }
 
   public static class BACnetContextTagRealBuilderImpl
       implements BACnetContextTag.BACnetContextTagBuilder {
     private final BACnetTagPayloadReal payload;
-    private final Short tagNumberArgument;
 
-    public BACnetContextTagRealBuilderImpl(BACnetTagPayloadReal payload, Short tagNumberArgument) {
+    public BACnetContextTagRealBuilderImpl(BACnetTagPayloadReal payload) {
       this.payload = payload;
-      this.tagNumberArgument = tagNumberArgument;
     }
 
-    public BACnetContextTagReal build(BACnetTagHeader header, Short tagNumberArgument) {
-      BACnetContextTagReal bACnetContextTagReal =
-          new BACnetContextTagReal(header, payload, tagNumberArgument);
+    public BACnetContextTagReal build(BACnetTagHeader header) {
+      BACnetContextTagReal bACnetContextTagReal = new BACnetContextTagReal(header, payload);
       return bACnetContextTagReal;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagSignedInteger.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagSignedInteger.java
index 12c03f375af..57028667433 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagSignedInteger.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagSignedInteger.java
@@ -46,14 +46,10 @@ public BACnetDataType getDataType() {
   // Properties.
   protected final BACnetTagPayloadSignedInteger payload;
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
   public BACnetContextTagSignedInteger(
-      BACnetTagHeader header, BACnetTagPayloadSignedInteger payload, Short tagNumberArgument) {
-    super(header, tagNumberArgument);
+      BACnetTagHeader header, BACnetTagPayloadSignedInteger payload) {
+    super(header);
     this.payload = payload;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public BACnetTagPayloadSignedInteger getPayload() {
@@ -125,23 +121,20 @@ public static BACnetContextTagBuilder staticParseBACnetContextTagBuilder(
 
     readBuffer.closeContext("BACnetContextTagSignedInteger");
     // Create the instance
-    return new BACnetContextTagSignedIntegerBuilderImpl(payload, tagNumberArgument);
+    return new BACnetContextTagSignedIntegerBuilderImpl(payload);
   }
 
   public static class BACnetContextTagSignedIntegerBuilderImpl
       implements BACnetContextTag.BACnetContextTagBuilder {
     private final BACnetTagPayloadSignedInteger payload;
-    private final Short tagNumberArgument;
 
-    public BACnetContextTagSignedIntegerBuilderImpl(
-        BACnetTagPayloadSignedInteger payload, Short tagNumberArgument) {
+    public BACnetContextTagSignedIntegerBuilderImpl(BACnetTagPayloadSignedInteger payload) {
       this.payload = payload;
-      this.tagNumberArgument = tagNumberArgument;
     }
 
-    public BACnetContextTagSignedInteger build(BACnetTagHeader header, Short tagNumberArgument) {
+    public BACnetContextTagSignedInteger build(BACnetTagHeader header) {
       BACnetContextTagSignedInteger bACnetContextTagSignedInteger =
-          new BACnetContextTagSignedInteger(header, payload, tagNumberArgument);
+          new BACnetContextTagSignedInteger(header, payload);
       return bACnetContextTagSignedInteger;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagTime.java
index a5571abd43a..733c7749998 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagTime.java
@@ -45,14 +45,9 @@ public BACnetDataType getDataType() {
   // Properties.
   protected final BACnetTagPayloadTime payload;
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
-  public BACnetContextTagTime(
-      BACnetTagHeader header, BACnetTagPayloadTime payload, Short tagNumberArgument) {
-    super(header, tagNumberArgument);
+  public BACnetContextTagTime(BACnetTagHeader header, BACnetTagPayloadTime payload) {
+    super(header);
     this.payload = payload;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public BACnetTagPayloadTime getPayload() {
@@ -102,22 +97,19 @@ public static BACnetContextTagBuilder staticParseBACnetContextTagBuilder(
 
     readBuffer.closeContext("BACnetContextTagTime");
     // Create the instance
-    return new BACnetContextTagTimeBuilderImpl(payload, tagNumberArgument);
+    return new BACnetContextTagTimeBuilderImpl(payload);
   }
 
   public static class BACnetContextTagTimeBuilderImpl
       implements BACnetContextTag.BACnetContextTagBuilder {
     private final BACnetTagPayloadTime payload;
-    private final Short tagNumberArgument;
 
-    public BACnetContextTagTimeBuilderImpl(BACnetTagPayloadTime payload, Short tagNumberArgument) {
+    public BACnetContextTagTimeBuilderImpl(BACnetTagPayloadTime payload) {
       this.payload = payload;
-      this.tagNumberArgument = tagNumberArgument;
     }
 
-    public BACnetContextTagTime build(BACnetTagHeader header, Short tagNumberArgument) {
-      BACnetContextTagTime bACnetContextTagTime =
-          new BACnetContextTagTime(header, payload, tagNumberArgument);
+    public BACnetContextTagTime build(BACnetTagHeader header) {
+      BACnetContextTagTime bACnetContextTagTime = new BACnetContextTagTime(header, payload);
       return bACnetContextTagTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagUnknown.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagUnknown.java
index 1a620d4afed..54ef0d6c0c1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagUnknown.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagUnknown.java
@@ -45,16 +45,9 @@ public BACnetDataType getDataType() {
   // Properties.
   protected final byte[] unknownData;
 
-  // Arguments.
-  protected final Long actualLength;
-  protected final Short tagNumberArgument;
-
-  public BACnetContextTagUnknown(
-      BACnetTagHeader header, byte[] unknownData, Long actualLength, Short tagNumberArgument) {
-    super(header, tagNumberArgument);
+  public BACnetContextTagUnknown(BACnetTagHeader header, byte[] unknownData) {
+    super(header);
     this.unknownData = unknownData;
-    this.actualLength = actualLength;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public byte[] getUnknownData() {
@@ -104,25 +97,20 @@ public static BACnetContextTagBuilder staticParseBACnetContextTagBuilder(
 
     readBuffer.closeContext("BACnetContextTagUnknown");
     // Create the instance
-    return new BACnetContextTagUnknownBuilderImpl(unknownData, actualLength, tagNumberArgument);
+    return new BACnetContextTagUnknownBuilderImpl(unknownData);
   }
 
   public static class BACnetContextTagUnknownBuilderImpl
       implements BACnetContextTag.BACnetContextTagBuilder {
     private final byte[] unknownData;
-    private final Long actualLength;
-    private final Short tagNumberArgument;
 
-    public BACnetContextTagUnknownBuilderImpl(
-        byte[] unknownData, Long actualLength, Short tagNumberArgument) {
+    public BACnetContextTagUnknownBuilderImpl(byte[] unknownData) {
       this.unknownData = unknownData;
-      this.actualLength = actualLength;
-      this.tagNumberArgument = tagNumberArgument;
     }
 
-    public BACnetContextTagUnknown build(BACnetTagHeader header, Short tagNumberArgument) {
+    public BACnetContextTagUnknown build(BACnetTagHeader header) {
       BACnetContextTagUnknown bACnetContextTagUnknown =
-          new BACnetContextTagUnknown(header, unknownData, actualLength, tagNumberArgument);
+          new BACnetContextTagUnknown(header, unknownData);
       return bACnetContextTagUnknown;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagUnsignedInteger.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagUnsignedInteger.java
index b545068d8ec..2d13a367941 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagUnsignedInteger.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagUnsignedInteger.java
@@ -46,14 +46,10 @@ public BACnetDataType getDataType() {
   // Properties.
   protected final BACnetTagPayloadUnsignedInteger payload;
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
   public BACnetContextTagUnsignedInteger(
-      BACnetTagHeader header, BACnetTagPayloadUnsignedInteger payload, Short tagNumberArgument) {
-    super(header, tagNumberArgument);
+      BACnetTagHeader header, BACnetTagPayloadUnsignedInteger payload) {
+    super(header);
     this.payload = payload;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public BACnetTagPayloadUnsignedInteger getPayload() {
@@ -125,23 +121,20 @@ public static BACnetContextTagBuilder staticParseBACnetContextTagBuilder(
 
     readBuffer.closeContext("BACnetContextTagUnsignedInteger");
     // Create the instance
-    return new BACnetContextTagUnsignedIntegerBuilderImpl(payload, tagNumberArgument);
+    return new BACnetContextTagUnsignedIntegerBuilderImpl(payload);
   }
 
   public static class BACnetContextTagUnsignedIntegerBuilderImpl
       implements BACnetContextTag.BACnetContextTagBuilder {
     private final BACnetTagPayloadUnsignedInteger payload;
-    private final Short tagNumberArgument;
 
-    public BACnetContextTagUnsignedIntegerBuilderImpl(
-        BACnetTagPayloadUnsignedInteger payload, Short tagNumberArgument) {
+    public BACnetContextTagUnsignedIntegerBuilderImpl(BACnetTagPayloadUnsignedInteger payload) {
       this.payload = payload;
-      this.tagNumberArgument = tagNumberArgument;
     }
 
-    public BACnetContextTagUnsignedInteger build(BACnetTagHeader header, Short tagNumberArgument) {
+    public BACnetContextTagUnsignedInteger build(BACnetTagHeader header) {
       BACnetContextTagUnsignedInteger bACnetContextTagUnsignedInteger =
-          new BACnetContextTagUnsignedInteger(header, payload, tagNumberArgument);
+          new BACnetContextTagUnsignedInteger(header, payload);
       return bACnetContextTagUnsignedInteger;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDateRangeEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDateRangeEnclosed.java
index d67fac26781..ad86198a80d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDateRangeEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDateRangeEnclosed.java
@@ -42,19 +42,12 @@ public class BACnetDateRangeEnclosed implements Message {
   protected final BACnetDateRange dateRange;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetDateRangeEnclosed(
-      BACnetOpeningTag openingTag,
-      BACnetDateRange dateRange,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetDateRange dateRange, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.dateRange = dateRange;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -134,8 +127,7 @@ public static BACnetDateRangeEnclosed staticParse(ReadBuffer readBuffer, Short t
     readBuffer.closeContext("BACnetDateRangeEnclosed");
     // Create the instance
     BACnetDateRangeEnclosed _bACnetDateRangeEnclosed;
-    _bACnetDateRangeEnclosed =
-        new BACnetDateRangeEnclosed(openingTag, dateRange, closingTag, tagNumber);
+    _bACnetDateRangeEnclosed = new BACnetDateRangeEnclosed(openingTag, dateRange, closingTag);
     return _bACnetDateRangeEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDateTimeEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDateTimeEnclosed.java
index d39c6d0c4a2..31b4ccafd91 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDateTimeEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDateTimeEnclosed.java
@@ -42,19 +42,12 @@ public class BACnetDateTimeEnclosed implements Message {
   protected final BACnetDateTime dateTimeValue;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetDateTimeEnclosed(
-      BACnetOpeningTag openingTag,
-      BACnetDateTime dateTimeValue,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetDateTime dateTimeValue, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.dateTimeValue = dateTimeValue;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -134,8 +127,7 @@ public static BACnetDateTimeEnclosed staticParse(ReadBuffer readBuffer, Short ta
     readBuffer.closeContext("BACnetDateTimeEnclosed");
     // Create the instance
     BACnetDateTimeEnclosed _bACnetDateTimeEnclosed;
-    _bACnetDateTimeEnclosed =
-        new BACnetDateTimeEnclosed(openingTag, dateTimeValue, closingTag, tagNumber);
+    _bACnetDateTimeEnclosed = new BACnetDateTimeEnclosed(openingTag, dateTimeValue, closingTag);
     return _bACnetDateTimeEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDaysOfWeekTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDaysOfWeekTagged.java
index 0ebd2ad51f8..04fe2ee39d9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDaysOfWeekTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDaysOfWeekTagged.java
@@ -41,20 +41,10 @@ public class BACnetDaysOfWeekTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetTagPayloadBitString payload;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetDaysOfWeekTagged(
-      BACnetTagHeader header,
-      BACnetTagPayloadBitString payload,
-      Short tagNumber,
-      TagClass tagClass) {
+  public BACnetDaysOfWeekTagged(BACnetTagHeader header, BACnetTagPayloadBitString payload) {
     super();
     this.header = header;
     this.payload = payload;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -242,7 +232,7 @@ public static BACnetDaysOfWeekTagged staticParse(
     readBuffer.closeContext("BACnetDaysOfWeekTagged");
     // Create the instance
     BACnetDaysOfWeekTagged _bACnetDaysOfWeekTagged;
-    _bACnetDaysOfWeekTagged = new BACnetDaysOfWeekTagged(header, payload, tagNumber, tagClass);
+    _bACnetDaysOfWeekTagged = new BACnetDaysOfWeekTagged(header, payload);
     return _bACnetDaysOfWeekTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDeviceObjectPropertyReferenceEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDeviceObjectPropertyReferenceEnclosed.java
index 52b29bca1d5..a07632ccdc8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDeviceObjectPropertyReferenceEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDeviceObjectPropertyReferenceEnclosed.java
@@ -42,19 +42,14 @@ public class BACnetDeviceObjectPropertyReferenceEnclosed implements Message {
   protected final BACnetDeviceObjectPropertyReference value;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetDeviceObjectPropertyReferenceEnclosed(
       BACnetOpeningTag openingTag,
       BACnetDeviceObjectPropertyReference value,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.value = value;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -137,7 +132,7 @@ public static BACnetDeviceObjectPropertyReferenceEnclosed staticParse(
     // Create the instance
     BACnetDeviceObjectPropertyReferenceEnclosed _bACnetDeviceObjectPropertyReferenceEnclosed;
     _bACnetDeviceObjectPropertyReferenceEnclosed =
-        new BACnetDeviceObjectPropertyReferenceEnclosed(openingTag, value, closingTag, tagNumber);
+        new BACnetDeviceObjectPropertyReferenceEnclosed(openingTag, value, closingTag);
     return _bACnetDeviceObjectPropertyReferenceEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDeviceObjectReferenceEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDeviceObjectReferenceEnclosed.java
index d246db258b4..e3cb4668132 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDeviceObjectReferenceEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDeviceObjectReferenceEnclosed.java
@@ -42,19 +42,14 @@ public class BACnetDeviceObjectReferenceEnclosed implements Message {
   protected final BACnetDeviceObjectReference objectReference;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetDeviceObjectReferenceEnclosed(
       BACnetOpeningTag openingTag,
       BACnetDeviceObjectReference objectReference,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.objectReference = objectReference;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -136,7 +131,7 @@ public static BACnetDeviceObjectReferenceEnclosed staticParse(
     // Create the instance
     BACnetDeviceObjectReferenceEnclosed _bACnetDeviceObjectReferenceEnclosed;
     _bACnetDeviceObjectReferenceEnclosed =
-        new BACnetDeviceObjectReferenceEnclosed(openingTag, objectReference, closingTag, tagNumber);
+        new BACnetDeviceObjectReferenceEnclosed(openingTag, objectReference, closingTag);
     return _bACnetDeviceObjectReferenceEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDeviceStatusTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDeviceStatusTagged.java
index facb424f3df..fa0311d5717 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDeviceStatusTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDeviceStatusTagged.java
@@ -42,22 +42,12 @@ public class BACnetDeviceStatusTagged implements Message {
   protected final BACnetDeviceStatus value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetDeviceStatusTagged(
-      BACnetTagHeader header,
-      BACnetDeviceStatus value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetDeviceStatus value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetDeviceStatusTagged staticParse(
     readBuffer.closeContext("BACnetDeviceStatusTagged");
     // Create the instance
     BACnetDeviceStatusTagged _bACnetDeviceStatusTagged;
-    _bACnetDeviceStatusTagged =
-        new BACnetDeviceStatusTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetDeviceStatusTagged = new BACnetDeviceStatusTagged(header, value, proprietaryValue);
     return _bACnetDeviceStatusTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorAlarmStateTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorAlarmStateTagged.java
index 934956b329a..f5b60cf12ae 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorAlarmStateTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorAlarmStateTagged.java
@@ -42,22 +42,12 @@ public class BACnetDoorAlarmStateTagged implements Message {
   protected final BACnetDoorAlarmState value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetDoorAlarmStateTagged(
-      BACnetTagHeader header,
-      BACnetDoorAlarmState value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetDoorAlarmState value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetDoorAlarmStateTagged staticParse(
     readBuffer.closeContext("BACnetDoorAlarmStateTagged");
     // Create the instance
     BACnetDoorAlarmStateTagged _bACnetDoorAlarmStateTagged;
-    _bACnetDoorAlarmStateTagged =
-        new BACnetDoorAlarmStateTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetDoorAlarmStateTagged = new BACnetDoorAlarmStateTagged(header, value, proprietaryValue);
     return _bACnetDoorAlarmStateTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorSecuredStatusTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorSecuredStatusTagged.java
index 4a676b97e9e..0b6c43c6680 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorSecuredStatusTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorSecuredStatusTagged.java
@@ -41,17 +41,10 @@ public class BACnetDoorSecuredStatusTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetDoorSecuredStatus value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetDoorSecuredStatusTagged(
-      BACnetTagHeader header, BACnetDoorSecuredStatus value, Short tagNumber, TagClass tagClass) {
+  public BACnetDoorSecuredStatusTagged(BACnetTagHeader header, BACnetDoorSecuredStatus value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -135,8 +128,7 @@ public static BACnetDoorSecuredStatusTagged staticParse(
     readBuffer.closeContext("BACnetDoorSecuredStatusTagged");
     // Create the instance
     BACnetDoorSecuredStatusTagged _bACnetDoorSecuredStatusTagged;
-    _bACnetDoorSecuredStatusTagged =
-        new BACnetDoorSecuredStatusTagged(header, value, tagNumber, tagClass);
+    _bACnetDoorSecuredStatusTagged = new BACnetDoorSecuredStatusTagged(header, value);
     return _bACnetDoorSecuredStatusTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorStatusTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorStatusTagged.java
index 8ff5c4f7b1e..12b73a84dde 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorStatusTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorStatusTagged.java
@@ -42,22 +42,12 @@ public class BACnetDoorStatusTagged implements Message {
   protected final BACnetDoorStatus value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetDoorStatusTagged(
-      BACnetTagHeader header,
-      BACnetDoorStatus value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetDoorStatus value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -178,8 +168,7 @@ public static BACnetDoorStatusTagged staticParse(
     readBuffer.closeContext("BACnetDoorStatusTagged");
     // Create the instance
     BACnetDoorStatusTagged _bACnetDoorStatusTagged;
-    _bACnetDoorStatusTagged =
-        new BACnetDoorStatusTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetDoorStatusTagged = new BACnetDoorStatusTagged(header, value, proprietaryValue);
     return _bACnetDoorStatusTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorValueTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorValueTagged.java
index 5502f07fabc..7835a61b952 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorValueTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetDoorValueTagged.java
@@ -41,17 +41,10 @@ public class BACnetDoorValueTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetDoorValue value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetDoorValueTagged(
-      BACnetTagHeader header, BACnetDoorValue value, Short tagNumber, TagClass tagClass) {
+  public BACnetDoorValueTagged(BACnetTagHeader header, BACnetDoorValue value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetDoorValueTagged staticParse(
     readBuffer.closeContext("BACnetDoorValueTagged");
     // Create the instance
     BACnetDoorValueTagged _bACnetDoorValueTagged;
-    _bACnetDoorValueTagged = new BACnetDoorValueTagged(header, value, tagNumber, tagClass);
+    _bACnetDoorValueTagged = new BACnetDoorValueTagged(header, value);
     return _bACnetDoorValueTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEngineeringUnitsTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEngineeringUnitsTagged.java
index 9eb0f79c3a3..e219a78b900 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEngineeringUnitsTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEngineeringUnitsTagged.java
@@ -42,22 +42,12 @@ public class BACnetEngineeringUnitsTagged implements Message {
   protected final BACnetEngineeringUnits value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetEngineeringUnitsTagged(
-      BACnetTagHeader header,
-      BACnetEngineeringUnits value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetEngineeringUnits value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -181,7 +171,7 @@ public static BACnetEngineeringUnitsTagged staticParse(
     // Create the instance
     BACnetEngineeringUnitsTagged _bACnetEngineeringUnitsTagged;
     _bACnetEngineeringUnitsTagged =
-        new BACnetEngineeringUnitsTagged(header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetEngineeringUnitsTagged(header, value, proprietaryValue);
     return _bACnetEngineeringUnitsTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEscalatorFaultTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEscalatorFaultTagged.java
index 68f3558d47b..ca7e7b734d9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEscalatorFaultTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEscalatorFaultTagged.java
@@ -42,22 +42,12 @@ public class BACnetEscalatorFaultTagged implements Message {
   protected final BACnetEscalatorFault value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetEscalatorFaultTagged(
-      BACnetTagHeader header,
-      BACnetEscalatorFault value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetEscalatorFault value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetEscalatorFaultTagged staticParse(
     readBuffer.closeContext("BACnetEscalatorFaultTagged");
     // Create the instance
     BACnetEscalatorFaultTagged _bACnetEscalatorFaultTagged;
-    _bACnetEscalatorFaultTagged =
-        new BACnetEscalatorFaultTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetEscalatorFaultTagged = new BACnetEscalatorFaultTagged(header, value, proprietaryValue);
     return _bACnetEscalatorFaultTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEscalatorModeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEscalatorModeTagged.java
index 86ee6ff0577..755b2075206 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEscalatorModeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEscalatorModeTagged.java
@@ -42,22 +42,12 @@ public class BACnetEscalatorModeTagged implements Message {
   protected final BACnetEscalatorMode value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetEscalatorModeTagged(
-      BACnetTagHeader header,
-      BACnetEscalatorMode value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetEscalatorMode value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetEscalatorModeTagged staticParse(
     readBuffer.closeContext("BACnetEscalatorModeTagged");
     // Create the instance
     BACnetEscalatorModeTagged _bACnetEscalatorModeTagged;
-    _bACnetEscalatorModeTagged =
-        new BACnetEscalatorModeTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetEscalatorModeTagged = new BACnetEscalatorModeTagged(header, value, proprietaryValue);
     return _bACnetEscalatorModeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEscalatorOperationDirectionTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEscalatorOperationDirectionTagged.java
index 564803bcf51..db8b722fbb0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEscalatorOperationDirectionTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEscalatorOperationDirectionTagged.java
@@ -42,22 +42,12 @@ public class BACnetEscalatorOperationDirectionTagged implements Message {
   protected final BACnetEscalatorOperationDirection value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetEscalatorOperationDirectionTagged(
-      BACnetTagHeader header,
-      BACnetEscalatorOperationDirection value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetEscalatorOperationDirection value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -181,8 +171,7 @@ public static BACnetEscalatorOperationDirectionTagged staticParse(
     // Create the instance
     BACnetEscalatorOperationDirectionTagged _bACnetEscalatorOperationDirectionTagged;
     _bACnetEscalatorOperationDirectionTagged =
-        new BACnetEscalatorOperationDirectionTagged(
-            header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetEscalatorOperationDirectionTagged(header, value, proprietaryValue);
     return _bACnetEscalatorOperationDirectionTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatum.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatum.java
index 4a321623bd4..f9e9e85d5e7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatum.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatum.java
@@ -44,19 +44,12 @@ public abstract class BACnetEventLogRecordLogDatum implements Message {
   protected final BACnetTagHeader peekedTagHeader;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventLogRecordLogDatum(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.peekedTagHeader = peekedTagHeader;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -175,16 +168,13 @@ public static BACnetEventLogRecordLogDatum staticParse(ReadBuffer readBuffer, Sh
     readBuffer.closeContext("BACnetEventLogRecordLogDatum");
     // Create the instance
     BACnetEventLogRecordLogDatum _bACnetEventLogRecordLogDatum =
-        builder.build(openingTag, peekedTagHeader, closingTag, tagNumber);
+        builder.build(openingTag, peekedTagHeader, closingTag);
     return _bACnetEventLogRecordLogDatum;
   }
 
   public interface BACnetEventLogRecordLogDatumBuilder {
     BACnetEventLogRecordLogDatum build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber);
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag);
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatumLogStatus.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatumLogStatus.java
index 9268c67c6d3..b9bf2a13111 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatumLogStatus.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatumLogStatus.java
@@ -43,18 +43,13 @@ public class BACnetEventLogRecordLogDatumLogStatus extends BACnetEventLogRecordL
   // Properties.
   protected final BACnetLogStatusTagged logStatus;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventLogRecordLogDatumLogStatus(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLogStatusTagged logStatus,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetLogStatusTagged logStatus) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.logStatus = logStatus;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetLogStatusTagged getLogStatus() {
@@ -108,28 +103,22 @@ public static BACnetEventLogRecordLogDatumBuilder staticParseBACnetEventLogRecor
 
     readBuffer.closeContext("BACnetEventLogRecordLogDatumLogStatus");
     // Create the instance
-    return new BACnetEventLogRecordLogDatumLogStatusBuilderImpl(logStatus, tagNumber);
+    return new BACnetEventLogRecordLogDatumLogStatusBuilderImpl(logStatus);
   }
 
   public static class BACnetEventLogRecordLogDatumLogStatusBuilderImpl
       implements BACnetEventLogRecordLogDatum.BACnetEventLogRecordLogDatumBuilder {
     private final BACnetLogStatusTagged logStatus;
-    private final Short tagNumber;
 
-    public BACnetEventLogRecordLogDatumLogStatusBuilderImpl(
-        BACnetLogStatusTagged logStatus, Short tagNumber) {
+    public BACnetEventLogRecordLogDatumLogStatusBuilderImpl(BACnetLogStatusTagged logStatus) {
       this.logStatus = logStatus;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetEventLogRecordLogDatumLogStatus build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetEventLogRecordLogDatumLogStatus bACnetEventLogRecordLogDatumLogStatus =
           new BACnetEventLogRecordLogDatumLogStatus(
-              openingTag, peekedTagHeader, closingTag, logStatus, tagNumber);
+              openingTag, peekedTagHeader, closingTag, logStatus);
       return bACnetEventLogRecordLogDatumLogStatus;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatumNotification.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatumNotification.java
index 6043fe09cf3..2edb2b5638c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatumNotification.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatumNotification.java
@@ -45,22 +45,17 @@ public class BACnetEventLogRecordLogDatumNotification extends BACnetEventLogReco
   protected final ConfirmedEventNotificationRequest notification;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventLogRecordLogDatumNotification(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetOpeningTag innerOpeningTag,
       ConfirmedEventNotificationRequest notification,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.notification = notification;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -143,7 +138,7 @@ public static BACnetEventLogRecordLogDatumBuilder staticParseBACnetEventLogRecor
     readBuffer.closeContext("BACnetEventLogRecordLogDatumNotification");
     // Create the instance
     return new BACnetEventLogRecordLogDatumNotificationBuilderImpl(
-        innerOpeningTag, notification, innerClosingTag, tagNumber);
+        innerOpeningTag, notification, innerClosingTag);
   }
 
   public static class BACnetEventLogRecordLogDatumNotificationBuilderImpl
@@ -151,24 +146,18 @@ public static class BACnetEventLogRecordLogDatumNotificationBuilderImpl
     private final BACnetOpeningTag innerOpeningTag;
     private final ConfirmedEventNotificationRequest notification;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
 
     public BACnetEventLogRecordLogDatumNotificationBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
         ConfirmedEventNotificationRequest notification,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.notification = notification;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetEventLogRecordLogDatumNotification build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetEventLogRecordLogDatumNotification bACnetEventLogRecordLogDatumNotification =
           new BACnetEventLogRecordLogDatumNotification(
               openingTag,
@@ -176,8 +165,7 @@ public BACnetEventLogRecordLogDatumNotification build(
               closingTag,
               innerOpeningTag,
               notification,
-              innerClosingTag,
-              tagNumber);
+              innerClosingTag);
       return bACnetEventLogRecordLogDatumNotification;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatumTimeChange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatumTimeChange.java
index 8e942ef3ecf..8d9aaa227ec 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatumTimeChange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventLogRecordLogDatumTimeChange.java
@@ -43,18 +43,13 @@ public class BACnetEventLogRecordLogDatumTimeChange extends BACnetEventLogRecord
   // Properties.
   protected final BACnetContextTagReal timeChange;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventLogRecordLogDatumTimeChange(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagReal timeChange,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagReal timeChange) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.timeChange = timeChange;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagReal getTimeChange() {
@@ -109,28 +104,22 @@ public static BACnetEventLogRecordLogDatumBuilder staticParseBACnetEventLogRecor
 
     readBuffer.closeContext("BACnetEventLogRecordLogDatumTimeChange");
     // Create the instance
-    return new BACnetEventLogRecordLogDatumTimeChangeBuilderImpl(timeChange, tagNumber);
+    return new BACnetEventLogRecordLogDatumTimeChangeBuilderImpl(timeChange);
   }
 
   public static class BACnetEventLogRecordLogDatumTimeChangeBuilderImpl
       implements BACnetEventLogRecordLogDatum.BACnetEventLogRecordLogDatumBuilder {
     private final BACnetContextTagReal timeChange;
-    private final Short tagNumber;
 
-    public BACnetEventLogRecordLogDatumTimeChangeBuilderImpl(
-        BACnetContextTagReal timeChange, Short tagNumber) {
+    public BACnetEventLogRecordLogDatumTimeChangeBuilderImpl(BACnetContextTagReal timeChange) {
       this.timeChange = timeChange;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetEventLogRecordLogDatumTimeChange build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetEventLogRecordLogDatumTimeChange bACnetEventLogRecordLogDatumTimeChange =
           new BACnetEventLogRecordLogDatumTimeChange(
-              openingTag, peekedTagHeader, closingTag, timeChange, tagNumber);
+              openingTag, peekedTagHeader, closingTag, timeChange);
       return bACnetEventLogRecordLogDatumTimeChange;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterAccessEventListOfAccessEvents.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterAccessEventListOfAccessEvents.java
index 5950ac13a3a..ad6ccb7ca9e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterAccessEventListOfAccessEvents.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterAccessEventListOfAccessEvents.java
@@ -42,19 +42,14 @@ public class BACnetEventParameterAccessEventListOfAccessEvents implements Messag
   protected final List<BACnetDeviceObjectPropertyReference> listOfAccessEvents;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventParameterAccessEventListOfAccessEvents(
       BACnetOpeningTag openingTag,
       List<BACnetDeviceObjectPropertyReference> listOfAccessEvents,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listOfAccessEvents = listOfAccessEvents;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -147,7 +142,7 @@ public static BACnetEventParameterAccessEventListOfAccessEvents staticParse(
         _bACnetEventParameterAccessEventListOfAccessEvents;
     _bACnetEventParameterAccessEventListOfAccessEvents =
         new BACnetEventParameterAccessEventListOfAccessEvents(
-            openingTag, listOfAccessEvents, closingTag, tagNumber);
+            openingTag, listOfAccessEvents, closingTag);
     return _bACnetEventParameterAccessEventListOfAccessEvents;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfBitstringListOfBitstringValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfBitstringListOfBitstringValues.java
index 669f21032cd..3520a287924 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfBitstringListOfBitstringValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfBitstringListOfBitstringValues.java
@@ -42,19 +42,14 @@ public class BACnetEventParameterChangeOfBitstringListOfBitstringValues implemen
   protected final List<BACnetApplicationTagBitString> listOfBitstringValues;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventParameterChangeOfBitstringListOfBitstringValues(
       BACnetOpeningTag openingTag,
       List<BACnetApplicationTagBitString> listOfBitstringValues,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listOfBitstringValues = listOfBitstringValues;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -148,7 +143,7 @@ public static BACnetEventParameterChangeOfBitstringListOfBitstringValues staticP
         _bACnetEventParameterChangeOfBitstringListOfBitstringValues;
     _bACnetEventParameterChangeOfBitstringListOfBitstringValues =
         new BACnetEventParameterChangeOfBitstringListOfBitstringValues(
-            openingTag, listOfBitstringValues, closingTag, tagNumber);
+            openingTag, listOfBitstringValues, closingTag);
     return _bACnetEventParameterChangeOfBitstringListOfBitstringValues;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfCharacterStringListOfAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfCharacterStringListOfAlarmValues.java
index 44e9273f0e7..ea7542f65a7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfCharacterStringListOfAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfCharacterStringListOfAlarmValues.java
@@ -42,19 +42,14 @@ public class BACnetEventParameterChangeOfCharacterStringListOfAlarmValues implem
   protected final List<BACnetApplicationTagCharacterString> listOfAlarmValues;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventParameterChangeOfCharacterStringListOfAlarmValues(
       BACnetOpeningTag openingTag,
       List<BACnetApplicationTagCharacterString> listOfAlarmValues,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listOfAlarmValues = listOfAlarmValues;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -150,7 +145,7 @@ public static BACnetEventParameterChangeOfCharacterStringListOfAlarmValues stati
         _bACnetEventParameterChangeOfCharacterStringListOfAlarmValues;
     _bACnetEventParameterChangeOfCharacterStringListOfAlarmValues =
         new BACnetEventParameterChangeOfCharacterStringListOfAlarmValues(
-            openingTag, listOfAlarmValues, closingTag, tagNumber);
+            openingTag, listOfAlarmValues, closingTag);
     return _bACnetEventParameterChangeOfCharacterStringListOfAlarmValues;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues.java
index 5563d31f5ef..1a2316f663d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues.java
@@ -42,19 +42,14 @@ public class BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues implements
   protected final List<BACnetLifeSafetyStateTagged> listOfAlarmValues;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues(
       BACnetOpeningTag openingTag,
       List<BACnetLifeSafetyStateTagged> listOfAlarmValues,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listOfAlarmValues = listOfAlarmValues;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -150,7 +145,7 @@ public static BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues staticPars
         _bACnetEventParameterChangeOfLifeSavetyListOfAlarmValues;
     _bACnetEventParameterChangeOfLifeSavetyListOfAlarmValues =
         new BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues(
-            openingTag, listOfAlarmValues, closingTag, tagNumber);
+            openingTag, listOfAlarmValues, closingTag);
     return _bACnetEventParameterChangeOfLifeSavetyListOfAlarmValues;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues.java
index 95214cf1417..fa2d39bb52b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues.java
@@ -42,19 +42,14 @@ public class BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues i
   protected final List<BACnetLifeSafetyStateTagged> listOfLifeSavetyAlarmValues;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues(
       BACnetOpeningTag openingTag,
       List<BACnetLifeSafetyStateTagged> listOfLifeSavetyAlarmValues,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listOfLifeSavetyAlarmValues = listOfLifeSavetyAlarmValues;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -151,7 +146,7 @@ public static BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues
         _bACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues;
     _bACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues =
         new BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues(
-            openingTag, listOfLifeSavetyAlarmValues, closingTag, tagNumber);
+            openingTag, listOfLifeSavetyAlarmValues, closingTag);
     return _bACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfStateListOfValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfStateListOfValues.java
index c11604080b5..16edd7645cd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfStateListOfValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfStateListOfValues.java
@@ -42,19 +42,14 @@ public class BACnetEventParameterChangeOfStateListOfValues implements Message {
   protected final List<BACnetPropertyStates> listOfValues;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventParameterChangeOfStateListOfValues(
       BACnetOpeningTag openingTag,
       List<BACnetPropertyStates> listOfValues,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listOfValues = listOfValues;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -144,8 +139,7 @@ public static BACnetEventParameterChangeOfStateListOfValues staticParse(
     // Create the instance
     BACnetEventParameterChangeOfStateListOfValues _bACnetEventParameterChangeOfStateListOfValues;
     _bACnetEventParameterChangeOfStateListOfValues =
-        new BACnetEventParameterChangeOfStateListOfValues(
-            openingTag, listOfValues, closingTag, tagNumber);
+        new BACnetEventParameterChangeOfStateListOfValues(openingTag, listOfValues, closingTag);
     return _bACnetEventParameterChangeOfStateListOfValues;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfTimerAlarmValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfTimerAlarmValue.java
index 75350b75960..ff94f2b8a9f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfTimerAlarmValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfTimerAlarmValue.java
@@ -42,19 +42,14 @@ public class BACnetEventParameterChangeOfTimerAlarmValue implements Message {
   protected final List<BACnetTimerStateTagged> alarmValues;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventParameterChangeOfTimerAlarmValue(
       BACnetOpeningTag openingTag,
       List<BACnetTimerStateTagged> alarmValues,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.alarmValues = alarmValues;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -148,8 +143,7 @@ public static BACnetEventParameterChangeOfTimerAlarmValue staticParse(
     // Create the instance
     BACnetEventParameterChangeOfTimerAlarmValue _bACnetEventParameterChangeOfTimerAlarmValue;
     _bACnetEventParameterChangeOfTimerAlarmValue =
-        new BACnetEventParameterChangeOfTimerAlarmValue(
-            openingTag, alarmValues, closingTag, tagNumber);
+        new BACnetEventParameterChangeOfTimerAlarmValue(openingTag, alarmValues, closingTag);
     return _bACnetEventParameterChangeOfTimerAlarmValue;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfValueCivCriteria.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfValueCivCriteria.java
index 2a3ed60b453..c4504b5a059 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfValueCivCriteria.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfValueCivCriteria.java
@@ -44,19 +44,12 @@ public abstract class BACnetEventParameterChangeOfValueCivCriteria implements Me
   protected final BACnetTagHeader peekedTagHeader;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventParameterChangeOfValueCivCriteria(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.peekedTagHeader = peekedTagHeader;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -173,16 +166,13 @@ public static BACnetEventParameterChangeOfValueCivCriteria staticParse(
     readBuffer.closeContext("BACnetEventParameterChangeOfValueCivCriteria");
     // Create the instance
     BACnetEventParameterChangeOfValueCivCriteria _bACnetEventParameterChangeOfValueCivCriteria =
-        builder.build(openingTag, peekedTagHeader, closingTag, tagNumber);
+        builder.build(openingTag, peekedTagHeader, closingTag);
     return _bACnetEventParameterChangeOfValueCivCriteria;
   }
 
   public interface BACnetEventParameterChangeOfValueCivCriteriaBuilder {
     BACnetEventParameterChangeOfValueCivCriteria build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber);
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag);
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfValueCivCriteriaBitmask.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfValueCivCriteriaBitmask.java
index 414dda62e19..2862f453c76 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfValueCivCriteriaBitmask.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfValueCivCriteriaBitmask.java
@@ -43,18 +43,13 @@ public class BACnetEventParameterChangeOfValueCivCriteriaBitmask
   // Properties.
   protected final BACnetContextTagBitString bitmask;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventParameterChangeOfValueCivCriteriaBitmask(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagBitString bitmask,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagBitString bitmask) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.bitmask = bitmask;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagBitString getBitmask() {
@@ -110,30 +105,25 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetEventParameterChangeOfValueCivCriteriaBitmask");
     // Create the instance
-    return new BACnetEventParameterChangeOfValueCivCriteriaBitmaskBuilderImpl(bitmask, tagNumber);
+    return new BACnetEventParameterChangeOfValueCivCriteriaBitmaskBuilderImpl(bitmask);
   }
 
   public static class BACnetEventParameterChangeOfValueCivCriteriaBitmaskBuilderImpl
       implements BACnetEventParameterChangeOfValueCivCriteria
           .BACnetEventParameterChangeOfValueCivCriteriaBuilder {
     private final BACnetContextTagBitString bitmask;
-    private final Short tagNumber;
 
     public BACnetEventParameterChangeOfValueCivCriteriaBitmaskBuilderImpl(
-        BACnetContextTagBitString bitmask, Short tagNumber) {
+        BACnetContextTagBitString bitmask) {
       this.bitmask = bitmask;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetEventParameterChangeOfValueCivCriteriaBitmask build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetEventParameterChangeOfValueCivCriteriaBitmask
           bACnetEventParameterChangeOfValueCivCriteriaBitmask =
               new BACnetEventParameterChangeOfValueCivCriteriaBitmask(
-                  openingTag, peekedTagHeader, closingTag, bitmask, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, bitmask);
       return bACnetEventParameterChangeOfValueCivCriteriaBitmask;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement.java
index 7dc7ce217e7..27bbe590fdb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement.java
@@ -43,18 +43,13 @@ public class BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncre
   // Properties.
   protected final BACnetContextTagReal referencedPropertyIncrement;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagReal referencedPropertyIncrement,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagReal referencedPropertyIncrement) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.referencedPropertyIncrement = referencedPropertyIncrement;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagReal getReferencedPropertyIncrement() {
@@ -116,7 +111,7 @@ public int getLengthInBits() {
         "BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement");
     // Create the instance
     return new BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrementBuilderImpl(
-        referencedPropertyIncrement, tagNumber);
+        referencedPropertyIncrement);
   }
 
   public static
@@ -124,23 +119,18 @@ class BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrementBui
       implements BACnetEventParameterChangeOfValueCivCriteria
           .BACnetEventParameterChangeOfValueCivCriteriaBuilder {
     private final BACnetContextTagReal referencedPropertyIncrement;
-    private final Short tagNumber;
 
     public BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrementBuilderImpl(
-        BACnetContextTagReal referencedPropertyIncrement, Short tagNumber) {
+        BACnetContextTagReal referencedPropertyIncrement) {
       this.referencedPropertyIncrement = referencedPropertyIncrement;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement
           bACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement =
               new BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement(
-                  openingTag, peekedTagHeader, closingTag, referencedPropertyIncrement, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, referencedPropertyIncrement);
       return bACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterExtendedParameters.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterExtendedParameters.java
index 162671f9430..2369a6aa945 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterExtendedParameters.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventParameterExtendedParameters.java
@@ -56,9 +56,6 @@ public class BACnetEventParameterExtendedParameters implements Message {
   protected final BACnetDeviceObjectPropertyReferenceEnclosed reference;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventParameterExtendedParameters(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -76,8 +73,7 @@ public BACnetEventParameterExtendedParameters(
       BACnetApplicationTagTime timeValue,
       BACnetApplicationTagObjectIdentifier objectIdentifier,
       BACnetDeviceObjectPropertyReferenceEnclosed reference,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.peekedTagHeader = peekedTagHeader;
@@ -96,7 +92,6 @@ public BACnetEventParameterExtendedParameters(
     this.objectIdentifier = objectIdentifier;
     this.reference = reference;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -200,102 +195,46 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     writeBuffer.writeVirtual("isClosingTag", isClosingTag);
 
     // Optional Field (nullValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "nullValue",
-        nullValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x0)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("nullValue", nullValue, writeComplex(writeBuffer));
 
     // Optional Field (realValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "realValue",
-        realValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x4)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("realValue", realValue, writeComplex(writeBuffer));
 
     // Optional Field (unsignedValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "unsignedValue",
-        unsignedValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x2)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("unsignedValue", unsignedValue, writeComplex(writeBuffer));
 
     // Optional Field (booleanValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "booleanValue",
-        booleanValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x1)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("booleanValue", booleanValue, writeComplex(writeBuffer));
 
     // Optional Field (integerValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "integerValue",
-        integerValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x3)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("integerValue", integerValue, writeComplex(writeBuffer));
 
     // Optional Field (doubleValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "doubleValue",
-        doubleValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x5)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("doubleValue", doubleValue, writeComplex(writeBuffer));
 
     // Optional Field (octetStringValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "octetStringValue",
-        octetStringValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x6)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("octetStringValue", octetStringValue, writeComplex(writeBuffer));
 
     // Optional Field (characterStringValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "characterStringValue",
-        characterStringValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x7)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("characterStringValue", characterStringValue, writeComplex(writeBuffer));
 
     // Optional Field (bitStringValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "bitStringValue",
-        bitStringValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x8)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("bitStringValue", bitStringValue, writeComplex(writeBuffer));
 
     // Optional Field (enumeratedValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "enumeratedValue",
-        enumeratedValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x9)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("enumeratedValue", enumeratedValue, writeComplex(writeBuffer));
 
     // Optional Field (dateValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "dateValue",
-        dateValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0xA)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("dateValue", dateValue, writeComplex(writeBuffer));
 
     // Optional Field (timeValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "timeValue",
-        timeValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0xB)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("timeValue", timeValue, writeComplex(writeBuffer));
 
     // Optional Field (objectIdentifier) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "objectIdentifier",
-        objectIdentifier,
-        writeComplex(writeBuffer),
-        ((getPeekedTagNumber()) == (0xC)) && (!(getIsOpeningTag())));
+    writeOptionalField("objectIdentifier", objectIdentifier, writeComplex(writeBuffer));
 
     // Optional Field (reference) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "reference",
-        reference,
-        writeComplex(writeBuffer),
-        (getIsOpeningTag()) && (!(getIsClosingTag())));
+    writeOptionalField("reference", reference, writeComplex(writeBuffer));
 
     // Simple Field (closingTag)
     writeSimpleField("closingTag", closingTag, writeComplex(writeBuffer));
@@ -574,8 +513,7 @@ public static BACnetEventParameterExtendedParameters staticParse(
             timeValue,
             objectIdentifier,
             reference,
-            closingTag,
-            tagNumber);
+            closingTag);
     return _bACnetEventParameterExtendedParameters;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventPriorities.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventPriorities.java
index ca92ce91774..814ab94c365 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventPriorities.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventPriorities.java
@@ -44,23 +44,18 @@ public class BACnetEventPriorities implements Message {
   protected final BACnetApplicationTagUnsignedInteger toNormal;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventPriorities(
       BACnetOpeningTag openingTag,
       BACnetApplicationTagUnsignedInteger toOffnormal,
       BACnetApplicationTagUnsignedInteger toFault,
       BACnetApplicationTagUnsignedInteger toNormal,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.toOffnormal = toOffnormal;
     this.toFault = toFault;
     this.toNormal = toNormal;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -184,8 +179,7 @@ public static BACnetEventPriorities staticParse(ReadBuffer readBuffer, Short tag
     // Create the instance
     BACnetEventPriorities _bACnetEventPriorities;
     _bACnetEventPriorities =
-        new BACnetEventPriorities(
-            openingTag, toOffnormal, toFault, toNormal, closingTag, tagNumber);
+        new BACnetEventPriorities(openingTag, toOffnormal, toFault, toNormal, closingTag);
     return _bACnetEventPriorities;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventStateTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventStateTagged.java
index 7fb3d8f2ad9..aa7d8c3c7dc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventStateTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventStateTagged.java
@@ -42,22 +42,12 @@ public class BACnetEventStateTagged implements Message {
   protected final BACnetEventState value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetEventStateTagged(
-      BACnetTagHeader header,
-      BACnetEventState value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetEventState value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -178,8 +168,7 @@ public static BACnetEventStateTagged staticParse(
     readBuffer.closeContext("BACnetEventStateTagged");
     // Create the instance
     BACnetEventStateTagged _bACnetEventStateTagged;
-    _bACnetEventStateTagged =
-        new BACnetEventStateTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetEventStateTagged = new BACnetEventStateTagged(header, value, proprietaryValue);
     return _bACnetEventStateTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventSummariesList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventSummariesList.java
index 3e40fe3e3e3..7f600579686 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventSummariesList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventSummariesList.java
@@ -42,19 +42,14 @@ public class BACnetEventSummariesList implements Message {
   protected final List<BACnetEventSummary> listOfEventSummaries;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventSummariesList(
       BACnetOpeningTag openingTag,
       List<BACnetEventSummary> listOfEventSummaries,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listOfEventSummaries = listOfEventSummaries;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -144,7 +139,7 @@ public static BACnetEventSummariesList staticParse(ReadBuffer readBuffer, Short
     // Create the instance
     BACnetEventSummariesList _bACnetEventSummariesList;
     _bACnetEventSummariesList =
-        new BACnetEventSummariesList(openingTag, listOfEventSummaries, closingTag, tagNumber);
+        new BACnetEventSummariesList(openingTag, listOfEventSummaries, closingTag);
     return _bACnetEventSummariesList;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventTimestampsEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventTimestampsEnclosed.java
index bf828e50aa4..964b9b18a0b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventTimestampsEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventTimestampsEnclosed.java
@@ -42,19 +42,14 @@ public class BACnetEventTimestampsEnclosed implements Message {
   protected final BACnetEventTimestamps eventTimestamps;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetEventTimestampsEnclosed(
       BACnetOpeningTag openingTag,
       BACnetEventTimestamps eventTimestamps,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.eventTimestamps = eventTimestamps;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -136,7 +131,7 @@ public static BACnetEventTimestampsEnclosed staticParse(ReadBuffer readBuffer, S
     // Create the instance
     BACnetEventTimestampsEnclosed _bACnetEventTimestampsEnclosed;
     _bACnetEventTimestampsEnclosed =
-        new BACnetEventTimestampsEnclosed(openingTag, eventTimestamps, closingTag, tagNumber);
+        new BACnetEventTimestampsEnclosed(openingTag, eventTimestamps, closingTag);
     return _bACnetEventTimestampsEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventTransitionBitsTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventTransitionBitsTagged.java
index 7f4c209405b..979e44bc993 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventTransitionBitsTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventTransitionBitsTagged.java
@@ -41,20 +41,11 @@ public class BACnetEventTransitionBitsTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetTagPayloadBitString payload;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetEventTransitionBitsTagged(
-      BACnetTagHeader header,
-      BACnetTagPayloadBitString payload,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetTagPayloadBitString payload) {
     super();
     this.header = header;
     this.payload = payload;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -178,8 +169,7 @@ public static BACnetEventTransitionBitsTagged staticParse(
     readBuffer.closeContext("BACnetEventTransitionBitsTagged");
     // Create the instance
     BACnetEventTransitionBitsTagged _bACnetEventTransitionBitsTagged;
-    _bACnetEventTransitionBitsTagged =
-        new BACnetEventTransitionBitsTagged(header, payload, tagNumber, tagClass);
+    _bACnetEventTransitionBitsTagged = new BACnetEventTransitionBitsTagged(header, payload);
     return _bACnetEventTransitionBitsTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventTypeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventTypeTagged.java
index 202d89cdcb1..204f91e31b9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventTypeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetEventTypeTagged.java
@@ -42,22 +42,12 @@ public class BACnetEventTypeTagged implements Message {
   protected final BACnetEventType value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetEventTypeTagged(
-      BACnetTagHeader header,
-      BACnetEventType value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetEventType value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -178,8 +168,7 @@ public static BACnetEventTypeTagged staticParse(
     readBuffer.closeContext("BACnetEventTypeTagged");
     // Create the instance
     BACnetEventTypeTagged _bACnetEventTypeTagged;
-    _bACnetEventTypeTagged =
-        new BACnetEventTypeTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetEventTypeTagged = new BACnetEventTypeTagged(header, value, proprietaryValue);
     return _bACnetEventTypeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultCharacterStringListOfFaultValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultCharacterStringListOfFaultValues.java
index c5c0d3adf08..f757ea994ca 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultCharacterStringListOfFaultValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultCharacterStringListOfFaultValues.java
@@ -42,19 +42,14 @@ public class BACnetFaultParameterFaultCharacterStringListOfFaultValues implement
   protected final List<BACnetApplicationTagCharacterString> listOfFaultValues;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetFaultParameterFaultCharacterStringListOfFaultValues(
       BACnetOpeningTag openingTag,
       List<BACnetApplicationTagCharacterString> listOfFaultValues,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listOfFaultValues = listOfFaultValues;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -150,7 +145,7 @@ public static BACnetFaultParameterFaultCharacterStringListOfFaultValues staticPa
         _bACnetFaultParameterFaultCharacterStringListOfFaultValues;
     _bACnetFaultParameterFaultCharacterStringListOfFaultValues =
         new BACnetFaultParameterFaultCharacterStringListOfFaultValues(
-            openingTag, listOfFaultValues, closingTag, tagNumber);
+            openingTag, listOfFaultValues, closingTag);
     return _bACnetFaultParameterFaultCharacterStringListOfFaultValues;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultExtendedParameters.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultExtendedParameters.java
index 568ee9a37cc..321663594d3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultExtendedParameters.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultExtendedParameters.java
@@ -42,19 +42,14 @@ public class BACnetFaultParameterFaultExtendedParameters implements Message {
   protected final List<BACnetFaultParameterFaultExtendedParametersEntry> parameters;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetFaultParameterFaultExtendedParameters(
       BACnetOpeningTag openingTag,
       List<BACnetFaultParameterFaultExtendedParametersEntry> parameters,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.parameters = parameters;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -146,8 +141,7 @@ public static BACnetFaultParameterFaultExtendedParameters staticParse(
     // Create the instance
     BACnetFaultParameterFaultExtendedParameters _bACnetFaultParameterFaultExtendedParameters;
     _bACnetFaultParameterFaultExtendedParameters =
-        new BACnetFaultParameterFaultExtendedParameters(
-            openingTag, parameters, closingTag, tagNumber);
+        new BACnetFaultParameterFaultExtendedParameters(openingTag, parameters, closingTag);
     return _bACnetFaultParameterFaultExtendedParameters;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultLifeSafetyListOfFaultValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultLifeSafetyListOfFaultValues.java
index d8931d09b72..661860f16b9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultLifeSafetyListOfFaultValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultLifeSafetyListOfFaultValues.java
@@ -42,19 +42,14 @@ public class BACnetFaultParameterFaultLifeSafetyListOfFaultValues implements Mes
   protected final List<BACnetLifeSafetyStateTagged> listIfFaultValues;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetFaultParameterFaultLifeSafetyListOfFaultValues(
       BACnetOpeningTag openingTag,
       List<BACnetLifeSafetyStateTagged> listIfFaultValues,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listIfFaultValues = listIfFaultValues;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -150,7 +145,7 @@ public static BACnetFaultParameterFaultLifeSafetyListOfFaultValues staticParse(
         _bACnetFaultParameterFaultLifeSafetyListOfFaultValues;
     _bACnetFaultParameterFaultLifeSafetyListOfFaultValues =
         new BACnetFaultParameterFaultLifeSafetyListOfFaultValues(
-            openingTag, listIfFaultValues, closingTag, tagNumber);
+            openingTag, listIfFaultValues, closingTag);
     return _bACnetFaultParameterFaultLifeSafetyListOfFaultValues;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.java
index 7f19c0a1d1e..8d041932f72 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.java
@@ -44,19 +44,12 @@ public abstract class BACnetFaultParameterFaultOutOfRangeMaxNormalValue implemen
   protected final BACnetTagHeader peekedTagHeader;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetFaultParameterFaultOutOfRangeMaxNormalValue(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.peekedTagHeader = peekedTagHeader;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -188,16 +181,13 @@ public static BACnetFaultParameterFaultOutOfRangeMaxNormalValue staticParse(
     // Create the instance
     BACnetFaultParameterFaultOutOfRangeMaxNormalValue
         _bACnetFaultParameterFaultOutOfRangeMaxNormalValue =
-            builder.build(openingTag, peekedTagHeader, closingTag, tagNumber);
+            builder.build(openingTag, peekedTagHeader, closingTag);
     return _bACnetFaultParameterFaultOutOfRangeMaxNormalValue;
   }
 
   public interface BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder {
     BACnetFaultParameterFaultOutOfRangeMaxNormalValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber);
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag);
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble.java
index c70a78ea608..46436c15f47 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble.java
@@ -43,18 +43,13 @@ public class BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble
   // Properties.
   protected final BACnetApplicationTagDouble doubleValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDouble doubleValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagDouble doubleValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.doubleValue = doubleValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagDouble getDoubleValue() {
@@ -107,31 +102,25 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble");
     // Create the instance
-    return new BACnetFaultParameterFaultOutOfRangeMaxNormalValueDoubleBuilderImpl(
-        doubleValue, tagNumber);
+    return new BACnetFaultParameterFaultOutOfRangeMaxNormalValueDoubleBuilderImpl(doubleValue);
   }
 
   public static class BACnetFaultParameterFaultOutOfRangeMaxNormalValueDoubleBuilderImpl
       implements BACnetFaultParameterFaultOutOfRangeMaxNormalValue
           .BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder {
     private final BACnetApplicationTagDouble doubleValue;
-    private final Short tagNumber;
 
     public BACnetFaultParameterFaultOutOfRangeMaxNormalValueDoubleBuilderImpl(
-        BACnetApplicationTagDouble doubleValue, Short tagNumber) {
+        BACnetApplicationTagDouble doubleValue) {
       this.doubleValue = doubleValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble
           bACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble =
               new BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble(
-                  openingTag, peekedTagHeader, closingTag, doubleValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, doubleValue);
       return bACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger.java
index f449bae938e..e8fa4d2b3d9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger.java
@@ -43,18 +43,13 @@ public class BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger
   // Properties.
   protected final BACnetApplicationTagSignedInteger integerValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger integerValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagSignedInteger integerValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.integerValue = integerValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagSignedInteger getIntegerValue() {
@@ -109,31 +104,25 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger");
     // Create the instance
-    return new BACnetFaultParameterFaultOutOfRangeMaxNormalValueIntegerBuilderImpl(
-        integerValue, tagNumber);
+    return new BACnetFaultParameterFaultOutOfRangeMaxNormalValueIntegerBuilderImpl(integerValue);
   }
 
   public static class BACnetFaultParameterFaultOutOfRangeMaxNormalValueIntegerBuilderImpl
       implements BACnetFaultParameterFaultOutOfRangeMaxNormalValue
           .BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder {
     private final BACnetApplicationTagSignedInteger integerValue;
-    private final Short tagNumber;
 
     public BACnetFaultParameterFaultOutOfRangeMaxNormalValueIntegerBuilderImpl(
-        BACnetApplicationTagSignedInteger integerValue, Short tagNumber) {
+        BACnetApplicationTagSignedInteger integerValue) {
       this.integerValue = integerValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger
           bACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger =
               new BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger(
-                  openingTag, peekedTagHeader, closingTag, integerValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, integerValue);
       return bACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal.java
index a44c1fb1d8b..d89b8ddcc85 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal.java
@@ -43,18 +43,13 @@ public class BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal
   // Properties.
   protected final BACnetApplicationTagReal realValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal realValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagReal realValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.realValue = realValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagReal getRealValue() {
@@ -107,31 +102,25 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal");
     // Create the instance
-    return new BACnetFaultParameterFaultOutOfRangeMaxNormalValueRealBuilderImpl(
-        realValue, tagNumber);
+    return new BACnetFaultParameterFaultOutOfRangeMaxNormalValueRealBuilderImpl(realValue);
   }
 
   public static class BACnetFaultParameterFaultOutOfRangeMaxNormalValueRealBuilderImpl
       implements BACnetFaultParameterFaultOutOfRangeMaxNormalValue
           .BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder {
     private final BACnetApplicationTagReal realValue;
-    private final Short tagNumber;
 
     public BACnetFaultParameterFaultOutOfRangeMaxNormalValueRealBuilderImpl(
-        BACnetApplicationTagReal realValue, Short tagNumber) {
+        BACnetApplicationTagReal realValue) {
       this.realValue = realValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal
           bACnetFaultParameterFaultOutOfRangeMaxNormalValueReal =
               new BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal(
-                  openingTag, peekedTagHeader, closingTag, realValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, realValue);
       return bACnetFaultParameterFaultOutOfRangeMaxNormalValueReal;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned.java
index a57e263d846..1dc330513c1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned.java
@@ -43,18 +43,13 @@ public class BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger unsignedValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger unsignedValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagUnsignedInteger unsignedValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.unsignedValue = unsignedValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagUnsignedInteger getUnsignedValue() {
@@ -109,31 +104,25 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned");
     // Create the instance
-    return new BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsignedBuilderImpl(
-        unsignedValue, tagNumber);
+    return new BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsignedBuilderImpl(unsignedValue);
   }
 
   public static class BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsignedBuilderImpl
       implements BACnetFaultParameterFaultOutOfRangeMaxNormalValue
           .BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder {
     private final BACnetApplicationTagUnsignedInteger unsignedValue;
-    private final Short tagNumber;
 
     public BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsignedBuilderImpl(
-        BACnetApplicationTagUnsignedInteger unsignedValue, Short tagNumber) {
+        BACnetApplicationTagUnsignedInteger unsignedValue) {
       this.unsignedValue = unsignedValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned
           bACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned =
               new BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned(
-                  openingTag, peekedTagHeader, closingTag, unsignedValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, unsignedValue);
       return bACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValue.java
index e3b0ce1ea0d..8a3e5b7e38e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValue.java
@@ -44,19 +44,12 @@ public abstract class BACnetFaultParameterFaultOutOfRangeMinNormalValue implemen
   protected final BACnetTagHeader peekedTagHeader;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetFaultParameterFaultOutOfRangeMinNormalValue(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.peekedTagHeader = peekedTagHeader;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -188,16 +181,13 @@ public static BACnetFaultParameterFaultOutOfRangeMinNormalValue staticParse(
     // Create the instance
     BACnetFaultParameterFaultOutOfRangeMinNormalValue
         _bACnetFaultParameterFaultOutOfRangeMinNormalValue =
-            builder.build(openingTag, peekedTagHeader, closingTag, tagNumber);
+            builder.build(openingTag, peekedTagHeader, closingTag);
     return _bACnetFaultParameterFaultOutOfRangeMinNormalValue;
   }
 
   public interface BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder {
     BACnetFaultParameterFaultOutOfRangeMinNormalValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber);
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag);
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble.java
index efce2fa9629..23eae2ef85f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble.java
@@ -43,18 +43,13 @@ public class BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble
   // Properties.
   protected final BACnetApplicationTagDouble doubleValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDouble doubleValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagDouble doubleValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.doubleValue = doubleValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagDouble getDoubleValue() {
@@ -107,31 +102,25 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble");
     // Create the instance
-    return new BACnetFaultParameterFaultOutOfRangeMinNormalValueDoubleBuilderImpl(
-        doubleValue, tagNumber);
+    return new BACnetFaultParameterFaultOutOfRangeMinNormalValueDoubleBuilderImpl(doubleValue);
   }
 
   public static class BACnetFaultParameterFaultOutOfRangeMinNormalValueDoubleBuilderImpl
       implements BACnetFaultParameterFaultOutOfRangeMinNormalValue
           .BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder {
     private final BACnetApplicationTagDouble doubleValue;
-    private final Short tagNumber;
 
     public BACnetFaultParameterFaultOutOfRangeMinNormalValueDoubleBuilderImpl(
-        BACnetApplicationTagDouble doubleValue, Short tagNumber) {
+        BACnetApplicationTagDouble doubleValue) {
       this.doubleValue = doubleValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble
           bACnetFaultParameterFaultOutOfRangeMinNormalValueDouble =
               new BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble(
-                  openingTag, peekedTagHeader, closingTag, doubleValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, doubleValue);
       return bACnetFaultParameterFaultOutOfRangeMinNormalValueDouble;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger.java
index f5dd4370b5c..7ecaa007e99 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger.java
@@ -43,18 +43,13 @@ public class BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger
   // Properties.
   protected final BACnetApplicationTagSignedInteger integerValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger integerValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagSignedInteger integerValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.integerValue = integerValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagSignedInteger getIntegerValue() {
@@ -109,31 +104,25 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger");
     // Create the instance
-    return new BACnetFaultParameterFaultOutOfRangeMinNormalValueIntegerBuilderImpl(
-        integerValue, tagNumber);
+    return new BACnetFaultParameterFaultOutOfRangeMinNormalValueIntegerBuilderImpl(integerValue);
   }
 
   public static class BACnetFaultParameterFaultOutOfRangeMinNormalValueIntegerBuilderImpl
       implements BACnetFaultParameterFaultOutOfRangeMinNormalValue
           .BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder {
     private final BACnetApplicationTagSignedInteger integerValue;
-    private final Short tagNumber;
 
     public BACnetFaultParameterFaultOutOfRangeMinNormalValueIntegerBuilderImpl(
-        BACnetApplicationTagSignedInteger integerValue, Short tagNumber) {
+        BACnetApplicationTagSignedInteger integerValue) {
       this.integerValue = integerValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger
           bACnetFaultParameterFaultOutOfRangeMinNormalValueInteger =
               new BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger(
-                  openingTag, peekedTagHeader, closingTag, integerValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, integerValue);
       return bACnetFaultParameterFaultOutOfRangeMinNormalValueInteger;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueReal.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueReal.java
index c2365083804..1fac739b255 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueReal.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueReal.java
@@ -43,18 +43,13 @@ public class BACnetFaultParameterFaultOutOfRangeMinNormalValueReal
   // Properties.
   protected final BACnetApplicationTagReal realValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetFaultParameterFaultOutOfRangeMinNormalValueReal(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagReal realValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagReal realValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.realValue = realValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagReal getRealValue() {
@@ -107,31 +102,25 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetFaultParameterFaultOutOfRangeMinNormalValueReal");
     // Create the instance
-    return new BACnetFaultParameterFaultOutOfRangeMinNormalValueRealBuilderImpl(
-        realValue, tagNumber);
+    return new BACnetFaultParameterFaultOutOfRangeMinNormalValueRealBuilderImpl(realValue);
   }
 
   public static class BACnetFaultParameterFaultOutOfRangeMinNormalValueRealBuilderImpl
       implements BACnetFaultParameterFaultOutOfRangeMinNormalValue
           .BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder {
     private final BACnetApplicationTagReal realValue;
-    private final Short tagNumber;
 
     public BACnetFaultParameterFaultOutOfRangeMinNormalValueRealBuilderImpl(
-        BACnetApplicationTagReal realValue, Short tagNumber) {
+        BACnetApplicationTagReal realValue) {
       this.realValue = realValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetFaultParameterFaultOutOfRangeMinNormalValueReal build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetFaultParameterFaultOutOfRangeMinNormalValueReal
           bACnetFaultParameterFaultOutOfRangeMinNormalValueReal =
               new BACnetFaultParameterFaultOutOfRangeMinNormalValueReal(
-                  openingTag, peekedTagHeader, closingTag, realValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, realValue);
       return bACnetFaultParameterFaultOutOfRangeMinNormalValueReal;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned.java
index e878800754c..52691aa0e9f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned.java
@@ -43,18 +43,13 @@ public class BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger unsignedValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger unsignedValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagUnsignedInteger unsignedValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.unsignedValue = unsignedValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagUnsignedInteger getUnsignedValue() {
@@ -109,31 +104,25 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned");
     // Create the instance
-    return new BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsignedBuilderImpl(
-        unsignedValue, tagNumber);
+    return new BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsignedBuilderImpl(unsignedValue);
   }
 
   public static class BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsignedBuilderImpl
       implements BACnetFaultParameterFaultOutOfRangeMinNormalValue
           .BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder {
     private final BACnetApplicationTagUnsignedInteger unsignedValue;
-    private final Short tagNumber;
 
     public BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsignedBuilderImpl(
-        BACnetApplicationTagUnsignedInteger unsignedValue, Short tagNumber) {
+        BACnetApplicationTagUnsignedInteger unsignedValue) {
       this.unsignedValue = unsignedValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned
           bACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned =
               new BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned(
-                  openingTag, peekedTagHeader, closingTag, unsignedValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, unsignedValue);
       return bACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultStateListOfFaultValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultStateListOfFaultValues.java
index d0fe3d65227..04edb6c86e8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultStateListOfFaultValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultParameterFaultStateListOfFaultValues.java
@@ -42,19 +42,14 @@ public class BACnetFaultParameterFaultStateListOfFaultValues implements Message
   protected final List<BACnetPropertyStates> listIfFaultValues;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetFaultParameterFaultStateListOfFaultValues(
       BACnetOpeningTag openingTag,
       List<BACnetPropertyStates> listIfFaultValues,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listIfFaultValues = listIfFaultValues;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -146,7 +141,7 @@ public static BACnetFaultParameterFaultStateListOfFaultValues staticParse(
         _bACnetFaultParameterFaultStateListOfFaultValues;
     _bACnetFaultParameterFaultStateListOfFaultValues =
         new BACnetFaultParameterFaultStateListOfFaultValues(
-            openingTag, listIfFaultValues, closingTag, tagNumber);
+            openingTag, listIfFaultValues, closingTag);
     return _bACnetFaultParameterFaultStateListOfFaultValues;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultTypeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultTypeTagged.java
index 4dc30e7ac30..ad312403d06 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultTypeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFaultTypeTagged.java
@@ -41,17 +41,10 @@ public class BACnetFaultTypeTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetFaultType value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetFaultTypeTagged(
-      BACnetTagHeader header, BACnetFaultType value, Short tagNumber, TagClass tagClass) {
+  public BACnetFaultTypeTagged(BACnetTagHeader header, BACnetFaultType value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetFaultTypeTagged staticParse(
     readBuffer.closeContext("BACnetFaultTypeTagged");
     // Create the instance
     BACnetFaultTypeTagged _bACnetFaultTypeTagged;
-    _bACnetFaultTypeTagged = new BACnetFaultTypeTagged(header, value, tagNumber, tagClass);
+    _bACnetFaultTypeTagged = new BACnetFaultTypeTagged(header, value);
     return _bACnetFaultTypeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFileAccessMethodTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFileAccessMethodTagged.java
index 033c1fb4551..4b0892fa7ee 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFileAccessMethodTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetFileAccessMethodTagged.java
@@ -41,17 +41,10 @@ public class BACnetFileAccessMethodTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetFileAccessMethod value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetFileAccessMethodTagged(
-      BACnetTagHeader header, BACnetFileAccessMethod value, Short tagNumber, TagClass tagClass) {
+  public BACnetFileAccessMethodTagged(BACnetTagHeader header, BACnetFileAccessMethod value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -135,8 +128,7 @@ public static BACnetFileAccessMethodTagged staticParse(
     readBuffer.closeContext("BACnetFileAccessMethodTagged");
     // Create the instance
     BACnetFileAccessMethodTagged _bACnetFileAccessMethodTagged;
-    _bACnetFileAccessMethodTagged =
-        new BACnetFileAccessMethodTagged(header, value, tagNumber, tagClass);
+    _bACnetFileAccessMethodTagged = new BACnetFileAccessMethodTagged(header, value);
     return _bACnetFileAccessMethodTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetGroupChannelValueList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetGroupChannelValueList.java
index 6ed0be368b4..2190f98a370 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetGroupChannelValueList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetGroupChannelValueList.java
@@ -42,19 +42,14 @@ public class BACnetGroupChannelValueList implements Message {
   protected final List<BACnetEventSummary> listOfEventSummaries;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetGroupChannelValueList(
       BACnetOpeningTag openingTag,
       List<BACnetEventSummary> listOfEventSummaries,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listOfEventSummaries = listOfEventSummaries;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -144,7 +139,7 @@ public static BACnetGroupChannelValueList staticParse(ReadBuffer readBuffer, Sho
     // Create the instance
     BACnetGroupChannelValueList _bACnetGroupChannelValueList;
     _bACnetGroupChannelValueList =
-        new BACnetGroupChannelValueList(openingTag, listOfEventSummaries, closingTag, tagNumber);
+        new BACnetGroupChannelValueList(openingTag, listOfEventSummaries, closingTag);
     return _bACnetGroupChannelValueList;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetHostAddressEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetHostAddressEnclosed.java
index 796d30c0ebe..2725f7c325b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetHostAddressEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetHostAddressEnclosed.java
@@ -42,19 +42,12 @@ public class BACnetHostAddressEnclosed implements Message {
   protected final BACnetHostAddress hostAddress;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetHostAddressEnclosed(
-      BACnetOpeningTag openingTag,
-      BACnetHostAddress hostAddress,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetHostAddress hostAddress, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.hostAddress = hostAddress;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -135,8 +128,7 @@ public static BACnetHostAddressEnclosed staticParse(ReadBuffer readBuffer, Short
     readBuffer.closeContext("BACnetHostAddressEnclosed");
     // Create the instance
     BACnetHostAddressEnclosed _bACnetHostAddressEnclosed;
-    _bACnetHostAddressEnclosed =
-        new BACnetHostAddressEnclosed(openingTag, hostAddress, closingTag, tagNumber);
+    _bACnetHostAddressEnclosed = new BACnetHostAddressEnclosed(openingTag, hostAddress, closingTag);
     return _bACnetHostAddressEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetHostNPortEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetHostNPortEnclosed.java
index 5e39f3af15f..d141e207b0c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetHostNPortEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetHostNPortEnclosed.java
@@ -42,19 +42,12 @@ public class BACnetHostNPortEnclosed implements Message {
   protected final BACnetHostNPort bacnetHostNPort;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetHostNPortEnclosed(
-      BACnetOpeningTag openingTag,
-      BACnetHostNPort bacnetHostNPort,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetHostNPort bacnetHostNPort, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.bacnetHostNPort = bacnetHostNPort;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -135,8 +128,7 @@ public static BACnetHostNPortEnclosed staticParse(ReadBuffer readBuffer, Short t
     readBuffer.closeContext("BACnetHostNPortEnclosed");
     // Create the instance
     BACnetHostNPortEnclosed _bACnetHostNPortEnclosed;
-    _bACnetHostNPortEnclosed =
-        new BACnetHostNPortEnclosed(openingTag, bacnetHostNPort, closingTag, tagNumber);
+    _bACnetHostNPortEnclosed = new BACnetHostNPortEnclosed(openingTag, bacnetHostNPort, closingTag);
     return _bACnetHostNPortEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetIPModeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetIPModeTagged.java
index 6472a4d07ff..246e94612c6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetIPModeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetIPModeTagged.java
@@ -41,17 +41,10 @@ public class BACnetIPModeTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetIPMode value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetIPModeTagged(
-      BACnetTagHeader header, BACnetIPMode value, Short tagNumber, TagClass tagClass) {
+  public BACnetIPModeTagged(BACnetTagHeader header, BACnetIPMode value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetIPModeTagged staticParse(
     readBuffer.closeContext("BACnetIPModeTagged");
     // Create the instance
     BACnetIPModeTagged _bACnetIPModeTagged;
-    _bACnetIPModeTagged = new BACnetIPModeTagged(header, value, tagNumber, tagClass);
+    _bACnetIPModeTagged = new BACnetIPModeTagged(header, value);
     return _bACnetIPModeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLandingDoorStatusLandingDoorsList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLandingDoorStatusLandingDoorsList.java
index 4c915ad7eca..68b61792067 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLandingDoorStatusLandingDoorsList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLandingDoorStatusLandingDoorsList.java
@@ -42,19 +42,14 @@ public class BACnetLandingDoorStatusLandingDoorsList implements Message {
   protected final List<BACnetLandingDoorStatusLandingDoorsListEntry> landingDoors;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLandingDoorStatusLandingDoorsList(
       BACnetOpeningTag openingTag,
       List<BACnetLandingDoorStatusLandingDoorsListEntry> landingDoors,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.landingDoors = landingDoors;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -146,8 +141,7 @@ public static BACnetLandingDoorStatusLandingDoorsList staticParse(
     // Create the instance
     BACnetLandingDoorStatusLandingDoorsList _bACnetLandingDoorStatusLandingDoorsList;
     _bACnetLandingDoorStatusLandingDoorsList =
-        new BACnetLandingDoorStatusLandingDoorsList(
-            openingTag, landingDoors, closingTag, tagNumber);
+        new BACnetLandingDoorStatusLandingDoorsList(openingTag, landingDoors, closingTag);
     return _bACnetLandingDoorStatusLandingDoorsList;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLifeSafetyModeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLifeSafetyModeTagged.java
index b306bd55037..b1a0773a4a4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLifeSafetyModeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLifeSafetyModeTagged.java
@@ -42,22 +42,12 @@ public class BACnetLifeSafetyModeTagged implements Message {
   protected final BACnetLifeSafetyMode value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetLifeSafetyModeTagged(
-      BACnetTagHeader header,
-      BACnetLifeSafetyMode value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetLifeSafetyMode value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetLifeSafetyModeTagged staticParse(
     readBuffer.closeContext("BACnetLifeSafetyModeTagged");
     // Create the instance
     BACnetLifeSafetyModeTagged _bACnetLifeSafetyModeTagged;
-    _bACnetLifeSafetyModeTagged =
-        new BACnetLifeSafetyModeTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetLifeSafetyModeTagged = new BACnetLifeSafetyModeTagged(header, value, proprietaryValue);
     return _bACnetLifeSafetyModeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLifeSafetyOperationTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLifeSafetyOperationTagged.java
index 48f9a19bf60..b1535c4e4c7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLifeSafetyOperationTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLifeSafetyOperationTagged.java
@@ -42,22 +42,12 @@ public class BACnetLifeSafetyOperationTagged implements Message {
   protected final BACnetLifeSafetyOperation value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetLifeSafetyOperationTagged(
-      BACnetTagHeader header,
-      BACnetLifeSafetyOperation value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetLifeSafetyOperation value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -181,7 +171,7 @@ public static BACnetLifeSafetyOperationTagged staticParse(
     // Create the instance
     BACnetLifeSafetyOperationTagged _bACnetLifeSafetyOperationTagged;
     _bACnetLifeSafetyOperationTagged =
-        new BACnetLifeSafetyOperationTagged(header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetLifeSafetyOperationTagged(header, value, proprietaryValue);
     return _bACnetLifeSafetyOperationTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLifeSafetyStateTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLifeSafetyStateTagged.java
index ce55b1e2746..30d5b57256e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLifeSafetyStateTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLifeSafetyStateTagged.java
@@ -42,22 +42,12 @@ public class BACnetLifeSafetyStateTagged implements Message {
   protected final BACnetLifeSafetyState value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetLifeSafetyStateTagged(
-      BACnetTagHeader header,
-      BACnetLifeSafetyState value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetLifeSafetyState value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetLifeSafetyStateTagged staticParse(
     readBuffer.closeContext("BACnetLifeSafetyStateTagged");
     // Create the instance
     BACnetLifeSafetyStateTagged _bACnetLifeSafetyStateTagged;
-    _bACnetLifeSafetyStateTagged =
-        new BACnetLifeSafetyStateTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetLifeSafetyStateTagged = new BACnetLifeSafetyStateTagged(header, value, proprietaryValue);
     return _bACnetLifeSafetyStateTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarCallListFloorList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarCallListFloorList.java
index 4eadc59d69b..5e2937b8a14 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarCallListFloorList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarCallListFloorList.java
@@ -42,19 +42,14 @@ public class BACnetLiftCarCallListFloorList implements Message {
   protected final List<BACnetApplicationTagUnsignedInteger> floorNumbers;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLiftCarCallListFloorList(
       BACnetOpeningTag openingTag,
       List<BACnetApplicationTagUnsignedInteger> floorNumbers,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.floorNumbers = floorNumbers;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -148,7 +143,7 @@ public static BACnetLiftCarCallListFloorList staticParse(ReadBuffer readBuffer,
     // Create the instance
     BACnetLiftCarCallListFloorList _bACnetLiftCarCallListFloorList;
     _bACnetLiftCarCallListFloorList =
-        new BACnetLiftCarCallListFloorList(openingTag, floorNumbers, closingTag, tagNumber);
+        new BACnetLiftCarCallListFloorList(openingTag, floorNumbers, closingTag);
     return _bACnetLiftCarCallListFloorList;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarDirectionTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarDirectionTagged.java
index 2302c24771f..e3b569a8a59 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarDirectionTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarDirectionTagged.java
@@ -42,22 +42,12 @@ public class BACnetLiftCarDirectionTagged implements Message {
   protected final BACnetLiftCarDirection value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetLiftCarDirectionTagged(
-      BACnetTagHeader header,
-      BACnetLiftCarDirection value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetLiftCarDirection value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -181,7 +171,7 @@ public static BACnetLiftCarDirectionTagged staticParse(
     // Create the instance
     BACnetLiftCarDirectionTagged _bACnetLiftCarDirectionTagged;
     _bACnetLiftCarDirectionTagged =
-        new BACnetLiftCarDirectionTagged(header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetLiftCarDirectionTagged(header, value, proprietaryValue);
     return _bACnetLiftCarDirectionTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarDoorCommandTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarDoorCommandTagged.java
index 256ca801780..f8907e1251a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarDoorCommandTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarDoorCommandTagged.java
@@ -41,17 +41,10 @@ public class BACnetLiftCarDoorCommandTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetLiftCarDoorCommand value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetLiftCarDoorCommandTagged(
-      BACnetTagHeader header, BACnetLiftCarDoorCommand value, Short tagNumber, TagClass tagClass) {
+  public BACnetLiftCarDoorCommandTagged(BACnetTagHeader header, BACnetLiftCarDoorCommand value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,8 +126,7 @@ public static BACnetLiftCarDoorCommandTagged staticParse(
     readBuffer.closeContext("BACnetLiftCarDoorCommandTagged");
     // Create the instance
     BACnetLiftCarDoorCommandTagged _bACnetLiftCarDoorCommandTagged;
-    _bACnetLiftCarDoorCommandTagged =
-        new BACnetLiftCarDoorCommandTagged(header, value, tagNumber, tagClass);
+    _bACnetLiftCarDoorCommandTagged = new BACnetLiftCarDoorCommandTagged(header, value);
     return _bACnetLiftCarDoorCommandTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarDriveStatusTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarDriveStatusTagged.java
index 98dbad68eeb..fbd117f8d31 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarDriveStatusTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarDriveStatusTagged.java
@@ -42,22 +42,12 @@ public class BACnetLiftCarDriveStatusTagged implements Message {
   protected final BACnetLiftCarDriveStatus value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetLiftCarDriveStatusTagged(
-      BACnetTagHeader header,
-      BACnetLiftCarDriveStatus value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetLiftCarDriveStatus value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -181,7 +171,7 @@ public static BACnetLiftCarDriveStatusTagged staticParse(
     // Create the instance
     BACnetLiftCarDriveStatusTagged _bACnetLiftCarDriveStatusTagged;
     _bACnetLiftCarDriveStatusTagged =
-        new BACnetLiftCarDriveStatusTagged(header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetLiftCarDriveStatusTagged(header, value, proprietaryValue);
     return _bACnetLiftCarDriveStatusTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarModeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarModeTagged.java
index bf300fa626b..e51bcee552f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarModeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftCarModeTagged.java
@@ -42,22 +42,12 @@ public class BACnetLiftCarModeTagged implements Message {
   protected final BACnetLiftCarMode value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetLiftCarModeTagged(
-      BACnetTagHeader header,
-      BACnetLiftCarMode value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetLiftCarMode value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetLiftCarModeTagged staticParse(
     readBuffer.closeContext("BACnetLiftCarModeTagged");
     // Create the instance
     BACnetLiftCarModeTagged _bACnetLiftCarModeTagged;
-    _bACnetLiftCarModeTagged =
-        new BACnetLiftCarModeTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetLiftCarModeTagged = new BACnetLiftCarModeTagged(header, value, proprietaryValue);
     return _bACnetLiftCarModeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftFaultTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftFaultTagged.java
index 6242216966d..cfa17d752ec 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftFaultTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftFaultTagged.java
@@ -42,22 +42,12 @@ public class BACnetLiftFaultTagged implements Message {
   protected final BACnetLiftFault value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetLiftFaultTagged(
-      BACnetTagHeader header,
-      BACnetLiftFault value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetLiftFault value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -178,8 +168,7 @@ public static BACnetLiftFaultTagged staticParse(
     readBuffer.closeContext("BACnetLiftFaultTagged");
     // Create the instance
     BACnetLiftFaultTagged _bACnetLiftFaultTagged;
-    _bACnetLiftFaultTagged =
-        new BACnetLiftFaultTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetLiftFaultTagged = new BACnetLiftFaultTagged(header, value, proprietaryValue);
     return _bACnetLiftFaultTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftGroupModeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftGroupModeTagged.java
index 6280458d1a3..15edac10569 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftGroupModeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLiftGroupModeTagged.java
@@ -41,17 +41,10 @@ public class BACnetLiftGroupModeTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetLiftGroupMode value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetLiftGroupModeTagged(
-      BACnetTagHeader header, BACnetLiftGroupMode value, Short tagNumber, TagClass tagClass) {
+  public BACnetLiftGroupModeTagged(BACnetTagHeader header, BACnetLiftGroupMode value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetLiftGroupModeTagged staticParse(
     readBuffer.closeContext("BACnetLiftGroupModeTagged");
     // Create the instance
     BACnetLiftGroupModeTagged _bACnetLiftGroupModeTagged;
-    _bACnetLiftGroupModeTagged = new BACnetLiftGroupModeTagged(header, value, tagNumber, tagClass);
+    _bACnetLiftGroupModeTagged = new BACnetLiftGroupModeTagged(header, value);
     return _bACnetLiftGroupModeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingCommandEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingCommandEnclosed.java
index 27283b486ee..8a533c5df84 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingCommandEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingCommandEnclosed.java
@@ -42,19 +42,14 @@ public class BACnetLightingCommandEnclosed implements Message {
   protected final BACnetLightingCommand lightingCommand;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLightingCommandEnclosed(
       BACnetOpeningTag openingTag,
       BACnetLightingCommand lightingCommand,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.lightingCommand = lightingCommand;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -136,7 +131,7 @@ public static BACnetLightingCommandEnclosed staticParse(ReadBuffer readBuffer, S
     // Create the instance
     BACnetLightingCommandEnclosed _bACnetLightingCommandEnclosed;
     _bACnetLightingCommandEnclosed =
-        new BACnetLightingCommandEnclosed(openingTag, lightingCommand, closingTag, tagNumber);
+        new BACnetLightingCommandEnclosed(openingTag, lightingCommand, closingTag);
     return _bACnetLightingCommandEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingInProgressTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingInProgressTagged.java
index cec2ee9f83b..54735bd8d1b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingInProgressTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingInProgressTagged.java
@@ -41,17 +41,10 @@ public class BACnetLightingInProgressTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetLightingInProgress value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetLightingInProgressTagged(
-      BACnetTagHeader header, BACnetLightingInProgress value, Short tagNumber, TagClass tagClass) {
+  public BACnetLightingInProgressTagged(BACnetTagHeader header, BACnetLightingInProgress value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,8 +126,7 @@ public static BACnetLightingInProgressTagged staticParse(
     readBuffer.closeContext("BACnetLightingInProgressTagged");
     // Create the instance
     BACnetLightingInProgressTagged _bACnetLightingInProgressTagged;
-    _bACnetLightingInProgressTagged =
-        new BACnetLightingInProgressTagged(header, value, tagNumber, tagClass);
+    _bACnetLightingInProgressTagged = new BACnetLightingInProgressTagged(header, value);
     return _bACnetLightingInProgressTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingOperationTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingOperationTagged.java
index 8a02012053f..c3ade413de5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingOperationTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingOperationTagged.java
@@ -42,22 +42,12 @@ public class BACnetLightingOperationTagged implements Message {
   protected final BACnetLightingOperation value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetLightingOperationTagged(
-      BACnetTagHeader header,
-      BACnetLightingOperation value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetLightingOperation value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -181,7 +171,7 @@ public static BACnetLightingOperationTagged staticParse(
     // Create the instance
     BACnetLightingOperationTagged _bACnetLightingOperationTagged;
     _bACnetLightingOperationTagged =
-        new BACnetLightingOperationTagged(header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetLightingOperationTagged(header, value, proprietaryValue);
     return _bACnetLightingOperationTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingTransitionTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingTransitionTagged.java
index 5bd246a98db..008d6c98f24 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingTransitionTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLightingTransitionTagged.java
@@ -42,22 +42,12 @@ public class BACnetLightingTransitionTagged implements Message {
   protected final BACnetLightingTransition value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetLightingTransitionTagged(
-      BACnetTagHeader header,
-      BACnetLightingTransition value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetLightingTransition value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -181,7 +171,7 @@ public static BACnetLightingTransitionTagged staticParse(
     // Create the instance
     BACnetLightingTransitionTagged _bACnetLightingTransitionTagged;
     _bACnetLightingTransitionTagged =
-        new BACnetLightingTransitionTagged(header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetLightingTransitionTagged(header, value, proprietaryValue);
     return _bACnetLightingTransitionTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLimitEnableTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLimitEnableTagged.java
index b5b94b99b1b..37365d4a9d2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLimitEnableTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLimitEnableTagged.java
@@ -41,20 +41,10 @@ public class BACnetLimitEnableTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetTagPayloadBitString payload;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetLimitEnableTagged(
-      BACnetTagHeader header,
-      BACnetTagPayloadBitString payload,
-      Short tagNumber,
-      TagClass tagClass) {
+  public BACnetLimitEnableTagged(BACnetTagHeader header, BACnetTagPayloadBitString payload) {
     super();
     this.header = header;
     this.payload = payload;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -162,7 +152,7 @@ public static BACnetLimitEnableTagged staticParse(
     readBuffer.closeContext("BACnetLimitEnableTagged");
     // Create the instance
     BACnetLimitEnableTagged _bACnetLimitEnableTagged;
-    _bACnetLimitEnableTagged = new BACnetLimitEnableTagged(header, payload, tagNumber, tagClass);
+    _bACnetLimitEnableTagged = new BACnetLimitEnableTagged(header, payload);
     return _bACnetLimitEnableTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLockStatusTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLockStatusTagged.java
index 7ad87266323..6ba14a6b005 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLockStatusTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLockStatusTagged.java
@@ -41,17 +41,10 @@ public class BACnetLockStatusTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetLockStatus value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetLockStatusTagged(
-      BACnetTagHeader header, BACnetLockStatus value, Short tagNumber, TagClass tagClass) {
+  public BACnetLockStatusTagged(BACnetTagHeader header, BACnetLockStatus value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetLockStatusTagged staticParse(
     readBuffer.closeContext("BACnetLockStatusTagged");
     // Create the instance
     BACnetLockStatusTagged _bACnetLockStatusTagged;
-    _bACnetLockStatusTagged = new BACnetLockStatusTagged(header, value, tagNumber, tagClass);
+    _bACnetLockStatusTagged = new BACnetLockStatusTagged(header, value);
     return _bACnetLockStatusTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogData.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogData.java
index 98fa7195211..cdc0ef73806 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogData.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogData.java
@@ -44,19 +44,12 @@ public abstract class BACnetLogData implements Message {
   protected final BACnetTagHeader peekedTagHeader;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogData(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.peekedTagHeader = peekedTagHeader;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -169,17 +162,13 @@ public static BACnetLogData staticParse(ReadBuffer readBuffer, Short tagNumber)
 
     readBuffer.closeContext("BACnetLogData");
     // Create the instance
-    BACnetLogData _bACnetLogData =
-        builder.build(openingTag, peekedTagHeader, closingTag, tagNumber);
+    BACnetLogData _bACnetLogData = builder.build(openingTag, peekedTagHeader, closingTag);
     return _bACnetLogData;
   }
 
   public interface BACnetLogDataBuilder {
     BACnetLogData build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber);
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag);
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogDataLogData.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogDataLogData.java
index e261bb72d53..054ddf16ade 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogDataLogData.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogDataLogData.java
@@ -44,22 +44,17 @@ public class BACnetLogDataLogData extends BACnetLogData implements Message {
   protected final List<BACnetLogDataLogDataEntry> logData;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogDataLogData(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
       BACnetOpeningTag innerOpeningTag,
       List<BACnetLogDataLogDataEntry> logData,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.logData = logData;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -147,8 +142,7 @@ public static BACnetLogDataBuilder staticParseBACnetLogDataBuilder(
 
     readBuffer.closeContext("BACnetLogDataLogData");
     // Create the instance
-    return new BACnetLogDataLogDataBuilderImpl(
-        innerOpeningTag, logData, innerClosingTag, tagNumber);
+    return new BACnetLogDataLogDataBuilderImpl(innerOpeningTag, logData, innerClosingTag);
   }
 
   public static class BACnetLogDataLogDataBuilderImpl
@@ -156,33 +150,21 @@ public static class BACnetLogDataLogDataBuilderImpl
     private final BACnetOpeningTag innerOpeningTag;
     private final List<BACnetLogDataLogDataEntry> logData;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
 
     public BACnetLogDataLogDataBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
         List<BACnetLogDataLogDataEntry> logData,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.logData = logData;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetLogDataLogData build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetLogDataLogData bACnetLogDataLogData =
           new BACnetLogDataLogData(
-              openingTag,
-              peekedTagHeader,
-              closingTag,
-              innerOpeningTag,
-              logData,
-              innerClosingTag,
-              tagNumber);
+              openingTag, peekedTagHeader, closingTag, innerOpeningTag, logData, innerClosingTag);
       return bACnetLogDataLogData;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogDataLogDataTimeChange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogDataLogDataTimeChange.java
index 444d3d0c3cf..974d4d59b71 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogDataLogDataTimeChange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogDataLogDataTimeChange.java
@@ -42,18 +42,13 @@ public class BACnetLogDataLogDataTimeChange extends BACnetLogData implements Mes
   // Properties.
   protected final BACnetContextTagReal timeChange;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogDataLogDataTimeChange(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagReal timeChange,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagReal timeChange) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.timeChange = timeChange;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagReal getTimeChange() {
@@ -108,28 +103,21 @@ public static BACnetLogDataBuilder staticParseBACnetLogDataBuilder(
 
     readBuffer.closeContext("BACnetLogDataLogDataTimeChange");
     // Create the instance
-    return new BACnetLogDataLogDataTimeChangeBuilderImpl(timeChange, tagNumber);
+    return new BACnetLogDataLogDataTimeChangeBuilderImpl(timeChange);
   }
 
   public static class BACnetLogDataLogDataTimeChangeBuilderImpl
       implements BACnetLogData.BACnetLogDataBuilder {
     private final BACnetContextTagReal timeChange;
-    private final Short tagNumber;
 
-    public BACnetLogDataLogDataTimeChangeBuilderImpl(
-        BACnetContextTagReal timeChange, Short tagNumber) {
+    public BACnetLogDataLogDataTimeChangeBuilderImpl(BACnetContextTagReal timeChange) {
       this.timeChange = timeChange;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetLogDataLogDataTimeChange build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetLogDataLogDataTimeChange bACnetLogDataLogDataTimeChange =
-          new BACnetLogDataLogDataTimeChange(
-              openingTag, peekedTagHeader, closingTag, timeChange, tagNumber);
+          new BACnetLogDataLogDataTimeChange(openingTag, peekedTagHeader, closingTag, timeChange);
       return bACnetLogDataLogDataTimeChange;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogDataLogStatus.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogDataLogStatus.java
index 8036f58b482..ee79128b466 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogDataLogStatus.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogDataLogStatus.java
@@ -42,18 +42,13 @@ public class BACnetLogDataLogStatus extends BACnetLogData implements Message {
   // Properties.
   protected final BACnetLogStatusTagged logStatus;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogDataLogStatus(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLogStatusTagged logStatus,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetLogStatusTagged logStatus) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.logStatus = logStatus;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetLogStatusTagged getLogStatus() {
@@ -107,26 +102,21 @@ public static BACnetLogDataBuilder staticParseBACnetLogDataBuilder(
 
     readBuffer.closeContext("BACnetLogDataLogStatus");
     // Create the instance
-    return new BACnetLogDataLogStatusBuilderImpl(logStatus, tagNumber);
+    return new BACnetLogDataLogStatusBuilderImpl(logStatus);
   }
 
   public static class BACnetLogDataLogStatusBuilderImpl
       implements BACnetLogData.BACnetLogDataBuilder {
     private final BACnetLogStatusTagged logStatus;
-    private final Short tagNumber;
 
-    public BACnetLogDataLogStatusBuilderImpl(BACnetLogStatusTagged logStatus, Short tagNumber) {
+    public BACnetLogDataLogStatusBuilderImpl(BACnetLogStatusTagged logStatus) {
       this.logStatus = logStatus;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetLogDataLogStatus build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetLogDataLogStatus bACnetLogDataLogStatus =
-          new BACnetLogDataLogStatus(openingTag, peekedTagHeader, closingTag, logStatus, tagNumber);
+          new BACnetLogDataLogStatus(openingTag, peekedTagHeader, closingTag, logStatus);
       return bACnetLogDataLogStatus;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatum.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatum.java
index 547a0e4c167..a4fd60e2f2b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatum.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatum.java
@@ -44,19 +44,12 @@ public abstract class BACnetLogRecordLogDatum implements Message {
   protected final BACnetTagHeader peekedTagHeader;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogRecordLogDatum(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.peekedTagHeader = peekedTagHeader;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -207,16 +200,13 @@ public static BACnetLogRecordLogDatum staticParse(ReadBuffer readBuffer, Short t
     readBuffer.closeContext("BACnetLogRecordLogDatum");
     // Create the instance
     BACnetLogRecordLogDatum _bACnetLogRecordLogDatum =
-        builder.build(openingTag, peekedTagHeader, closingTag, tagNumber);
+        builder.build(openingTag, peekedTagHeader, closingTag);
     return _bACnetLogRecordLogDatum;
   }
 
   public interface BACnetLogRecordLogDatumBuilder {
     BACnetLogRecordLogDatum build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber);
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag);
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumAnyValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumAnyValue.java
index d2c8b185013..414bc211ede 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumAnyValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumAnyValue.java
@@ -42,18 +42,13 @@ public class BACnetLogRecordLogDatumAnyValue extends BACnetLogRecordLogDatum imp
   // Properties.
   protected final BACnetConstructedData anyValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogRecordLogDatumAnyValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetConstructedData anyValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetConstructedData anyValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.anyValue = anyValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetConstructedData getAnyValue() {
@@ -114,28 +109,21 @@ public static BACnetLogRecordLogDatumBuilder staticParseBACnetLogRecordLogDatumB
 
     readBuffer.closeContext("BACnetLogRecordLogDatumAnyValue");
     // Create the instance
-    return new BACnetLogRecordLogDatumAnyValueBuilderImpl(anyValue, tagNumber);
+    return new BACnetLogRecordLogDatumAnyValueBuilderImpl(anyValue);
   }
 
   public static class BACnetLogRecordLogDatumAnyValueBuilderImpl
       implements BACnetLogRecordLogDatum.BACnetLogRecordLogDatumBuilder {
     private final BACnetConstructedData anyValue;
-    private final Short tagNumber;
 
-    public BACnetLogRecordLogDatumAnyValueBuilderImpl(
-        BACnetConstructedData anyValue, Short tagNumber) {
+    public BACnetLogRecordLogDatumAnyValueBuilderImpl(BACnetConstructedData anyValue) {
       this.anyValue = anyValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetLogRecordLogDatumAnyValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetLogRecordLogDatumAnyValue bACnetLogRecordLogDatumAnyValue =
-          new BACnetLogRecordLogDatumAnyValue(
-              openingTag, peekedTagHeader, closingTag, anyValue, tagNumber);
+          new BACnetLogRecordLogDatumAnyValue(openingTag, peekedTagHeader, closingTag, anyValue);
       return bACnetLogRecordLogDatumAnyValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumBitStringValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumBitStringValue.java
index 0f602af3709..0ae672e6789 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumBitStringValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumBitStringValue.java
@@ -43,18 +43,13 @@ public class BACnetLogRecordLogDatumBitStringValue extends BACnetLogRecordLogDat
   // Properties.
   protected final BACnetContextTagBitString bitStringValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogRecordLogDatumBitStringValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagBitString bitStringValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagBitString bitStringValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.bitStringValue = bitStringValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagBitString getBitStringValue() {
@@ -109,28 +104,23 @@ public static BACnetLogRecordLogDatumBuilder staticParseBACnetLogRecordLogDatumB
 
     readBuffer.closeContext("BACnetLogRecordLogDatumBitStringValue");
     // Create the instance
-    return new BACnetLogRecordLogDatumBitStringValueBuilderImpl(bitStringValue, tagNumber);
+    return new BACnetLogRecordLogDatumBitStringValueBuilderImpl(bitStringValue);
   }
 
   public static class BACnetLogRecordLogDatumBitStringValueBuilderImpl
       implements BACnetLogRecordLogDatum.BACnetLogRecordLogDatumBuilder {
     private final BACnetContextTagBitString bitStringValue;
-    private final Short tagNumber;
 
     public BACnetLogRecordLogDatumBitStringValueBuilderImpl(
-        BACnetContextTagBitString bitStringValue, Short tagNumber) {
+        BACnetContextTagBitString bitStringValue) {
       this.bitStringValue = bitStringValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetLogRecordLogDatumBitStringValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetLogRecordLogDatumBitStringValue bACnetLogRecordLogDatumBitStringValue =
           new BACnetLogRecordLogDatumBitStringValue(
-              openingTag, peekedTagHeader, closingTag, bitStringValue, tagNumber);
+              openingTag, peekedTagHeader, closingTag, bitStringValue);
       return bACnetLogRecordLogDatumBitStringValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumBooleanValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumBooleanValue.java
index a86d763c491..69e0b8280af 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumBooleanValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumBooleanValue.java
@@ -43,18 +43,13 @@ public class BACnetLogRecordLogDatumBooleanValue extends BACnetLogRecordLogDatum
   // Properties.
   protected final BACnetContextTagBoolean booleanValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogRecordLogDatumBooleanValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagBoolean booleanValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagBoolean booleanValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.booleanValue = booleanValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagBoolean getBooleanValue() {
@@ -109,28 +104,22 @@ public static BACnetLogRecordLogDatumBuilder staticParseBACnetLogRecordLogDatumB
 
     readBuffer.closeContext("BACnetLogRecordLogDatumBooleanValue");
     // Create the instance
-    return new BACnetLogRecordLogDatumBooleanValueBuilderImpl(booleanValue, tagNumber);
+    return new BACnetLogRecordLogDatumBooleanValueBuilderImpl(booleanValue);
   }
 
   public static class BACnetLogRecordLogDatumBooleanValueBuilderImpl
       implements BACnetLogRecordLogDatum.BACnetLogRecordLogDatumBuilder {
     private final BACnetContextTagBoolean booleanValue;
-    private final Short tagNumber;
 
-    public BACnetLogRecordLogDatumBooleanValueBuilderImpl(
-        BACnetContextTagBoolean booleanValue, Short tagNumber) {
+    public BACnetLogRecordLogDatumBooleanValueBuilderImpl(BACnetContextTagBoolean booleanValue) {
       this.booleanValue = booleanValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetLogRecordLogDatumBooleanValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetLogRecordLogDatumBooleanValue bACnetLogRecordLogDatumBooleanValue =
           new BACnetLogRecordLogDatumBooleanValue(
-              openingTag, peekedTagHeader, closingTag, booleanValue, tagNumber);
+              openingTag, peekedTagHeader, closingTag, booleanValue);
       return bACnetLogRecordLogDatumBooleanValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumEnumeratedValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumEnumeratedValue.java
index af7274626a6..6b5f8eed3a7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumEnumeratedValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumEnumeratedValue.java
@@ -43,18 +43,13 @@ public class BACnetLogRecordLogDatumEnumeratedValue extends BACnetLogRecordLogDa
   // Properties.
   protected final BACnetContextTagEnumerated enumeratedValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogRecordLogDatumEnumeratedValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagEnumerated enumeratedValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagEnumerated enumeratedValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.enumeratedValue = enumeratedValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagEnumerated getEnumeratedValue() {
@@ -109,28 +104,23 @@ public static BACnetLogRecordLogDatumBuilder staticParseBACnetLogRecordLogDatumB
 
     readBuffer.closeContext("BACnetLogRecordLogDatumEnumeratedValue");
     // Create the instance
-    return new BACnetLogRecordLogDatumEnumeratedValueBuilderImpl(enumeratedValue, tagNumber);
+    return new BACnetLogRecordLogDatumEnumeratedValueBuilderImpl(enumeratedValue);
   }
 
   public static class BACnetLogRecordLogDatumEnumeratedValueBuilderImpl
       implements BACnetLogRecordLogDatum.BACnetLogRecordLogDatumBuilder {
     private final BACnetContextTagEnumerated enumeratedValue;
-    private final Short tagNumber;
 
     public BACnetLogRecordLogDatumEnumeratedValueBuilderImpl(
-        BACnetContextTagEnumerated enumeratedValue, Short tagNumber) {
+        BACnetContextTagEnumerated enumeratedValue) {
       this.enumeratedValue = enumeratedValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetLogRecordLogDatumEnumeratedValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetLogRecordLogDatumEnumeratedValue bACnetLogRecordLogDatumEnumeratedValue =
           new BACnetLogRecordLogDatumEnumeratedValue(
-              openingTag, peekedTagHeader, closingTag, enumeratedValue, tagNumber);
+              openingTag, peekedTagHeader, closingTag, enumeratedValue);
       return bACnetLogRecordLogDatumEnumeratedValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumFailure.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumFailure.java
index 1e06cf1b5c1..e23f46b0327 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumFailure.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumFailure.java
@@ -42,18 +42,13 @@ public class BACnetLogRecordLogDatumFailure extends BACnetLogRecordLogDatum impl
   // Properties.
   protected final ErrorEnclosed failure;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogRecordLogDatumFailure(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      ErrorEnclosed failure,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      ErrorEnclosed failure) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.failure = failure;
-    this.tagNumber = tagNumber;
   }
 
   public ErrorEnclosed getFailure() {
@@ -103,27 +98,21 @@ public static BACnetLogRecordLogDatumBuilder staticParseBACnetLogRecordLogDatumB
 
     readBuffer.closeContext("BACnetLogRecordLogDatumFailure");
     // Create the instance
-    return new BACnetLogRecordLogDatumFailureBuilderImpl(failure, tagNumber);
+    return new BACnetLogRecordLogDatumFailureBuilderImpl(failure);
   }
 
   public static class BACnetLogRecordLogDatumFailureBuilderImpl
       implements BACnetLogRecordLogDatum.BACnetLogRecordLogDatumBuilder {
     private final ErrorEnclosed failure;
-    private final Short tagNumber;
 
-    public BACnetLogRecordLogDatumFailureBuilderImpl(ErrorEnclosed failure, Short tagNumber) {
+    public BACnetLogRecordLogDatumFailureBuilderImpl(ErrorEnclosed failure) {
       this.failure = failure;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetLogRecordLogDatumFailure build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetLogRecordLogDatumFailure bACnetLogRecordLogDatumFailure =
-          new BACnetLogRecordLogDatumFailure(
-              openingTag, peekedTagHeader, closingTag, failure, tagNumber);
+          new BACnetLogRecordLogDatumFailure(openingTag, peekedTagHeader, closingTag, failure);
       return bACnetLogRecordLogDatumFailure;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumIntegerValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumIntegerValue.java
index b0fdbcb5a0c..c06d1402781 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumIntegerValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumIntegerValue.java
@@ -43,18 +43,13 @@ public class BACnetLogRecordLogDatumIntegerValue extends BACnetLogRecordLogDatum
   // Properties.
   protected final BACnetContextTagSignedInteger integerValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogRecordLogDatumIntegerValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagSignedInteger integerValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagSignedInteger integerValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.integerValue = integerValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagSignedInteger getIntegerValue() {
@@ -111,28 +106,23 @@ public static BACnetLogRecordLogDatumBuilder staticParseBACnetLogRecordLogDatumB
 
     readBuffer.closeContext("BACnetLogRecordLogDatumIntegerValue");
     // Create the instance
-    return new BACnetLogRecordLogDatumIntegerValueBuilderImpl(integerValue, tagNumber);
+    return new BACnetLogRecordLogDatumIntegerValueBuilderImpl(integerValue);
   }
 
   public static class BACnetLogRecordLogDatumIntegerValueBuilderImpl
       implements BACnetLogRecordLogDatum.BACnetLogRecordLogDatumBuilder {
     private final BACnetContextTagSignedInteger integerValue;
-    private final Short tagNumber;
 
     public BACnetLogRecordLogDatumIntegerValueBuilderImpl(
-        BACnetContextTagSignedInteger integerValue, Short tagNumber) {
+        BACnetContextTagSignedInteger integerValue) {
       this.integerValue = integerValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetLogRecordLogDatumIntegerValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetLogRecordLogDatumIntegerValue bACnetLogRecordLogDatumIntegerValue =
           new BACnetLogRecordLogDatumIntegerValue(
-              openingTag, peekedTagHeader, closingTag, integerValue, tagNumber);
+              openingTag, peekedTagHeader, closingTag, integerValue);
       return bACnetLogRecordLogDatumIntegerValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumLogStatus.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumLogStatus.java
index c7a15fd0023..b23b66dd717 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumLogStatus.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumLogStatus.java
@@ -42,18 +42,13 @@ public class BACnetLogRecordLogDatumLogStatus extends BACnetLogRecordLogDatum im
   // Properties.
   protected final BACnetLogStatusTagged logStatus;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogRecordLogDatumLogStatus(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetLogStatusTagged logStatus,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetLogStatusTagged logStatus) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.logStatus = logStatus;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetLogStatusTagged getLogStatus() {
@@ -107,28 +102,21 @@ public static BACnetLogRecordLogDatumBuilder staticParseBACnetLogRecordLogDatumB
 
     readBuffer.closeContext("BACnetLogRecordLogDatumLogStatus");
     // Create the instance
-    return new BACnetLogRecordLogDatumLogStatusBuilderImpl(logStatus, tagNumber);
+    return new BACnetLogRecordLogDatumLogStatusBuilderImpl(logStatus);
   }
 
   public static class BACnetLogRecordLogDatumLogStatusBuilderImpl
       implements BACnetLogRecordLogDatum.BACnetLogRecordLogDatumBuilder {
     private final BACnetLogStatusTagged logStatus;
-    private final Short tagNumber;
 
-    public BACnetLogRecordLogDatumLogStatusBuilderImpl(
-        BACnetLogStatusTagged logStatus, Short tagNumber) {
+    public BACnetLogRecordLogDatumLogStatusBuilderImpl(BACnetLogStatusTagged logStatus) {
       this.logStatus = logStatus;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetLogRecordLogDatumLogStatus build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetLogRecordLogDatumLogStatus bACnetLogRecordLogDatumLogStatus =
-          new BACnetLogRecordLogDatumLogStatus(
-              openingTag, peekedTagHeader, closingTag, logStatus, tagNumber);
+          new BACnetLogRecordLogDatumLogStatus(openingTag, peekedTagHeader, closingTag, logStatus);
       return bACnetLogRecordLogDatumLogStatus;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumNullValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumNullValue.java
index ea5940b7890..a42168164ec 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumNullValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumNullValue.java
@@ -42,18 +42,13 @@ public class BACnetLogRecordLogDatumNullValue extends BACnetLogRecordLogDatum im
   // Properties.
   protected final BACnetContextTagNull nullValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogRecordLogDatumNullValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagNull nullValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagNull nullValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.nullValue = nullValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagNull getNullValue() {
@@ -108,28 +103,21 @@ public static BACnetLogRecordLogDatumBuilder staticParseBACnetLogRecordLogDatumB
 
     readBuffer.closeContext("BACnetLogRecordLogDatumNullValue");
     // Create the instance
-    return new BACnetLogRecordLogDatumNullValueBuilderImpl(nullValue, tagNumber);
+    return new BACnetLogRecordLogDatumNullValueBuilderImpl(nullValue);
   }
 
   public static class BACnetLogRecordLogDatumNullValueBuilderImpl
       implements BACnetLogRecordLogDatum.BACnetLogRecordLogDatumBuilder {
     private final BACnetContextTagNull nullValue;
-    private final Short tagNumber;
 
-    public BACnetLogRecordLogDatumNullValueBuilderImpl(
-        BACnetContextTagNull nullValue, Short tagNumber) {
+    public BACnetLogRecordLogDatumNullValueBuilderImpl(BACnetContextTagNull nullValue) {
       this.nullValue = nullValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetLogRecordLogDatumNullValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetLogRecordLogDatumNullValue bACnetLogRecordLogDatumNullValue =
-          new BACnetLogRecordLogDatumNullValue(
-              openingTag, peekedTagHeader, closingTag, nullValue, tagNumber);
+          new BACnetLogRecordLogDatumNullValue(openingTag, peekedTagHeader, closingTag, nullValue);
       return bACnetLogRecordLogDatumNullValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumRealValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumRealValue.java
index 85bc89ae06f..e6a4baa41bc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumRealValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumRealValue.java
@@ -42,18 +42,13 @@ public class BACnetLogRecordLogDatumRealValue extends BACnetLogRecordLogDatum im
   // Properties.
   protected final BACnetContextTagReal realValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogRecordLogDatumRealValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagReal realValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagReal realValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.realValue = realValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagReal getRealValue() {
@@ -108,28 +103,21 @@ public static BACnetLogRecordLogDatumBuilder staticParseBACnetLogRecordLogDatumB
 
     readBuffer.closeContext("BACnetLogRecordLogDatumRealValue");
     // Create the instance
-    return new BACnetLogRecordLogDatumRealValueBuilderImpl(realValue, tagNumber);
+    return new BACnetLogRecordLogDatumRealValueBuilderImpl(realValue);
   }
 
   public static class BACnetLogRecordLogDatumRealValueBuilderImpl
       implements BACnetLogRecordLogDatum.BACnetLogRecordLogDatumBuilder {
     private final BACnetContextTagReal realValue;
-    private final Short tagNumber;
 
-    public BACnetLogRecordLogDatumRealValueBuilderImpl(
-        BACnetContextTagReal realValue, Short tagNumber) {
+    public BACnetLogRecordLogDatumRealValueBuilderImpl(BACnetContextTagReal realValue) {
       this.realValue = realValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetLogRecordLogDatumRealValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetLogRecordLogDatumRealValue bACnetLogRecordLogDatumRealValue =
-          new BACnetLogRecordLogDatumRealValue(
-              openingTag, peekedTagHeader, closingTag, realValue, tagNumber);
+          new BACnetLogRecordLogDatumRealValue(openingTag, peekedTagHeader, closingTag, realValue);
       return bACnetLogRecordLogDatumRealValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumTimeChange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumTimeChange.java
index c05ae5798a8..add90260677 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumTimeChange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumTimeChange.java
@@ -42,18 +42,13 @@ public class BACnetLogRecordLogDatumTimeChange extends BACnetLogRecordLogDatum i
   // Properties.
   protected final BACnetContextTagReal timeChange;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogRecordLogDatumTimeChange(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagReal timeChange,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagReal timeChange) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.timeChange = timeChange;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagReal getTimeChange() {
@@ -108,28 +103,22 @@ public static BACnetLogRecordLogDatumBuilder staticParseBACnetLogRecordLogDatumB
 
     readBuffer.closeContext("BACnetLogRecordLogDatumTimeChange");
     // Create the instance
-    return new BACnetLogRecordLogDatumTimeChangeBuilderImpl(timeChange, tagNumber);
+    return new BACnetLogRecordLogDatumTimeChangeBuilderImpl(timeChange);
   }
 
   public static class BACnetLogRecordLogDatumTimeChangeBuilderImpl
       implements BACnetLogRecordLogDatum.BACnetLogRecordLogDatumBuilder {
     private final BACnetContextTagReal timeChange;
-    private final Short tagNumber;
 
-    public BACnetLogRecordLogDatumTimeChangeBuilderImpl(
-        BACnetContextTagReal timeChange, Short tagNumber) {
+    public BACnetLogRecordLogDatumTimeChangeBuilderImpl(BACnetContextTagReal timeChange) {
       this.timeChange = timeChange;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetLogRecordLogDatumTimeChange build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetLogRecordLogDatumTimeChange bACnetLogRecordLogDatumTimeChange =
           new BACnetLogRecordLogDatumTimeChange(
-              openingTag, peekedTagHeader, closingTag, timeChange, tagNumber);
+              openingTag, peekedTagHeader, closingTag, timeChange);
       return bACnetLogRecordLogDatumTimeChange;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumUnsignedValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumUnsignedValue.java
index 98d59053a69..0d3bb348ebe 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumUnsignedValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogRecordLogDatumUnsignedValue.java
@@ -43,18 +43,13 @@ public class BACnetLogRecordLogDatumUnsignedValue extends BACnetLogRecordLogDatu
   // Properties.
   protected final BACnetContextTagUnsignedInteger unsignedValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetLogRecordLogDatumUnsignedValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagUnsignedInteger unsignedValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagUnsignedInteger unsignedValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.unsignedValue = unsignedValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagUnsignedInteger getUnsignedValue() {
@@ -111,28 +106,23 @@ public static BACnetLogRecordLogDatumBuilder staticParseBACnetLogRecordLogDatumB
 
     readBuffer.closeContext("BACnetLogRecordLogDatumUnsignedValue");
     // Create the instance
-    return new BACnetLogRecordLogDatumUnsignedValueBuilderImpl(unsignedValue, tagNumber);
+    return new BACnetLogRecordLogDatumUnsignedValueBuilderImpl(unsignedValue);
   }
 
   public static class BACnetLogRecordLogDatumUnsignedValueBuilderImpl
       implements BACnetLogRecordLogDatum.BACnetLogRecordLogDatumBuilder {
     private final BACnetContextTagUnsignedInteger unsignedValue;
-    private final Short tagNumber;
 
     public BACnetLogRecordLogDatumUnsignedValueBuilderImpl(
-        BACnetContextTagUnsignedInteger unsignedValue, Short tagNumber) {
+        BACnetContextTagUnsignedInteger unsignedValue) {
       this.unsignedValue = unsignedValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetLogRecordLogDatumUnsignedValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetLogRecordLogDatumUnsignedValue bACnetLogRecordLogDatumUnsignedValue =
           new BACnetLogRecordLogDatumUnsignedValue(
-              openingTag, peekedTagHeader, closingTag, unsignedValue, tagNumber);
+              openingTag, peekedTagHeader, closingTag, unsignedValue);
       return bACnetLogRecordLogDatumUnsignedValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogStatusTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogStatusTagged.java
index 6f5e36e5209..02e00522391 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogStatusTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLogStatusTagged.java
@@ -41,20 +41,10 @@ public class BACnetLogStatusTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetTagPayloadBitString payload;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetLogStatusTagged(
-      BACnetTagHeader header,
-      BACnetTagPayloadBitString payload,
-      Short tagNumber,
-      TagClass tagClass) {
+  public BACnetLogStatusTagged(BACnetTagHeader header, BACnetTagPayloadBitString payload) {
     super();
     this.header = header;
     this.payload = payload;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -178,7 +168,7 @@ public static BACnetLogStatusTagged staticParse(
     readBuffer.closeContext("BACnetLogStatusTagged");
     // Create the instance
     BACnetLogStatusTagged _bACnetLogStatusTagged;
-    _bACnetLogStatusTagged = new BACnetLogStatusTagged(header, payload, tagNumber, tagClass);
+    _bACnetLogStatusTagged = new BACnetLogStatusTagged(header, payload);
     return _bACnetLogStatusTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLoggingTypeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLoggingTypeTagged.java
index a896362cc5c..93384196626 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLoggingTypeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetLoggingTypeTagged.java
@@ -42,22 +42,12 @@ public class BACnetLoggingTypeTagged implements Message {
   protected final BACnetLoggingType value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetLoggingTypeTagged(
-      BACnetTagHeader header,
-      BACnetLoggingType value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetLoggingType value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetLoggingTypeTagged staticParse(
     readBuffer.closeContext("BACnetLoggingTypeTagged");
     // Create the instance
     BACnetLoggingTypeTagged _bACnetLoggingTypeTagged;
-    _bACnetLoggingTypeTagged =
-        new BACnetLoggingTypeTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetLoggingTypeTagged = new BACnetLoggingTypeTagged(header, value, proprietaryValue);
     return _bACnetLoggingTypeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetMaintenanceTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetMaintenanceTagged.java
index eed9e3f1c10..58c5d648d7e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetMaintenanceTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetMaintenanceTagged.java
@@ -42,22 +42,12 @@ public class BACnetMaintenanceTagged implements Message {
   protected final BACnetMaintenance value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetMaintenanceTagged(
-      BACnetTagHeader header,
-      BACnetMaintenance value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetMaintenance value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetMaintenanceTagged staticParse(
     readBuffer.closeContext("BACnetMaintenanceTagged");
     // Create the instance
     BACnetMaintenanceTagged _bACnetMaintenanceTagged;
-    _bACnetMaintenanceTagged =
-        new BACnetMaintenanceTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetMaintenanceTagged = new BACnetMaintenanceTagged(header, value, proprietaryValue);
     return _bACnetMaintenanceTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNameValueCollection.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNameValueCollection.java
index 538c5de88ef..754b4e18430 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNameValueCollection.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNameValueCollection.java
@@ -42,19 +42,12 @@ public class BACnetNameValueCollection implements Message {
   protected final List<BACnetNameValue> members;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNameValueCollection(
-      BACnetOpeningTag openingTag,
-      List<BACnetNameValue> members,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, List<BACnetNameValue> members, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.members = members;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -143,8 +136,7 @@ public static BACnetNameValueCollection staticParse(ReadBuffer readBuffer, Short
     readBuffer.closeContext("BACnetNameValueCollection");
     // Create the instance
     BACnetNameValueCollection _bACnetNameValueCollection;
-    _bACnetNameValueCollection =
-        new BACnetNameValueCollection(openingTag, members, closingTag, tagNumber);
+    _bACnetNameValueCollection = new BACnetNameValueCollection(openingTag, members, closingTag);
     return _bACnetNameValueCollection;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNetworkNumberQualityTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNetworkNumberQualityTagged.java
index cd3595ee7c8..deb322024de 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNetworkNumberQualityTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNetworkNumberQualityTagged.java
@@ -41,20 +41,11 @@ public class BACnetNetworkNumberQualityTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetNetworkNumberQuality value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetNetworkNumberQualityTagged(
-      BACnetTagHeader header,
-      BACnetNetworkNumberQuality value,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetNetworkNumberQuality value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -138,8 +129,7 @@ public static BACnetNetworkNumberQualityTagged staticParse(
     readBuffer.closeContext("BACnetNetworkNumberQualityTagged");
     // Create the instance
     BACnetNetworkNumberQualityTagged _bACnetNetworkNumberQualityTagged;
-    _bACnetNetworkNumberQualityTagged =
-        new BACnetNetworkNumberQualityTagged(header, value, tagNumber, tagClass);
+    _bACnetNetworkNumberQualityTagged = new BACnetNetworkNumberQualityTagged(header, value);
     return _bACnetNetworkNumberQualityTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNetworkPortCommandTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNetworkPortCommandTagged.java
index aab440b2164..12c4d3fa429 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNetworkPortCommandTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNetworkPortCommandTagged.java
@@ -42,22 +42,12 @@ public class BACnetNetworkPortCommandTagged implements Message {
   protected final BACnetNetworkPortCommand value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetNetworkPortCommandTagged(
-      BACnetTagHeader header,
-      BACnetNetworkPortCommand value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetNetworkPortCommand value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -181,7 +171,7 @@ public static BACnetNetworkPortCommandTagged staticParse(
     // Create the instance
     BACnetNetworkPortCommandTagged _bACnetNetworkPortCommandTagged;
     _bACnetNetworkPortCommandTagged =
-        new BACnetNetworkPortCommandTagged(header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetNetworkPortCommandTagged(header, value, proprietaryValue);
     return _bACnetNetworkPortCommandTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNetworkTypeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNetworkTypeTagged.java
index c8243613c28..af99b5c1519 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNetworkTypeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNetworkTypeTagged.java
@@ -42,22 +42,12 @@ public class BACnetNetworkTypeTagged implements Message {
   protected final BACnetNetworkType value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetNetworkTypeTagged(
-      BACnetTagHeader header,
-      BACnetNetworkType value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetNetworkType value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetNetworkTypeTagged staticParse(
     readBuffer.closeContext("BACnetNetworkTypeTagged");
     // Create the instance
     BACnetNetworkTypeTagged _bACnetNetworkTypeTagged;
-    _bACnetNetworkTypeTagged =
-        new BACnetNetworkTypeTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetNetworkTypeTagged = new BACnetNetworkTypeTagged(header, value, proprietaryValue);
     return _bACnetNetworkTypeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNodeTypeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNodeTypeTagged.java
index 965e0659397..b17857b6dbc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNodeTypeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNodeTypeTagged.java
@@ -41,17 +41,10 @@ public class BACnetNodeTypeTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetNodeType value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetNodeTypeTagged(
-      BACnetTagHeader header, BACnetNodeType value, Short tagNumber, TagClass tagClass) {
+  public BACnetNodeTypeTagged(BACnetTagHeader header, BACnetNodeType value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetNodeTypeTagged staticParse(
     readBuffer.closeContext("BACnetNodeTypeTagged");
     // Create the instance
     BACnetNodeTypeTagged _bACnetNodeTypeTagged;
-    _bACnetNodeTypeTagged = new BACnetNodeTypeTagged(header, value, tagNumber, tagClass);
+    _bACnetNodeTypeTagged = new BACnetNodeTypeTagged(header, value);
     return _bACnetNodeTypeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParameters.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParameters.java
index ab1f7446027..0e03a56c8a0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParameters.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParameters.java
@@ -44,22 +44,12 @@ public abstract class BACnetNotificationParameters implements Message {
   protected final BACnetTagHeader peekedTagHeader;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParameters(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.peekedTagHeader = peekedTagHeader;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -257,17 +247,13 @@ public static BACnetNotificationParameters staticParse(
     readBuffer.closeContext("BACnetNotificationParameters");
     // Create the instance
     BACnetNotificationParameters _bACnetNotificationParameters =
-        builder.build(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+        builder.build(openingTag, peekedTagHeader, closingTag);
     return _bACnetNotificationParameters;
   }
 
   public interface BACnetNotificationParametersBuilder {
     BACnetNotificationParameters build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument);
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag);
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersAccessEvent.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersAccessEvent.java
index 9df19eefc6f..14db3846ca1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersAccessEvent.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersAccessEvent.java
@@ -50,10 +50,6 @@ public class BACnetNotificationParametersAccessEvent extends BACnetNotificationP
   protected final BACnetAuthenticationFactorTypeTagged authenticationFactor;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersAccessEvent(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -65,10 +61,8 @@ public BACnetNotificationParametersAccessEvent(
       BACnetTimeStampEnclosed accessEventTime,
       BACnetDeviceObjectReferenceEnclosed accessCredential,
       BACnetAuthenticationFactorTypeTagged authenticationFactor,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.accessEvent = accessEvent;
     this.statusFlags = statusFlags;
@@ -77,8 +71,6 @@ public BACnetNotificationParametersAccessEvent(
     this.accessCredential = accessCredential;
     this.authenticationFactor = authenticationFactor;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -273,9 +265,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
         accessEventTime,
         accessCredential,
         authenticationFactor,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerClosingTag);
   }
 
   public static class BACnetNotificationParametersAccessEventBuilderImpl
@@ -288,8 +278,6 @@ public static class BACnetNotificationParametersAccessEventBuilderImpl
     private final BACnetDeviceObjectReferenceEnclosed accessCredential;
     private final BACnetAuthenticationFactorTypeTagged authenticationFactor;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersAccessEventBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
@@ -299,9 +287,7 @@ public BACnetNotificationParametersAccessEventBuilderImpl(
         BACnetTimeStampEnclosed accessEventTime,
         BACnetDeviceObjectReferenceEnclosed accessCredential,
         BACnetAuthenticationFactorTypeTagged authenticationFactor,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.accessEvent = accessEvent;
       this.statusFlags = statusFlags;
@@ -310,16 +296,10 @@ public BACnetNotificationParametersAccessEventBuilderImpl(
       this.accessCredential = accessCredential;
       this.authenticationFactor = authenticationFactor;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersAccessEvent build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersAccessEvent bACnetNotificationParametersAccessEvent =
           new BACnetNotificationParametersAccessEvent(
               openingTag,
@@ -332,9 +312,7 @@ public BACnetNotificationParametersAccessEvent build(
               accessEventTime,
               accessCredential,
               authenticationFactor,
-              innerClosingTag,
-              tagNumber,
-              objectTypeArgument);
+              innerClosingTag);
       return bACnetNotificationParametersAccessEvent;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersBufferReady.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersBufferReady.java
index b8639b644de..e2215ba7603 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersBufferReady.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersBufferReady.java
@@ -47,10 +47,6 @@ public class BACnetNotificationParametersBufferReady extends BACnetNotificationP
   protected final BACnetContextTagUnsignedInteger currentNotification;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersBufferReady(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -59,17 +55,13 @@ public BACnetNotificationParametersBufferReady(
       BACnetDeviceObjectPropertyReferenceEnclosed bufferProperty,
       BACnetContextTagUnsignedInteger previousNotification,
       BACnetContextTagUnsignedInteger currentNotification,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.bufferProperty = bufferProperty;
     this.previousNotification = previousNotification;
     this.currentNotification = currentNotification;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -210,9 +202,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
         bufferProperty,
         previousNotification,
         currentNotification,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerClosingTag);
   }
 
   public static class BACnetNotificationParametersBufferReadyBuilderImpl
@@ -222,32 +212,22 @@ public static class BACnetNotificationParametersBufferReadyBuilderImpl
     private final BACnetContextTagUnsignedInteger previousNotification;
     private final BACnetContextTagUnsignedInteger currentNotification;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersBufferReadyBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
         BACnetDeviceObjectPropertyReferenceEnclosed bufferProperty,
         BACnetContextTagUnsignedInteger previousNotification,
         BACnetContextTagUnsignedInteger currentNotification,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.bufferProperty = bufferProperty;
       this.previousNotification = previousNotification;
       this.currentNotification = currentNotification;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersBufferReady build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersBufferReady bACnetNotificationParametersBufferReady =
           new BACnetNotificationParametersBufferReady(
               openingTag,
@@ -257,9 +237,7 @@ public BACnetNotificationParametersBufferReady build(
               bufferProperty,
               previousNotification,
               currentNotification,
-              innerClosingTag,
-              tagNumber,
-              objectTypeArgument);
+              innerClosingTag);
       return bACnetNotificationParametersBufferReady;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfBitString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfBitString.java
index 1460da9155d..1edb703053b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfBitString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfBitString.java
@@ -46,10 +46,6 @@ public class BACnetNotificationParametersChangeOfBitString extends BACnetNotific
   protected final BACnetStatusFlagsTagged statusFlags;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersChangeOfBitString(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -57,16 +53,12 @@ public BACnetNotificationParametersChangeOfBitString(
       BACnetOpeningTag innerOpeningTag,
       BACnetContextTagBitString changeOfBitString,
       BACnetStatusFlagsTagged statusFlags,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.changeOfBitString = changeOfBitString;
     this.statusFlags = statusFlags;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -179,12 +171,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersChangeOfBitString");
     // Create the instance
     return new BACnetNotificationParametersChangeOfBitStringBuilderImpl(
-        innerOpeningTag,
-        changeOfBitString,
-        statusFlags,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerOpeningTag, changeOfBitString, statusFlags, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersChangeOfBitStringBuilderImpl
@@ -193,30 +180,20 @@ public static class BACnetNotificationParametersChangeOfBitStringBuilderImpl
     private final BACnetContextTagBitString changeOfBitString;
     private final BACnetStatusFlagsTagged statusFlags;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersChangeOfBitStringBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
         BACnetContextTagBitString changeOfBitString,
         BACnetStatusFlagsTagged statusFlags,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.changeOfBitString = changeOfBitString;
       this.statusFlags = statusFlags;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersChangeOfBitString build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfBitString bACnetNotificationParametersChangeOfBitString =
           new BACnetNotificationParametersChangeOfBitString(
               openingTag,
@@ -225,9 +202,7 @@ public BACnetNotificationParametersChangeOfBitString build(
               innerOpeningTag,
               changeOfBitString,
               statusFlags,
-              innerClosingTag,
-              tagNumber,
-              objectTypeArgument);
+              innerClosingTag);
       return bACnetNotificationParametersChangeOfBitString;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfCharacterString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfCharacterString.java
index be6d7c21341..ce10b9dc610 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfCharacterString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfCharacterString.java
@@ -47,10 +47,6 @@ public class BACnetNotificationParametersChangeOfCharacterString
   protected final BACnetContextTagCharacterString alarmValue;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersChangeOfCharacterString(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -59,17 +55,13 @@ public BACnetNotificationParametersChangeOfCharacterString(
       BACnetContextTagCharacterString changedValue,
       BACnetStatusFlagsTagged statusFlags,
       BACnetContextTagCharacterString alarmValue,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.changedValue = changedValue;
     this.statusFlags = statusFlags;
     this.alarmValue = alarmValue;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -206,13 +198,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersChangeOfCharacterString");
     // Create the instance
     return new BACnetNotificationParametersChangeOfCharacterStringBuilderImpl(
-        innerOpeningTag,
-        changedValue,
-        statusFlags,
-        alarmValue,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerOpeningTag, changedValue, statusFlags, alarmValue, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersChangeOfCharacterStringBuilderImpl
@@ -222,32 +208,22 @@ public static class BACnetNotificationParametersChangeOfCharacterStringBuilderIm
     private final BACnetStatusFlagsTagged statusFlags;
     private final BACnetContextTagCharacterString alarmValue;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersChangeOfCharacterStringBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
         BACnetContextTagCharacterString changedValue,
         BACnetStatusFlagsTagged statusFlags,
         BACnetContextTagCharacterString alarmValue,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.changedValue = changedValue;
       this.statusFlags = statusFlags;
       this.alarmValue = alarmValue;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersChangeOfCharacterString build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfCharacterString
           bACnetNotificationParametersChangeOfCharacterString =
               new BACnetNotificationParametersChangeOfCharacterString(
@@ -258,9 +234,7 @@ public BACnetNotificationParametersChangeOfCharacterString build(
                   changedValue,
                   statusFlags,
                   alarmValue,
-                  innerClosingTag,
-                  tagNumber,
-                  objectTypeArgument);
+                  innerClosingTag);
       return bACnetNotificationParametersChangeOfCharacterString;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValue.java
index 8f7d13493ae..bf6b7141a04 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValue.java
@@ -46,10 +46,6 @@ public class BACnetNotificationParametersChangeOfDiscreteValue extends BACnetNot
   protected final BACnetStatusFlagsTagged statusFlags;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersChangeOfDiscreteValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -57,16 +53,12 @@ public BACnetNotificationParametersChangeOfDiscreteValue(
       BACnetOpeningTag innerOpeningTag,
       BACnetNotificationParametersChangeOfDiscreteValueNewValue newValue,
       BACnetStatusFlagsTagged statusFlags,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.newValue = newValue;
     this.statusFlags = statusFlags;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -178,7 +170,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersChangeOfDiscreteValue");
     // Create the instance
     return new BACnetNotificationParametersChangeOfDiscreteValueBuilderImpl(
-        innerOpeningTag, newValue, statusFlags, innerClosingTag, tagNumber, objectTypeArgument);
+        innerOpeningTag, newValue, statusFlags, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersChangeOfDiscreteValueBuilderImpl
@@ -187,30 +179,20 @@ public static class BACnetNotificationParametersChangeOfDiscreteValueBuilderImpl
     private final BACnetNotificationParametersChangeOfDiscreteValueNewValue newValue;
     private final BACnetStatusFlagsTagged statusFlags;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersChangeOfDiscreteValueBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
         BACnetNotificationParametersChangeOfDiscreteValueNewValue newValue,
         BACnetStatusFlagsTagged statusFlags,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.newValue = newValue;
       this.statusFlags = statusFlags;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersChangeOfDiscreteValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfDiscreteValue
           bACnetNotificationParametersChangeOfDiscreteValue =
               new BACnetNotificationParametersChangeOfDiscreteValue(
@@ -220,9 +202,7 @@ public BACnetNotificationParametersChangeOfDiscreteValue build(
                   innerOpeningTag,
                   newValue,
                   statusFlags,
-                  innerClosingTag,
-                  tagNumber,
-                  objectTypeArgument);
+                  innerClosingTag);
       return bACnetNotificationParametersChangeOfDiscreteValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValue.java
index 8df53af3b80..d7dd07e9630 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValue.java
@@ -44,19 +44,12 @@ public abstract class BACnetNotificationParametersChangeOfDiscreteValueNewValue
   protected final BACnetTagHeader peekedTagHeader;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNotificationParametersChangeOfDiscreteValueNewValue(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.peekedTagHeader = peekedTagHeader;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -248,16 +241,13 @@ public static BACnetNotificationParametersChangeOfDiscreteValueNewValue staticPa
     // Create the instance
     BACnetNotificationParametersChangeOfDiscreteValueNewValue
         _bACnetNotificationParametersChangeOfDiscreteValueNewValue =
-            builder.build(openingTag, peekedTagHeader, closingTag, tagNumber);
+            builder.build(openingTag, peekedTagHeader, closingTag);
     return _bACnetNotificationParametersChangeOfDiscreteValueNewValue;
   }
 
   public interface BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder {
     BACnetNotificationParametersChangeOfDiscreteValueNewValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber);
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag);
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean.java
index 9bbc174f289..9ede1ee247e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean.java
@@ -43,18 +43,13 @@ public class BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean
   // Properties.
   protected final BACnetApplicationTagBoolean booleanValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagBoolean booleanValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagBoolean booleanValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.booleanValue = booleanValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagBoolean getBooleanValue() {
@@ -108,30 +103,25 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean");
     // Create the instance
     return new BACnetNotificationParametersChangeOfDiscreteValueNewValueBooleanBuilderImpl(
-        booleanValue, tagNumber);
+        booleanValue);
   }
 
   public static class BACnetNotificationParametersChangeOfDiscreteValueNewValueBooleanBuilderImpl
       implements BACnetNotificationParametersChangeOfDiscreteValueNewValue
           .BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder {
     private final BACnetApplicationTagBoolean booleanValue;
-    private final Short tagNumber;
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueBooleanBuilderImpl(
-        BACnetApplicationTagBoolean booleanValue, Short tagNumber) {
+        BACnetApplicationTagBoolean booleanValue) {
       this.booleanValue = booleanValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean
           bACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean =
               new BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean(
-                  openingTag, peekedTagHeader, closingTag, booleanValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, booleanValue);
       return bACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString.java
index dcde4b78c97..22269ec1b58 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString.java
@@ -43,18 +43,13 @@ public class BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterS
   // Properties.
   protected final BACnetApplicationTagCharacterString characterStringValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagCharacterString characterStringValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagCharacterString characterStringValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.characterStringValue = characterStringValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagCharacterString getCharacterStringValue() {
@@ -114,7 +109,7 @@ public int getLengthInBits() {
         "BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString");
     // Create the instance
     return new BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterStringBuilderImpl(
-        characterStringValue, tagNumber);
+        characterStringValue);
   }
 
   public static
@@ -122,23 +117,18 @@ class BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterStringBu
       implements BACnetNotificationParametersChangeOfDiscreteValueNewValue
           .BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder {
     private final BACnetApplicationTagCharacterString characterStringValue;
-    private final Short tagNumber;
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterStringBuilderImpl(
-        BACnetApplicationTagCharacterString characterStringValue, Short tagNumber) {
+        BACnetApplicationTagCharacterString characterStringValue) {
       this.characterStringValue = characterStringValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString
           bACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString =
               new BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString(
-                  openingTag, peekedTagHeader, closingTag, characterStringValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, characterStringValue);
       return bACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime.java
index e45e037c1e2..258c0410f1e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime.java
@@ -43,18 +43,13 @@ public class BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime
   // Properties.
   protected final BACnetDateTimeEnclosed dateTimeValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetDateTimeEnclosed dateTimeValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetDateTimeEnclosed dateTimeValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.dateTimeValue = dateTimeValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetDateTimeEnclosed getDateTimeValue() {
@@ -107,30 +102,25 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime");
     // Create the instance
     return new BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetimeBuilderImpl(
-        dateTimeValue, tagNumber);
+        dateTimeValue);
   }
 
   public static class BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetimeBuilderImpl
       implements BACnetNotificationParametersChangeOfDiscreteValueNewValue
           .BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder {
     private final BACnetDateTimeEnclosed dateTimeValue;
-    private final Short tagNumber;
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetimeBuilderImpl(
-        BACnetDateTimeEnclosed dateTimeValue, Short tagNumber) {
+        BACnetDateTimeEnclosed dateTimeValue) {
       this.dateTimeValue = dateTimeValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime
           bACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime =
               new BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime(
-                  openingTag, peekedTagHeader, closingTag, dateTimeValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, dateTimeValue);
       return bACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated.java
index 05a2b224b43..67d654aba70 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated.java
@@ -43,18 +43,13 @@ public class BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated
   // Properties.
   protected final BACnetApplicationTagEnumerated enumeratedValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagEnumerated enumeratedValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagEnumerated enumeratedValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.enumeratedValue = enumeratedValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagEnumerated getEnumeratedValue() {
@@ -108,30 +103,25 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated");
     // Create the instance
     return new BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumeratedBuilderImpl(
-        enumeratedValue, tagNumber);
+        enumeratedValue);
   }
 
   public static class BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumeratedBuilderImpl
       implements BACnetNotificationParametersChangeOfDiscreteValueNewValue
           .BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder {
     private final BACnetApplicationTagEnumerated enumeratedValue;
-    private final Short tagNumber;
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumeratedBuilderImpl(
-        BACnetApplicationTagEnumerated enumeratedValue, Short tagNumber) {
+        BACnetApplicationTagEnumerated enumeratedValue) {
       this.enumeratedValue = enumeratedValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated
           bACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated =
               new BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated(
-                  openingTag, peekedTagHeader, closingTag, enumeratedValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, enumeratedValue);
       return bACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger.java
index 57875a23b9c..eba8fe6d82c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger.java
@@ -43,18 +43,13 @@ public class BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger
   // Properties.
   protected final BACnetApplicationTagSignedInteger integerValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagSignedInteger integerValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagSignedInteger integerValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.integerValue = integerValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagSignedInteger getIntegerValue() {
@@ -110,30 +105,25 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger");
     // Create the instance
     return new BACnetNotificationParametersChangeOfDiscreteValueNewValueIntegerBuilderImpl(
-        integerValue, tagNumber);
+        integerValue);
   }
 
   public static class BACnetNotificationParametersChangeOfDiscreteValueNewValueIntegerBuilderImpl
       implements BACnetNotificationParametersChangeOfDiscreteValueNewValue
           .BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder {
     private final BACnetApplicationTagSignedInteger integerValue;
-    private final Short tagNumber;
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueIntegerBuilderImpl(
-        BACnetApplicationTagSignedInteger integerValue, Short tagNumber) {
+        BACnetApplicationTagSignedInteger integerValue) {
       this.integerValue = integerValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger
           bACnetNotificationParametersChangeOfDiscreteValueNewValueInteger =
               new BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger(
-                  openingTag, peekedTagHeader, closingTag, integerValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, integerValue);
       return bACnetNotificationParametersChangeOfDiscreteValueNewValueInteger;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier.java
index 876db35a633..c8ee36c72cc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier.java
@@ -43,18 +43,13 @@ public class BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectiden
   // Properties.
   protected final BACnetApplicationTagObjectIdentifier objectidentifierValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagObjectIdentifier objectidentifierValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagObjectIdentifier objectidentifierValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.objectidentifierValue = objectidentifierValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagObjectIdentifier getObjectidentifierValue() {
@@ -114,7 +109,7 @@ public int getLengthInBits() {
         "BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier");
     // Create the instance
     return new BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifierBuilderImpl(
-        objectidentifierValue, tagNumber);
+        objectidentifierValue);
   }
 
   public static
@@ -122,23 +117,18 @@ class BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifierB
       implements BACnetNotificationParametersChangeOfDiscreteValueNewValue
           .BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder {
     private final BACnetApplicationTagObjectIdentifier objectidentifierValue;
-    private final Short tagNumber;
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifierBuilderImpl(
-        BACnetApplicationTagObjectIdentifier objectidentifierValue, Short tagNumber) {
+        BACnetApplicationTagObjectIdentifier objectidentifierValue) {
       this.objectidentifierValue = objectidentifierValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier
           bACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier =
               new BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier(
-                  openingTag, peekedTagHeader, closingTag, objectidentifierValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, objectidentifierValue);
       return bACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate.java
index 77ebcc93a41..b1640fea196 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate.java
@@ -43,18 +43,13 @@ public class BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate
   // Properties.
   protected final BACnetApplicationTagDate dateValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagDate dateValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagDate dateValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.dateValue = dateValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagDate getDateValue() {
@@ -108,30 +103,25 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate");
     // Create the instance
     return new BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDateBuilderImpl(
-        dateValue, tagNumber);
+        dateValue);
   }
 
   public static class BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDateBuilderImpl
       implements BACnetNotificationParametersChangeOfDiscreteValueNewValue
           .BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder {
     private final BACnetApplicationTagDate dateValue;
-    private final Short tagNumber;
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDateBuilderImpl(
-        BACnetApplicationTagDate dateValue, Short tagNumber) {
+        BACnetApplicationTagDate dateValue) {
       this.dateValue = dateValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate
           bACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate =
               new BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate(
-                  openingTag, peekedTagHeader, closingTag, dateValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, dateValue);
       return bACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString.java
index 14c56e83f59..af2567e589a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString.java
@@ -43,18 +43,13 @@ public class BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetStrin
   // Properties.
   protected final BACnetApplicationTagOctetString octetStringValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagOctetString octetStringValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagOctetString octetStringValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.octetStringValue = octetStringValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagOctetString getOctetStringValue() {
@@ -109,7 +104,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString");
     // Create the instance
     return new BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetStringBuilderImpl(
-        octetStringValue, tagNumber);
+        octetStringValue);
   }
 
   public static
@@ -117,23 +112,18 @@ class BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetStringBuilde
       implements BACnetNotificationParametersChangeOfDiscreteValueNewValue
           .BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder {
     private final BACnetApplicationTagOctetString octetStringValue;
-    private final Short tagNumber;
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetStringBuilderImpl(
-        BACnetApplicationTagOctetString octetStringValue, Short tagNumber) {
+        BACnetApplicationTagOctetString octetStringValue) {
       this.octetStringValue = octetStringValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString
           bACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString =
               new BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString(
-                  openingTag, peekedTagHeader, closingTag, octetStringValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, octetStringValue);
       return bACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime.java
index e88a8a711f6..e1ac3dc8500 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime.java
@@ -43,18 +43,13 @@ public class BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime
   // Properties.
   protected final BACnetApplicationTagTime timeValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagTime timeValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagTime timeValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.timeValue = timeValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagTime getTimeValue() {
@@ -108,30 +103,25 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime");
     // Create the instance
     return new BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTimeBuilderImpl(
-        timeValue, tagNumber);
+        timeValue);
   }
 
   public static class BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTimeBuilderImpl
       implements BACnetNotificationParametersChangeOfDiscreteValueNewValue
           .BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder {
     private final BACnetApplicationTagTime timeValue;
-    private final Short tagNumber;
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTimeBuilderImpl(
-        BACnetApplicationTagTime timeValue, Short tagNumber) {
+        BACnetApplicationTagTime timeValue) {
       this.timeValue = timeValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime
           bACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime =
               new BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime(
-                  openingTag, peekedTagHeader, closingTag, timeValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, timeValue);
       return bACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned.java
index c9134cb8462..760498c0b0b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned.java
@@ -43,18 +43,13 @@ public class BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger unsignedValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetApplicationTagUnsignedInteger unsignedValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetApplicationTagUnsignedInteger unsignedValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.unsignedValue = unsignedValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetApplicationTagUnsignedInteger getUnsignedValue() {
@@ -110,30 +105,25 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned");
     // Create the instance
     return new BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsignedBuilderImpl(
-        unsignedValue, tagNumber);
+        unsignedValue);
   }
 
   public static class BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsignedBuilderImpl
       implements BACnetNotificationParametersChangeOfDiscreteValueNewValue
           .BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder {
     private final BACnetApplicationTagUnsignedInteger unsignedValue;
-    private final Short tagNumber;
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsignedBuilderImpl(
-        BACnetApplicationTagUnsignedInteger unsignedValue, Short tagNumber) {
+        BACnetApplicationTagUnsignedInteger unsignedValue) {
       this.unsignedValue = unsignedValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned
           bACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned =
               new BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned(
-                  openingTag, peekedTagHeader, closingTag, unsignedValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, unsignedValue);
       return bACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfLifeSafety.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfLifeSafety.java
index 47a4f7e28f3..87aa289566e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfLifeSafety.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfLifeSafety.java
@@ -48,10 +48,6 @@ public class BACnetNotificationParametersChangeOfLifeSafety extends BACnetNotifi
   protected final BACnetLifeSafetyOperationTagged operationExpected;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersChangeOfLifeSafety(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -61,18 +57,14 @@ public BACnetNotificationParametersChangeOfLifeSafety(
       BACnetLifeSafetyModeTagged newMode,
       BACnetStatusFlagsTagged statusFlags,
       BACnetLifeSafetyOperationTagged operationExpected,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.newState = newState;
     this.newMode = newMode;
     this.statusFlags = statusFlags;
     this.operationExpected = operationExpected;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -222,14 +214,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersChangeOfLifeSafety");
     // Create the instance
     return new BACnetNotificationParametersChangeOfLifeSafetyBuilderImpl(
-        innerOpeningTag,
-        newState,
-        newMode,
-        statusFlags,
-        operationExpected,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerOpeningTag, newState, newMode, statusFlags, operationExpected, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersChangeOfLifeSafetyBuilderImpl
@@ -240,8 +225,6 @@ public static class BACnetNotificationParametersChangeOfLifeSafetyBuilderImpl
     private final BACnetStatusFlagsTagged statusFlags;
     private final BACnetLifeSafetyOperationTagged operationExpected;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersChangeOfLifeSafetyBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
@@ -249,25 +232,17 @@ public BACnetNotificationParametersChangeOfLifeSafetyBuilderImpl(
         BACnetLifeSafetyModeTagged newMode,
         BACnetStatusFlagsTagged statusFlags,
         BACnetLifeSafetyOperationTagged operationExpected,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.newState = newState;
       this.newMode = newMode;
       this.statusFlags = statusFlags;
       this.operationExpected = operationExpected;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersChangeOfLifeSafety build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfLifeSafety
           bACnetNotificationParametersChangeOfLifeSafety =
               new BACnetNotificationParametersChangeOfLifeSafety(
@@ -279,9 +254,7 @@ public BACnetNotificationParametersChangeOfLifeSafety build(
                   newMode,
                   statusFlags,
                   operationExpected,
-                  innerClosingTag,
-                  tagNumber,
-                  objectTypeArgument);
+                  innerClosingTag);
       return bACnetNotificationParametersChangeOfLifeSafety;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfReliability.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfReliability.java
index 038abea84aa..83b025eb10a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfReliability.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfReliability.java
@@ -47,10 +47,6 @@ public class BACnetNotificationParametersChangeOfReliability extends BACnetNotif
   protected final BACnetPropertyValues propertyValues;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersChangeOfReliability(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -59,17 +55,13 @@ public BACnetNotificationParametersChangeOfReliability(
       BACnetReliabilityTagged reliability,
       BACnetStatusFlagsTagged statusFlags,
       BACnetPropertyValues propertyValues,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.reliability = reliability;
     this.statusFlags = statusFlags;
     this.propertyValues = propertyValues;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -200,13 +192,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersChangeOfReliability");
     // Create the instance
     return new BACnetNotificationParametersChangeOfReliabilityBuilderImpl(
-        innerOpeningTag,
-        reliability,
-        statusFlags,
-        propertyValues,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerOpeningTag, reliability, statusFlags, propertyValues, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersChangeOfReliabilityBuilderImpl
@@ -216,32 +202,22 @@ public static class BACnetNotificationParametersChangeOfReliabilityBuilderImpl
     private final BACnetStatusFlagsTagged statusFlags;
     private final BACnetPropertyValues propertyValues;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersChangeOfReliabilityBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
         BACnetReliabilityTagged reliability,
         BACnetStatusFlagsTagged statusFlags,
         BACnetPropertyValues propertyValues,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.reliability = reliability;
       this.statusFlags = statusFlags;
       this.propertyValues = propertyValues;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersChangeOfReliability build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfReliability
           bACnetNotificationParametersChangeOfReliability =
               new BACnetNotificationParametersChangeOfReliability(
@@ -252,9 +228,7 @@ public BACnetNotificationParametersChangeOfReliability build(
                   reliability,
                   statusFlags,
                   propertyValues,
-                  innerClosingTag,
-                  tagNumber,
-                  objectTypeArgument);
+                  innerClosingTag);
       return bACnetNotificationParametersChangeOfReliability;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfState.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfState.java
index c25ba900bba..ee0e12a92df 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfState.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfState.java
@@ -46,10 +46,6 @@ public class BACnetNotificationParametersChangeOfState extends BACnetNotificatio
   protected final BACnetStatusFlagsTagged statusFlags;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersChangeOfState(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -57,16 +53,12 @@ public BACnetNotificationParametersChangeOfState(
       BACnetOpeningTag innerOpeningTag,
       BACnetPropertyStatesEnclosed changeOfState,
       BACnetStatusFlagsTagged statusFlags,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.changeOfState = changeOfState;
     this.statusFlags = statusFlags;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -176,12 +168,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersChangeOfState");
     // Create the instance
     return new BACnetNotificationParametersChangeOfStateBuilderImpl(
-        innerOpeningTag,
-        changeOfState,
-        statusFlags,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerOpeningTag, changeOfState, statusFlags, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersChangeOfStateBuilderImpl
@@ -190,30 +177,20 @@ public static class BACnetNotificationParametersChangeOfStateBuilderImpl
     private final BACnetPropertyStatesEnclosed changeOfState;
     private final BACnetStatusFlagsTagged statusFlags;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersChangeOfStateBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
         BACnetPropertyStatesEnclosed changeOfState,
         BACnetStatusFlagsTagged statusFlags,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.changeOfState = changeOfState;
       this.statusFlags = statusFlags;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersChangeOfState build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfState bACnetNotificationParametersChangeOfState =
           new BACnetNotificationParametersChangeOfState(
               openingTag,
@@ -222,9 +199,7 @@ public BACnetNotificationParametersChangeOfState build(
               innerOpeningTag,
               changeOfState,
               statusFlags,
-              innerClosingTag,
-              tagNumber,
-              objectTypeArgument);
+              innerClosingTag);
       return bACnetNotificationParametersChangeOfState;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfStatusFlags.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfStatusFlags.java
index 8a552d50b74..206f6344a56 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfStatusFlags.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfStatusFlags.java
@@ -46,10 +46,6 @@ public class BACnetNotificationParametersChangeOfStatusFlags extends BACnetNotif
   protected final BACnetStatusFlagsTagged referencedFlags;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersChangeOfStatusFlags(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -57,16 +53,12 @@ public BACnetNotificationParametersChangeOfStatusFlags(
       BACnetOpeningTag innerOpeningTag,
       BACnetConstructedData presentValue,
       BACnetStatusFlagsTagged referencedFlags,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.presentValue = presentValue;
     this.referencedFlags = referencedFlags;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -183,12 +175,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersChangeOfStatusFlags");
     // Create the instance
     return new BACnetNotificationParametersChangeOfStatusFlagsBuilderImpl(
-        innerOpeningTag,
-        presentValue,
-        referencedFlags,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerOpeningTag, presentValue, referencedFlags, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersChangeOfStatusFlagsBuilderImpl
@@ -197,30 +184,20 @@ public static class BACnetNotificationParametersChangeOfStatusFlagsBuilderImpl
     private final BACnetConstructedData presentValue;
     private final BACnetStatusFlagsTagged referencedFlags;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersChangeOfStatusFlagsBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
         BACnetConstructedData presentValue,
         BACnetStatusFlagsTagged referencedFlags,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.presentValue = presentValue;
       this.referencedFlags = referencedFlags;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersChangeOfStatusFlags build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfStatusFlags
           bACnetNotificationParametersChangeOfStatusFlags =
               new BACnetNotificationParametersChangeOfStatusFlags(
@@ -230,9 +207,7 @@ public BACnetNotificationParametersChangeOfStatusFlags build(
                   innerOpeningTag,
                   presentValue,
                   referencedFlags,
-                  innerClosingTag,
-                  tagNumber,
-                  objectTypeArgument);
+                  innerClosingTag);
       return bACnetNotificationParametersChangeOfStatusFlags;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfTimer.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfTimer.java
index bf170816cd9..787826f36aa 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfTimer.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfTimer.java
@@ -50,10 +50,6 @@ public class BACnetNotificationParametersChangeOfTimer extends BACnetNotificatio
   protected final BACnetDateTimeEnclosed expirationTime;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersChangeOfTimer(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -65,10 +61,8 @@ public BACnetNotificationParametersChangeOfTimer(
       BACnetTimerTransitionTagged lastStateChange,
       BACnetContextTagUnsignedInteger initialTimeout,
       BACnetDateTimeEnclosed expirationTime,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.newValue = newValue;
     this.statusFlags = statusFlags;
@@ -77,8 +71,6 @@ public BACnetNotificationParametersChangeOfTimer(
     this.initialTimeout = initialTimeout;
     this.expirationTime = expirationTime;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -276,9 +268,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
         lastStateChange,
         initialTimeout,
         expirationTime,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerClosingTag);
   }
 
   public static class BACnetNotificationParametersChangeOfTimerBuilderImpl
@@ -291,8 +281,6 @@ public static class BACnetNotificationParametersChangeOfTimerBuilderImpl
     private final BACnetContextTagUnsignedInteger initialTimeout;
     private final BACnetDateTimeEnclosed expirationTime;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersChangeOfTimerBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
@@ -302,9 +290,7 @@ public BACnetNotificationParametersChangeOfTimerBuilderImpl(
         BACnetTimerTransitionTagged lastStateChange,
         BACnetContextTagUnsignedInteger initialTimeout,
         BACnetDateTimeEnclosed expirationTime,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.newValue = newValue;
       this.statusFlags = statusFlags;
@@ -313,16 +299,10 @@ public BACnetNotificationParametersChangeOfTimerBuilderImpl(
       this.initialTimeout = initialTimeout;
       this.expirationTime = expirationTime;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersChangeOfTimer build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfTimer bACnetNotificationParametersChangeOfTimer =
           new BACnetNotificationParametersChangeOfTimer(
               openingTag,
@@ -335,9 +315,7 @@ public BACnetNotificationParametersChangeOfTimer build(
               lastStateChange,
               initialTimeout,
               expirationTime,
-              innerClosingTag,
-              tagNumber,
-              objectTypeArgument);
+              innerClosingTag);
       return bACnetNotificationParametersChangeOfTimer;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValue.java
index 59c64d1de27..18a3a467e07 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValue.java
@@ -46,10 +46,6 @@ public class BACnetNotificationParametersChangeOfValue extends BACnetNotificatio
   protected final BACnetStatusFlagsTagged statusFlags;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersChangeOfValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -57,16 +53,12 @@ public BACnetNotificationParametersChangeOfValue(
       BACnetOpeningTag innerOpeningTag,
       BACnetNotificationParametersChangeOfValueNewValue newValue,
       BACnetStatusFlagsTagged statusFlags,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.newValue = newValue;
     this.statusFlags = statusFlags;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -178,7 +170,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersChangeOfValue");
     // Create the instance
     return new BACnetNotificationParametersChangeOfValueBuilderImpl(
-        innerOpeningTag, newValue, statusFlags, innerClosingTag, tagNumber, objectTypeArgument);
+        innerOpeningTag, newValue, statusFlags, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersChangeOfValueBuilderImpl
@@ -187,30 +179,20 @@ public static class BACnetNotificationParametersChangeOfValueBuilderImpl
     private final BACnetNotificationParametersChangeOfValueNewValue newValue;
     private final BACnetStatusFlagsTagged statusFlags;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersChangeOfValueBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
         BACnetNotificationParametersChangeOfValueNewValue newValue,
         BACnetStatusFlagsTagged statusFlags,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.newValue = newValue;
       this.statusFlags = statusFlags;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersChangeOfValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfValue bACnetNotificationParametersChangeOfValue =
           new BACnetNotificationParametersChangeOfValue(
               openingTag,
@@ -219,9 +201,7 @@ public BACnetNotificationParametersChangeOfValue build(
               innerOpeningTag,
               newValue,
               statusFlags,
-              innerClosingTag,
-              tagNumber,
-              objectTypeArgument);
+              innerClosingTag);
       return bACnetNotificationParametersChangeOfValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValueNewValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValueNewValue.java
index 7cbcab9c1a7..c1a061fa6c5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValueNewValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValueNewValue.java
@@ -44,19 +44,12 @@ public abstract class BACnetNotificationParametersChangeOfValueNewValue implemen
   protected final BACnetTagHeader peekedTagHeader;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNotificationParametersChangeOfValueNewValue(
-      BACnetOpeningTag openingTag,
-      BACnetTagHeader peekedTagHeader,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.peekedTagHeader = peekedTagHeader;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -174,16 +167,13 @@ public static BACnetNotificationParametersChangeOfValueNewValue staticParse(
     // Create the instance
     BACnetNotificationParametersChangeOfValueNewValue
         _bACnetNotificationParametersChangeOfValueNewValue =
-            builder.build(openingTag, peekedTagHeader, closingTag, tagNumber);
+            builder.build(openingTag, peekedTagHeader, closingTag);
     return _bACnetNotificationParametersChangeOfValueNewValue;
   }
 
   public interface BACnetNotificationParametersChangeOfValueNewValueBuilder {
     BACnetNotificationParametersChangeOfValueNewValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber);
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag);
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValueNewValueChangedBits.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValueNewValueChangedBits.java
index 9cfe85704a7..2218c9a18e8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValueNewValueChangedBits.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValueNewValueChangedBits.java
@@ -43,18 +43,13 @@ public class BACnetNotificationParametersChangeOfValueNewValueChangedBits
   // Properties.
   protected final BACnetContextTagBitString changedBits;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNotificationParametersChangeOfValueNewValueChangedBits(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagBitString changedBits,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagBitString changedBits) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.changedBits = changedBits;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagBitString getChangedBits() {
@@ -110,31 +105,25 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetNotificationParametersChangeOfValueNewValueChangedBits");
     // Create the instance
-    return new BACnetNotificationParametersChangeOfValueNewValueChangedBitsBuilderImpl(
-        changedBits, tagNumber);
+    return new BACnetNotificationParametersChangeOfValueNewValueChangedBitsBuilderImpl(changedBits);
   }
 
   public static class BACnetNotificationParametersChangeOfValueNewValueChangedBitsBuilderImpl
       implements BACnetNotificationParametersChangeOfValueNewValue
           .BACnetNotificationParametersChangeOfValueNewValueBuilder {
     private final BACnetContextTagBitString changedBits;
-    private final Short tagNumber;
 
     public BACnetNotificationParametersChangeOfValueNewValueChangedBitsBuilderImpl(
-        BACnetContextTagBitString changedBits, Short tagNumber) {
+        BACnetContextTagBitString changedBits) {
       this.changedBits = changedBits;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetNotificationParametersChangeOfValueNewValueChangedBits build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfValueNewValueChangedBits
           bACnetNotificationParametersChangeOfValueNewValueChangedBits =
               new BACnetNotificationParametersChangeOfValueNewValueChangedBits(
-                  openingTag, peekedTagHeader, closingTag, changedBits, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, changedBits);
       return bACnetNotificationParametersChangeOfValueNewValueChangedBits;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValueNewValueChangedValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValueNewValueChangedValue.java
index f3aa6ec1355..d4df3603db0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValueNewValueChangedValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersChangeOfValueNewValueChangedValue.java
@@ -43,18 +43,13 @@ public class BACnetNotificationParametersChangeOfValueNewValueChangedValue
   // Properties.
   protected final BACnetContextTagReal changedValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNotificationParametersChangeOfValueNewValueChangedValue(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetContextTagReal changedValue,
-      Short tagNumber) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber);
+      BACnetContextTagReal changedValue) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.changedValue = changedValue;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetContextTagReal getChangedValue() {
@@ -111,30 +106,25 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetNotificationParametersChangeOfValueNewValueChangedValue");
     // Create the instance
     return new BACnetNotificationParametersChangeOfValueNewValueChangedValueBuilderImpl(
-        changedValue, tagNumber);
+        changedValue);
   }
 
   public static class BACnetNotificationParametersChangeOfValueNewValueChangedValueBuilderImpl
       implements BACnetNotificationParametersChangeOfValueNewValue
           .BACnetNotificationParametersChangeOfValueNewValueBuilder {
     private final BACnetContextTagReal changedValue;
-    private final Short tagNumber;
 
     public BACnetNotificationParametersChangeOfValueNewValueChangedValueBuilderImpl(
-        BACnetContextTagReal changedValue, Short tagNumber) {
+        BACnetContextTagReal changedValue) {
       this.changedValue = changedValue;
-      this.tagNumber = tagNumber;
     }
 
     public BACnetNotificationParametersChangeOfValueNewValueChangedValue build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersChangeOfValueNewValueChangedValue
           bACnetNotificationParametersChangeOfValueNewValueChangedValue =
               new BACnetNotificationParametersChangeOfValueNewValueChangedValue(
-                  openingTag, peekedTagHeader, closingTag, changedValue, tagNumber);
+                  openingTag, peekedTagHeader, closingTag, changedValue);
       return bACnetNotificationParametersChangeOfValueNewValueChangedValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersCommandFailure.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersCommandFailure.java
index 564e95b23dc..dea913270d5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersCommandFailure.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersCommandFailure.java
@@ -47,10 +47,6 @@ public class BACnetNotificationParametersCommandFailure extends BACnetNotificati
   protected final BACnetConstructedData feedbackValue;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersCommandFailure(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -59,17 +55,13 @@ public BACnetNotificationParametersCommandFailure(
       BACnetConstructedData commandValue,
       BACnetStatusFlagsTagged statusFlags,
       BACnetConstructedData feedbackValue,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.commandValue = commandValue;
     this.statusFlags = statusFlags;
     this.feedbackValue = feedbackValue;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -210,13 +202,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersCommandFailure");
     // Create the instance
     return new BACnetNotificationParametersCommandFailureBuilderImpl(
-        innerOpeningTag,
-        commandValue,
-        statusFlags,
-        feedbackValue,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerOpeningTag, commandValue, statusFlags, feedbackValue, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersCommandFailureBuilderImpl
@@ -226,32 +212,22 @@ public static class BACnetNotificationParametersCommandFailureBuilderImpl
     private final BACnetStatusFlagsTagged statusFlags;
     private final BACnetConstructedData feedbackValue;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersCommandFailureBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
         BACnetConstructedData commandValue,
         BACnetStatusFlagsTagged statusFlags,
         BACnetConstructedData feedbackValue,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.commandValue = commandValue;
       this.statusFlags = statusFlags;
       this.feedbackValue = feedbackValue;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersCommandFailure build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersCommandFailure bACnetNotificationParametersCommandFailure =
           new BACnetNotificationParametersCommandFailure(
               openingTag,
@@ -261,9 +237,7 @@ public BACnetNotificationParametersCommandFailure build(
               commandValue,
               statusFlags,
               feedbackValue,
-              innerClosingTag,
-              tagNumber,
-              objectTypeArgument);
+              innerClosingTag);
       return bACnetNotificationParametersCommandFailure;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersComplexEventType.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersComplexEventType.java
index c0e6c0181c0..acbc718ee01 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersComplexEventType.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersComplexEventType.java
@@ -43,21 +43,13 @@ public class BACnetNotificationParametersComplexEventType extends BACnetNotifica
   // Properties.
   protected final BACnetPropertyValues listOfValues;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersComplexEventType(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
       BACnetClosingTag closingTag,
-      BACnetPropertyValues listOfValues,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetPropertyValues listOfValues) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.listOfValues = listOfValues;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetPropertyValues getListOfValues() {
@@ -117,32 +109,23 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
 
     readBuffer.closeContext("BACnetNotificationParametersComplexEventType");
     // Create the instance
-    return new BACnetNotificationParametersComplexEventTypeBuilderImpl(
-        listOfValues, tagNumber, objectTypeArgument);
+    return new BACnetNotificationParametersComplexEventTypeBuilderImpl(listOfValues);
   }
 
   public static class BACnetNotificationParametersComplexEventTypeBuilderImpl
       implements BACnetNotificationParameters.BACnetNotificationParametersBuilder {
     private final BACnetPropertyValues listOfValues;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersComplexEventTypeBuilderImpl(
-        BACnetPropertyValues listOfValues, Short tagNumber, BACnetObjectType objectTypeArgument) {
+        BACnetPropertyValues listOfValues) {
       this.listOfValues = listOfValues;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersComplexEventType build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersComplexEventType bACnetNotificationParametersComplexEventType =
           new BACnetNotificationParametersComplexEventType(
-              openingTag, peekedTagHeader, closingTag, listOfValues, tagNumber, objectTypeArgument);
+              openingTag, peekedTagHeader, closingTag, listOfValues);
       return bACnetNotificationParametersComplexEventType;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersDoubleOutOfRange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersDoubleOutOfRange.java
index cb7abad9804..377d2dc763e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersDoubleOutOfRange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersDoubleOutOfRange.java
@@ -48,10 +48,6 @@ public class BACnetNotificationParametersDoubleOutOfRange extends BACnetNotifica
   protected final BACnetContextTagDouble exceededLimit;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersDoubleOutOfRange(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -61,18 +57,14 @@ public BACnetNotificationParametersDoubleOutOfRange(
       BACnetStatusFlagsTagged statusFlags,
       BACnetContextTagDouble deadband,
       BACnetContextTagDouble exceededLimit,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.exceedingValue = exceedingValue;
     this.statusFlags = statusFlags;
     this.deadband = deadband;
     this.exceededLimit = exceededLimit;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -225,14 +217,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersDoubleOutOfRange");
     // Create the instance
     return new BACnetNotificationParametersDoubleOutOfRangeBuilderImpl(
-        innerOpeningTag,
-        exceedingValue,
-        statusFlags,
-        deadband,
-        exceededLimit,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerOpeningTag, exceedingValue, statusFlags, deadband, exceededLimit, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersDoubleOutOfRangeBuilderImpl
@@ -243,8 +228,6 @@ public static class BACnetNotificationParametersDoubleOutOfRangeBuilderImpl
     private final BACnetContextTagDouble deadband;
     private final BACnetContextTagDouble exceededLimit;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersDoubleOutOfRangeBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
@@ -252,25 +235,17 @@ public BACnetNotificationParametersDoubleOutOfRangeBuilderImpl(
         BACnetStatusFlagsTagged statusFlags,
         BACnetContextTagDouble deadband,
         BACnetContextTagDouble exceededLimit,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.exceedingValue = exceedingValue;
       this.statusFlags = statusFlags;
       this.deadband = deadband;
       this.exceededLimit = exceededLimit;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersDoubleOutOfRange build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersDoubleOutOfRange bACnetNotificationParametersDoubleOutOfRange =
           new BACnetNotificationParametersDoubleOutOfRange(
               openingTag,
@@ -281,9 +256,7 @@ public BACnetNotificationParametersDoubleOutOfRange build(
               statusFlags,
               deadband,
               exceededLimit,
-              innerClosingTag,
-              tagNumber,
-              objectTypeArgument);
+              innerClosingTag);
       return bACnetNotificationParametersDoubleOutOfRange;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersExtended.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersExtended.java
index 3087a873176..58887126d0f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersExtended.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersExtended.java
@@ -47,10 +47,6 @@ public class BACnetNotificationParametersExtended extends BACnetNotificationPara
   protected final BACnetNotificationParametersExtendedParameters parameters;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersExtended(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -59,17 +55,13 @@ public BACnetNotificationParametersExtended(
       BACnetVendorIdTagged vendorId,
       BACnetContextTagUnsignedInteger extendedEventType,
       BACnetNotificationParametersExtendedParameters parameters,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.vendorId = vendorId;
     this.extendedEventType = extendedEventType;
     this.parameters = parameters;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -203,13 +195,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersExtended");
     // Create the instance
     return new BACnetNotificationParametersExtendedBuilderImpl(
-        innerOpeningTag,
-        vendorId,
-        extendedEventType,
-        parameters,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerOpeningTag, vendorId, extendedEventType, parameters, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersExtendedBuilderImpl
@@ -219,32 +205,22 @@ public static class BACnetNotificationParametersExtendedBuilderImpl
     private final BACnetContextTagUnsignedInteger extendedEventType;
     private final BACnetNotificationParametersExtendedParameters parameters;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersExtendedBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
         BACnetVendorIdTagged vendorId,
         BACnetContextTagUnsignedInteger extendedEventType,
         BACnetNotificationParametersExtendedParameters parameters,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.vendorId = vendorId;
       this.extendedEventType = extendedEventType;
       this.parameters = parameters;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersExtended build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersExtended bACnetNotificationParametersExtended =
           new BACnetNotificationParametersExtended(
               openingTag,
@@ -254,9 +230,7 @@ public BACnetNotificationParametersExtended build(
               vendorId,
               extendedEventType,
               parameters,
-              innerClosingTag,
-              tagNumber,
-              objectTypeArgument);
+              innerClosingTag);
       return bACnetNotificationParametersExtended;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersExtendedParameters.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersExtendedParameters.java
index 5892f2bb4ba..ca6da043a76 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersExtendedParameters.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersExtendedParameters.java
@@ -56,9 +56,6 @@ public class BACnetNotificationParametersExtendedParameters implements Message {
   protected final BACnetDeviceObjectPropertyReferenceEnclosed reference;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetNotificationParametersExtendedParameters(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -76,8 +73,7 @@ public BACnetNotificationParametersExtendedParameters(
       BACnetApplicationTagTime timeValue,
       BACnetApplicationTagObjectIdentifier objectIdentifier,
       BACnetDeviceObjectPropertyReferenceEnclosed reference,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.peekedTagHeader = peekedTagHeader;
@@ -96,7 +92,6 @@ public BACnetNotificationParametersExtendedParameters(
     this.objectIdentifier = objectIdentifier;
     this.reference = reference;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -200,102 +195,46 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     writeBuffer.writeVirtual("isClosingTag", isClosingTag);
 
     // Optional Field (nullValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "nullValue",
-        nullValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x0)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("nullValue", nullValue, writeComplex(writeBuffer));
 
     // Optional Field (realValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "realValue",
-        realValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x4)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("realValue", realValue, writeComplex(writeBuffer));
 
     // Optional Field (unsignedValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "unsignedValue",
-        unsignedValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x2)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("unsignedValue", unsignedValue, writeComplex(writeBuffer));
 
     // Optional Field (booleanValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "booleanValue",
-        booleanValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x1)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("booleanValue", booleanValue, writeComplex(writeBuffer));
 
     // Optional Field (integerValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "integerValue",
-        integerValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x3)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("integerValue", integerValue, writeComplex(writeBuffer));
 
     // Optional Field (doubleValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "doubleValue",
-        doubleValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x5)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("doubleValue", doubleValue, writeComplex(writeBuffer));
 
     // Optional Field (octetStringValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "octetStringValue",
-        octetStringValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x6)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("octetStringValue", octetStringValue, writeComplex(writeBuffer));
 
     // Optional Field (characterStringValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "characterStringValue",
-        characterStringValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x7)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("characterStringValue", characterStringValue, writeComplex(writeBuffer));
 
     // Optional Field (bitStringValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "bitStringValue",
-        bitStringValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x8)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("bitStringValue", bitStringValue, writeComplex(writeBuffer));
 
     // Optional Field (enumeratedValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "enumeratedValue",
-        enumeratedValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0x9)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("enumeratedValue", enumeratedValue, writeComplex(writeBuffer));
 
     // Optional Field (dateValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "dateValue",
-        dateValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0xA)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("dateValue", dateValue, writeComplex(writeBuffer));
 
     // Optional Field (timeValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "timeValue",
-        timeValue,
-        writeComplex(writeBuffer),
-        (((getPeekedTagNumber()) == (0xB)) && (!(getIsOpeningTag()))) && (!(getIsClosingTag())));
+    writeOptionalField("timeValue", timeValue, writeComplex(writeBuffer));
 
     // Optional Field (objectIdentifier) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "objectIdentifier",
-        objectIdentifier,
-        writeComplex(writeBuffer),
-        ((getPeekedTagNumber()) == (0xC)) && (!(getIsOpeningTag())));
+    writeOptionalField("objectIdentifier", objectIdentifier, writeComplex(writeBuffer));
 
     // Optional Field (reference) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "reference",
-        reference,
-        writeComplex(writeBuffer),
-        (getIsOpeningTag()) && (!(getIsClosingTag())));
+    writeOptionalField("reference", reference, writeComplex(writeBuffer));
 
     // Simple Field (closingTag)
     writeSimpleField("closingTag", closingTag, writeComplex(writeBuffer));
@@ -574,8 +513,7 @@ public static BACnetNotificationParametersExtendedParameters staticParse(
             timeValue,
             objectIdentifier,
             reference,
-            closingTag,
-            tagNumber);
+            closingTag);
     return _bACnetNotificationParametersExtendedParameters;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersFloatingLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersFloatingLimit.java
index bde71e5ab79..5dd25af76b5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersFloatingLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersFloatingLimit.java
@@ -48,10 +48,6 @@ public class BACnetNotificationParametersFloatingLimit extends BACnetNotificatio
   protected final BACnetContextTagReal errorLimit;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersFloatingLimit(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -61,18 +57,14 @@ public BACnetNotificationParametersFloatingLimit(
       BACnetStatusFlagsTagged statusFlags,
       BACnetContextTagReal setPointValue,
       BACnetContextTagReal errorLimit,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.referenceValue = referenceValue;
     this.statusFlags = statusFlags;
     this.setPointValue = setPointValue;
     this.errorLimit = errorLimit;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -225,14 +217,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersFloatingLimit");
     // Create the instance
     return new BACnetNotificationParametersFloatingLimitBuilderImpl(
-        innerOpeningTag,
-        referenceValue,
-        statusFlags,
-        setPointValue,
-        errorLimit,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerOpeningTag, referenceValue, statusFlags, setPointValue, errorLimit, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersFloatingLimitBuilderImpl
@@ -243,8 +228,6 @@ public static class BACnetNotificationParametersFloatingLimitBuilderImpl
     private final BACnetContextTagReal setPointValue;
     private final BACnetContextTagReal errorLimit;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersFloatingLimitBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
@@ -252,25 +235,17 @@ public BACnetNotificationParametersFloatingLimitBuilderImpl(
         BACnetStatusFlagsTagged statusFlags,
         BACnetContextTagReal setPointValue,
         BACnetContextTagReal errorLimit,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.referenceValue = referenceValue;
       this.statusFlags = statusFlags;
       this.setPointValue = setPointValue;
       this.errorLimit = errorLimit;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersFloatingLimit build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersFloatingLimit bACnetNotificationParametersFloatingLimit =
           new BACnetNotificationParametersFloatingLimit(
               openingTag,
@@ -281,9 +256,7 @@ public BACnetNotificationParametersFloatingLimit build(
               statusFlags,
               setPointValue,
               errorLimit,
-              innerClosingTag,
-              tagNumber,
-              objectTypeArgument);
+              innerClosingTag);
       return bACnetNotificationParametersFloatingLimit;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersOutOfRange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersOutOfRange.java
index 6842df2ed24..19f9fbb2c17 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersOutOfRange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersOutOfRange.java
@@ -48,10 +48,6 @@ public class BACnetNotificationParametersOutOfRange extends BACnetNotificationPa
   protected final BACnetContextTagReal exceededLimit;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersOutOfRange(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -61,18 +57,14 @@ public BACnetNotificationParametersOutOfRange(
       BACnetStatusFlagsTagged statusFlags,
       BACnetContextTagReal deadband,
       BACnetContextTagReal exceededLimit,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.exceedingValue = exceedingValue;
     this.statusFlags = statusFlags;
     this.deadband = deadband;
     this.exceededLimit = exceededLimit;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -225,14 +217,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersOutOfRange");
     // Create the instance
     return new BACnetNotificationParametersOutOfRangeBuilderImpl(
-        innerOpeningTag,
-        exceedingValue,
-        statusFlags,
-        deadband,
-        exceededLimit,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerOpeningTag, exceedingValue, statusFlags, deadband, exceededLimit, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersOutOfRangeBuilderImpl
@@ -243,8 +228,6 @@ public static class BACnetNotificationParametersOutOfRangeBuilderImpl
     private final BACnetContextTagReal deadband;
     private final BACnetContextTagReal exceededLimit;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersOutOfRangeBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
@@ -252,25 +235,17 @@ public BACnetNotificationParametersOutOfRangeBuilderImpl(
         BACnetStatusFlagsTagged statusFlags,
         BACnetContextTagReal deadband,
         BACnetContextTagReal exceededLimit,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.exceedingValue = exceedingValue;
       this.statusFlags = statusFlags;
       this.deadband = deadband;
       this.exceededLimit = exceededLimit;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersOutOfRange build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersOutOfRange bACnetNotificationParametersOutOfRange =
           new BACnetNotificationParametersOutOfRange(
               openingTag,
@@ -281,9 +256,7 @@ public BACnetNotificationParametersOutOfRange build(
               statusFlags,
               deadband,
               exceededLimit,
-              innerClosingTag,
-              tagNumber,
-              objectTypeArgument);
+              innerClosingTag);
       return bACnetNotificationParametersOutOfRange;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersSignedOutOfRange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersSignedOutOfRange.java
index 32938dc2497..f762563291e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersSignedOutOfRange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersSignedOutOfRange.java
@@ -48,10 +48,6 @@ public class BACnetNotificationParametersSignedOutOfRange extends BACnetNotifica
   protected final BACnetContextTagSignedInteger exceededLimit;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersSignedOutOfRange(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -61,18 +57,14 @@ public BACnetNotificationParametersSignedOutOfRange(
       BACnetStatusFlagsTagged statusFlags,
       BACnetContextTagUnsignedInteger deadband,
       BACnetContextTagSignedInteger exceededLimit,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.exceedingValue = exceedingValue;
     this.statusFlags = statusFlags;
     this.deadband = deadband;
     this.exceededLimit = exceededLimit;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -231,14 +223,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersSignedOutOfRange");
     // Create the instance
     return new BACnetNotificationParametersSignedOutOfRangeBuilderImpl(
-        innerOpeningTag,
-        exceedingValue,
-        statusFlags,
-        deadband,
-        exceededLimit,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerOpeningTag, exceedingValue, statusFlags, deadband, exceededLimit, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersSignedOutOfRangeBuilderImpl
@@ -249,8 +234,6 @@ public static class BACnetNotificationParametersSignedOutOfRangeBuilderImpl
     private final BACnetContextTagUnsignedInteger deadband;
     private final BACnetContextTagSignedInteger exceededLimit;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersSignedOutOfRangeBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
@@ -258,25 +241,17 @@ public BACnetNotificationParametersSignedOutOfRangeBuilderImpl(
         BACnetStatusFlagsTagged statusFlags,
         BACnetContextTagUnsignedInteger deadband,
         BACnetContextTagSignedInteger exceededLimit,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.exceedingValue = exceedingValue;
       this.statusFlags = statusFlags;
       this.deadband = deadband;
       this.exceededLimit = exceededLimit;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersSignedOutOfRange build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersSignedOutOfRange bACnetNotificationParametersSignedOutOfRange =
           new BACnetNotificationParametersSignedOutOfRange(
               openingTag,
@@ -287,9 +262,7 @@ public BACnetNotificationParametersSignedOutOfRange build(
               statusFlags,
               deadband,
               exceededLimit,
-              innerClosingTag,
-              tagNumber,
-              objectTypeArgument);
+              innerClosingTag);
       return bACnetNotificationParametersSignedOutOfRange;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersUnsignedOutOfRange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersUnsignedOutOfRange.java
index befa43e913e..15604103d84 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersUnsignedOutOfRange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersUnsignedOutOfRange.java
@@ -48,10 +48,6 @@ public class BACnetNotificationParametersUnsignedOutOfRange extends BACnetNotifi
   protected final BACnetContextTagUnsignedInteger exceededLimit;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersUnsignedOutOfRange(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -61,18 +57,14 @@ public BACnetNotificationParametersUnsignedOutOfRange(
       BACnetStatusFlagsTagged statusFlags,
       BACnetContextTagUnsignedInteger deadband,
       BACnetContextTagUnsignedInteger exceededLimit,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.exceedingValue = exceedingValue;
     this.statusFlags = statusFlags;
     this.deadband = deadband;
     this.exceededLimit = exceededLimit;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -231,14 +223,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersUnsignedOutOfRange");
     // Create the instance
     return new BACnetNotificationParametersUnsignedOutOfRangeBuilderImpl(
-        innerOpeningTag,
-        exceedingValue,
-        statusFlags,
-        deadband,
-        exceededLimit,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerOpeningTag, exceedingValue, statusFlags, deadband, exceededLimit, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersUnsignedOutOfRangeBuilderImpl
@@ -249,8 +234,6 @@ public static class BACnetNotificationParametersUnsignedOutOfRangeBuilderImpl
     private final BACnetContextTagUnsignedInteger deadband;
     private final BACnetContextTagUnsignedInteger exceededLimit;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersUnsignedOutOfRangeBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
@@ -258,25 +241,17 @@ public BACnetNotificationParametersUnsignedOutOfRangeBuilderImpl(
         BACnetStatusFlagsTagged statusFlags,
         BACnetContextTagUnsignedInteger deadband,
         BACnetContextTagUnsignedInteger exceededLimit,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.exceedingValue = exceedingValue;
       this.statusFlags = statusFlags;
       this.deadband = deadband;
       this.exceededLimit = exceededLimit;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersUnsignedOutOfRange build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersUnsignedOutOfRange
           bACnetNotificationParametersUnsignedOutOfRange =
               new BACnetNotificationParametersUnsignedOutOfRange(
@@ -288,9 +263,7 @@ public BACnetNotificationParametersUnsignedOutOfRange build(
                   statusFlags,
                   deadband,
                   exceededLimit,
-                  innerClosingTag,
-                  tagNumber,
-                  objectTypeArgument);
+                  innerClosingTag);
       return bACnetNotificationParametersUnsignedOutOfRange;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersUnsignedRange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersUnsignedRange.java
index 85684b43dcd..d1829c554d9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersUnsignedRange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotificationParametersUnsignedRange.java
@@ -47,10 +47,6 @@ public class BACnetNotificationParametersUnsignedRange extends BACnetNotificatio
   protected final BACnetContextTagUnsignedInteger exceededLimit;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetNotificationParametersUnsignedRange(
       BACnetOpeningTag openingTag,
       BACnetTagHeader peekedTagHeader,
@@ -59,17 +55,13 @@ public BACnetNotificationParametersUnsignedRange(
       BACnetContextTagUnsignedInteger sequenceNumber,
       BACnetStatusFlagsTagged statusFlags,
       BACnetContextTagUnsignedInteger exceededLimit,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
-    super(openingTag, peekedTagHeader, closingTag, tagNumber, objectTypeArgument);
+      BACnetClosingTag innerClosingTag) {
+    super(openingTag, peekedTagHeader, closingTag);
     this.innerOpeningTag = innerOpeningTag;
     this.sequenceNumber = sequenceNumber;
     this.statusFlags = statusFlags;
     this.exceededLimit = exceededLimit;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -206,13 +198,7 @@ public static BACnetNotificationParametersBuilder staticParseBACnetNotificationP
     readBuffer.closeContext("BACnetNotificationParametersUnsignedRange");
     // Create the instance
     return new BACnetNotificationParametersUnsignedRangeBuilderImpl(
-        innerOpeningTag,
-        sequenceNumber,
-        statusFlags,
-        exceededLimit,
-        innerClosingTag,
-        tagNumber,
-        objectTypeArgument);
+        innerOpeningTag, sequenceNumber, statusFlags, exceededLimit, innerClosingTag);
   }
 
   public static class BACnetNotificationParametersUnsignedRangeBuilderImpl
@@ -222,32 +208,22 @@ public static class BACnetNotificationParametersUnsignedRangeBuilderImpl
     private final BACnetStatusFlagsTagged statusFlags;
     private final BACnetContextTagUnsignedInteger exceededLimit;
     private final BACnetClosingTag innerClosingTag;
-    private final Short tagNumber;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetNotificationParametersUnsignedRangeBuilderImpl(
         BACnetOpeningTag innerOpeningTag,
         BACnetContextTagUnsignedInteger sequenceNumber,
         BACnetStatusFlagsTagged statusFlags,
         BACnetContextTagUnsignedInteger exceededLimit,
-        BACnetClosingTag innerClosingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetClosingTag innerClosingTag) {
       this.innerOpeningTag = innerOpeningTag;
       this.sequenceNumber = sequenceNumber;
       this.statusFlags = statusFlags;
       this.exceededLimit = exceededLimit;
       this.innerClosingTag = innerClosingTag;
-      this.tagNumber = tagNumber;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
     public BACnetNotificationParametersUnsignedRange build(
-        BACnetOpeningTag openingTag,
-        BACnetTagHeader peekedTagHeader,
-        BACnetClosingTag closingTag,
-        Short tagNumber,
-        BACnetObjectType objectTypeArgument) {
+        BACnetOpeningTag openingTag, BACnetTagHeader peekedTagHeader, BACnetClosingTag closingTag) {
       BACnetNotificationParametersUnsignedRange bACnetNotificationParametersUnsignedRange =
           new BACnetNotificationParametersUnsignedRange(
               openingTag,
@@ -257,9 +233,7 @@ public BACnetNotificationParametersUnsignedRange build(
               sequenceNumber,
               statusFlags,
               exceededLimit,
-              innerClosingTag,
-              tagNumber,
-              objectTypeArgument);
+              innerClosingTag);
       return bACnetNotificationParametersUnsignedRange;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotifyTypeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotifyTypeTagged.java
index 1d6f9ca27ef..83fafbe01e2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotifyTypeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetNotifyTypeTagged.java
@@ -41,17 +41,10 @@ public class BACnetNotifyTypeTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetNotifyType value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetNotifyTypeTagged(
-      BACnetTagHeader header, BACnetNotifyType value, Short tagNumber, TagClass tagClass) {
+  public BACnetNotifyTypeTagged(BACnetTagHeader header, BACnetNotifyType value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetNotifyTypeTagged staticParse(
     readBuffer.closeContext("BACnetNotifyTypeTagged");
     // Create the instance
     BACnetNotifyTypeTagged _bACnetNotifyTypeTagged;
-    _bACnetNotifyTypeTagged = new BACnetNotifyTypeTagged(header, value, tagNumber, tagClass);
+    _bACnetNotifyTypeTagged = new BACnetNotifyTypeTagged(header, value);
     return _bACnetNotifyTypeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectPropertyReferenceEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectPropertyReferenceEnclosed.java
index 38c6ba7b9bc..3b0ba275655 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectPropertyReferenceEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectPropertyReferenceEnclosed.java
@@ -42,19 +42,14 @@ public class BACnetObjectPropertyReferenceEnclosed implements Message {
   protected final BACnetObjectPropertyReference objectPropertyReference;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetObjectPropertyReferenceEnclosed(
       BACnetOpeningTag openingTag,
       BACnetObjectPropertyReference objectPropertyReference,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.objectPropertyReference = objectPropertyReference;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -136,8 +131,7 @@ public static BACnetObjectPropertyReferenceEnclosed staticParse(
     // Create the instance
     BACnetObjectPropertyReferenceEnclosed _bACnetObjectPropertyReferenceEnclosed;
     _bACnetObjectPropertyReferenceEnclosed =
-        new BACnetObjectPropertyReferenceEnclosed(
-            openingTag, objectPropertyReference, closingTag, tagNumber);
+        new BACnetObjectPropertyReferenceEnclosed(openingTag, objectPropertyReference, closingTag);
     return _bACnetObjectPropertyReferenceEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectTypeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectTypeTagged.java
index b303887fda7..eabc434c2e0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectTypeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectTypeTagged.java
@@ -42,22 +42,12 @@ public class BACnetObjectTypeTagged implements Message {
   protected final BACnetObjectType value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetObjectTypeTagged(
-      BACnetTagHeader header,
-      BACnetObjectType value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetObjectType value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -178,8 +168,7 @@ public static BACnetObjectTypeTagged staticParse(
     readBuffer.closeContext("BACnetObjectTypeTagged");
     // Create the instance
     BACnetObjectTypeTagged _bACnetObjectTypeTagged;
-    _bACnetObjectTypeTagged =
-        new BACnetObjectTypeTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetObjectTypeTagged = new BACnetObjectTypeTagged(header, value, proprietaryValue);
     return _bACnetObjectTypeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectTypesSupportedTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectTypesSupportedTagged.java
index f98486a2c39..6566c9c2b1e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectTypesSupportedTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectTypesSupportedTagged.java
@@ -41,20 +41,11 @@ public class BACnetObjectTypesSupportedTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetTagPayloadBitString payload;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetObjectTypesSupportedTagged(
-      BACnetTagHeader header,
-      BACnetTagPayloadBitString payload,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetTagPayloadBitString payload) {
     super();
     this.header = header;
     this.payload = payload;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -290,8 +281,7 @@ public static BACnetObjectTypesSupportedTagged staticParse(
     readBuffer.closeContext("BACnetObjectTypesSupportedTagged");
     // Create the instance
     BACnetObjectTypesSupportedTagged _bACnetObjectTypesSupportedTagged;
-    _bACnetObjectTypesSupportedTagged =
-        new BACnetObjectTypesSupportedTagged(header, payload, tagNumber, tagClass);
+    _bACnetObjectTypesSupportedTagged = new BACnetObjectTypesSupportedTagged(header, payload);
     return _bACnetObjectTypesSupportedTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetOpeningTag.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetOpeningTag.java
index 3e1968f753f..07d78c1e6bd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetOpeningTag.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetOpeningTag.java
@@ -40,13 +40,9 @@ public class BACnetOpeningTag implements Message {
   // Properties.
   protected final BACnetTagHeader header;
 
-  // Arguments.
-  protected final Short tagNumberArgument;
-
-  public BACnetOpeningTag(BACnetTagHeader header, Short tagNumberArgument) {
+  public BACnetOpeningTag(BACnetTagHeader header) {
     super();
     this.header = header;
-    this.tagNumberArgument = tagNumberArgument;
   }
 
   public BACnetTagHeader getHeader() {
@@ -106,7 +102,7 @@ public static BACnetOpeningTag staticParse(ReadBuffer readBuffer, Short tagNumbe
     readBuffer.closeContext("BACnetOpeningTag");
     // Create the instance
     BACnetOpeningTag _bACnetOpeningTag;
-    _bACnetOpeningTag = new BACnetOpeningTag(header, tagNumberArgument);
+    _bACnetOpeningTag = new BACnetOpeningTag(header);
     return _bACnetOpeningTag;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPolarityTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPolarityTagged.java
index f8f445c9447..702389996fa 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPolarityTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPolarityTagged.java
@@ -41,17 +41,10 @@ public class BACnetPolarityTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetPolarity value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetPolarityTagged(
-      BACnetTagHeader header, BACnetPolarity value, Short tagNumber, TagClass tagClass) {
+  public BACnetPolarityTagged(BACnetTagHeader header, BACnetPolarity value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetPolarityTagged staticParse(
     readBuffer.closeContext("BACnetPolarityTagged");
     // Create the instance
     BACnetPolarityTagged _bACnetPolarityTagged;
-    _bACnetPolarityTagged = new BACnetPolarityTagged(header, value, tagNumber, tagClass);
+    _bACnetPolarityTagged = new BACnetPolarityTagged(header, value);
     return _bACnetPolarityTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityArray.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityArray.java
index fbc2966e3e7..91fe1d2a62a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityArray.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityArray.java
@@ -42,23 +42,11 @@ public class BACnetPriorityArray implements Message {
   protected final BACnetApplicationTagUnsignedInteger numberOfDataElements;
   protected final List<BACnetPriorityValue> data;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-  protected final Short tagNumber;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetPriorityArray(
-      BACnetApplicationTagUnsignedInteger numberOfDataElements,
-      List<BACnetPriorityValue> data,
-      BACnetObjectType objectTypeArgument,
-      Short tagNumber,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+      BACnetApplicationTagUnsignedInteger numberOfDataElements, List<BACnetPriorityValue> data) {
     super();
     this.numberOfDataElements = numberOfDataElements;
     this.data = data;
-    this.objectTypeArgument = objectTypeArgument;
-    this.tagNumber = tagNumber;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getNumberOfDataElements() {
@@ -157,11 +145,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     writeBuffer.writeVirtual("zero", zero);
 
     // Optional Field (numberOfDataElements) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "numberOfDataElements",
-        numberOfDataElements,
-        writeComplex(writeBuffer),
-        ((arrayIndexArgument) != (null)) && ((arrayIndexArgument.getActualValue()) == (getZero())));
+    writeOptionalField("numberOfDataElements", numberOfDataElements, writeComplex(writeBuffer));
 
     // Array Field (data)
     writeComplexTypeArrayField("data", data, writeBuffer);
@@ -430,9 +414,7 @@ public static BACnetPriorityArray staticParse(
     readBuffer.closeContext("BACnetPriorityArray");
     // Create the instance
     BACnetPriorityArray _bACnetPriorityArray;
-    _bACnetPriorityArray =
-        new BACnetPriorityArray(
-            numberOfDataElements, data, objectTypeArgument, tagNumber, arrayIndexArgument);
+    _bACnetPriorityArray = new BACnetPriorityArray(numberOfDataElements, data);
     return _bACnetPriorityArray;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValue.java
index cbebcc86d60..ab027fd82bf 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValue.java
@@ -42,13 +42,9 @@ public abstract class BACnetPriorityValue implements Message {
   // Properties.
   protected final BACnetTagHeader peekedTagHeader;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
-  public BACnetPriorityValue(BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+  public BACnetPriorityValue(BACnetTagHeader peekedTagHeader) {
     super();
     this.peekedTagHeader = peekedTagHeader;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetTagHeader getPeekedTagHeader() {
@@ -221,12 +217,12 @@ public static BACnetPriorityValue staticParse(
 
     readBuffer.closeContext("BACnetPriorityValue");
     // Create the instance
-    BACnetPriorityValue _bACnetPriorityValue = builder.build(peekedTagHeader, objectTypeArgument);
+    BACnetPriorityValue _bACnetPriorityValue = builder.build(peekedTagHeader);
     return _bACnetPriorityValue;
   }
 
   public interface BACnetPriorityValueBuilder {
-    BACnetPriorityValue build(BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument);
+    BACnetPriorityValue build(BACnetTagHeader peekedTagHeader);
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueBitString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueBitString.java
index 1a957ad2b88..2cb76c7e638 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueBitString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueBitString.java
@@ -42,16 +42,10 @@ public class BACnetPriorityValueBitString extends BACnetPriorityValue implements
   // Properties.
   protected final BACnetApplicationTagBitString bitStringValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPriorityValueBitString(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagBitString bitStringValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagBitString bitStringValue) {
+    super(peekedTagHeader);
     this.bitStringValue = bitStringValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagBitString getBitStringValue() {
@@ -103,24 +97,20 @@ public static BACnetPriorityValueBuilder staticParseBACnetPriorityValueBuilder(
 
     readBuffer.closeContext("BACnetPriorityValueBitString");
     // Create the instance
-    return new BACnetPriorityValueBitStringBuilderImpl(bitStringValue, objectTypeArgument);
+    return new BACnetPriorityValueBitStringBuilderImpl(bitStringValue);
   }
 
   public static class BACnetPriorityValueBitStringBuilderImpl
       implements BACnetPriorityValue.BACnetPriorityValueBuilder {
     private final BACnetApplicationTagBitString bitStringValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetPriorityValueBitStringBuilderImpl(
-        BACnetApplicationTagBitString bitStringValue, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueBitStringBuilderImpl(BACnetApplicationTagBitString bitStringValue) {
       this.bitStringValue = bitStringValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetPriorityValueBitString build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueBitString build(BACnetTagHeader peekedTagHeader) {
       BACnetPriorityValueBitString bACnetPriorityValueBitString =
-          new BACnetPriorityValueBitString(peekedTagHeader, bitStringValue, objectTypeArgument);
+          new BACnetPriorityValueBitString(peekedTagHeader, bitStringValue);
       return bACnetPriorityValueBitString;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueBoolean.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueBoolean.java
index f3c403df40b..5c646221f0d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueBoolean.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueBoolean.java
@@ -42,16 +42,10 @@ public class BACnetPriorityValueBoolean extends BACnetPriorityValue implements M
   // Properties.
   protected final BACnetApplicationTagBoolean booleanValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPriorityValueBoolean(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagBoolean booleanValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagBoolean booleanValue) {
+    super(peekedTagHeader);
     this.booleanValue = booleanValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagBoolean getBooleanValue() {
@@ -103,24 +97,20 @@ public static BACnetPriorityValueBuilder staticParseBACnetPriorityValueBuilder(
 
     readBuffer.closeContext("BACnetPriorityValueBoolean");
     // Create the instance
-    return new BACnetPriorityValueBooleanBuilderImpl(booleanValue, objectTypeArgument);
+    return new BACnetPriorityValueBooleanBuilderImpl(booleanValue);
   }
 
   public static class BACnetPriorityValueBooleanBuilderImpl
       implements BACnetPriorityValue.BACnetPriorityValueBuilder {
     private final BACnetApplicationTagBoolean booleanValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetPriorityValueBooleanBuilderImpl(
-        BACnetApplicationTagBoolean booleanValue, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueBooleanBuilderImpl(BACnetApplicationTagBoolean booleanValue) {
       this.booleanValue = booleanValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetPriorityValueBoolean build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueBoolean build(BACnetTagHeader peekedTagHeader) {
       BACnetPriorityValueBoolean bACnetPriorityValueBoolean =
-          new BACnetPriorityValueBoolean(peekedTagHeader, booleanValue, objectTypeArgument);
+          new BACnetPriorityValueBoolean(peekedTagHeader, booleanValue);
       return bACnetPriorityValueBoolean;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueCharacterString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueCharacterString.java
index fd7fba3f202..144cf27b658 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueCharacterString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueCharacterString.java
@@ -42,16 +42,10 @@ public class BACnetPriorityValueCharacterString extends BACnetPriorityValue impl
   // Properties.
   protected final BACnetApplicationTagCharacterString characterStringValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPriorityValueCharacterString(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagCharacterString characterStringValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagCharacterString characterStringValue) {
+    super(peekedTagHeader);
     this.characterStringValue = characterStringValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagCharacterString getCharacterStringValue() {
@@ -105,27 +99,21 @@ public static BACnetPriorityValueBuilder staticParseBACnetPriorityValueBuilder(
 
     readBuffer.closeContext("BACnetPriorityValueCharacterString");
     // Create the instance
-    return new BACnetPriorityValueCharacterStringBuilderImpl(
-        characterStringValue, objectTypeArgument);
+    return new BACnetPriorityValueCharacterStringBuilderImpl(characterStringValue);
   }
 
   public static class BACnetPriorityValueCharacterStringBuilderImpl
       implements BACnetPriorityValue.BACnetPriorityValueBuilder {
     private final BACnetApplicationTagCharacterString characterStringValue;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetPriorityValueCharacterStringBuilderImpl(
-        BACnetApplicationTagCharacterString characterStringValue,
-        BACnetObjectType objectTypeArgument) {
+        BACnetApplicationTagCharacterString characterStringValue) {
       this.characterStringValue = characterStringValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetPriorityValueCharacterString build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueCharacterString build(BACnetTagHeader peekedTagHeader) {
       BACnetPriorityValueCharacterString bACnetPriorityValueCharacterString =
-          new BACnetPriorityValueCharacterString(
-              peekedTagHeader, characterStringValue, objectTypeArgument);
+          new BACnetPriorityValueCharacterString(peekedTagHeader, characterStringValue);
       return bACnetPriorityValueCharacterString;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueConstructedValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueConstructedValue.java
index 3c8e2e7e8d5..833926022b0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueConstructedValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueConstructedValue.java
@@ -42,16 +42,10 @@ public class BACnetPriorityValueConstructedValue extends BACnetPriorityValue imp
   // Properties.
   protected final BACnetConstructedData constructedValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPriorityValueConstructedValue(
-      BACnetTagHeader peekedTagHeader,
-      BACnetConstructedData constructedValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetConstructedData constructedValue) {
+    super(peekedTagHeader);
     this.constructedValue = constructedValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetConstructedData getConstructedValue() {
@@ -110,25 +104,20 @@ public static BACnetPriorityValueBuilder staticParseBACnetPriorityValueBuilder(
 
     readBuffer.closeContext("BACnetPriorityValueConstructedValue");
     // Create the instance
-    return new BACnetPriorityValueConstructedValueBuilderImpl(constructedValue, objectTypeArgument);
+    return new BACnetPriorityValueConstructedValueBuilderImpl(constructedValue);
   }
 
   public static class BACnetPriorityValueConstructedValueBuilderImpl
       implements BACnetPriorityValue.BACnetPriorityValueBuilder {
     private final BACnetConstructedData constructedValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetPriorityValueConstructedValueBuilderImpl(
-        BACnetConstructedData constructedValue, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueConstructedValueBuilderImpl(BACnetConstructedData constructedValue) {
       this.constructedValue = constructedValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetPriorityValueConstructedValue build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueConstructedValue build(BACnetTagHeader peekedTagHeader) {
       BACnetPriorityValueConstructedValue bACnetPriorityValueConstructedValue =
-          new BACnetPriorityValueConstructedValue(
-              peekedTagHeader, constructedValue, objectTypeArgument);
+          new BACnetPriorityValueConstructedValue(peekedTagHeader, constructedValue);
       return bACnetPriorityValueConstructedValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueDate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueDate.java
index 2cdbed7abed..31fb89ea4fd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueDate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueDate.java
@@ -42,16 +42,10 @@ public class BACnetPriorityValueDate extends BACnetPriorityValue implements Mess
   // Properties.
   protected final BACnetApplicationTagDate dateValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPriorityValueDate(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagDate dateValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagDate dateValue) {
+    super(peekedTagHeader);
     this.dateValue = dateValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagDate getDateValue() {
@@ -103,24 +97,20 @@ public static BACnetPriorityValueBuilder staticParseBACnetPriorityValueBuilder(
 
     readBuffer.closeContext("BACnetPriorityValueDate");
     // Create the instance
-    return new BACnetPriorityValueDateBuilderImpl(dateValue, objectTypeArgument);
+    return new BACnetPriorityValueDateBuilderImpl(dateValue);
   }
 
   public static class BACnetPriorityValueDateBuilderImpl
       implements BACnetPriorityValue.BACnetPriorityValueBuilder {
     private final BACnetApplicationTagDate dateValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetPriorityValueDateBuilderImpl(
-        BACnetApplicationTagDate dateValue, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueDateBuilderImpl(BACnetApplicationTagDate dateValue) {
       this.dateValue = dateValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetPriorityValueDate build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueDate build(BACnetTagHeader peekedTagHeader) {
       BACnetPriorityValueDate bACnetPriorityValueDate =
-          new BACnetPriorityValueDate(peekedTagHeader, dateValue, objectTypeArgument);
+          new BACnetPriorityValueDate(peekedTagHeader, dateValue);
       return bACnetPriorityValueDate;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueDateTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueDateTime.java
index 7a5a7a6d4b9..af9ce1acfa2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueDateTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueDateTime.java
@@ -42,16 +42,10 @@ public class BACnetPriorityValueDateTime extends BACnetPriorityValue implements
   // Properties.
   protected final BACnetDateTimeEnclosed dateTimeValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPriorityValueDateTime(
-      BACnetTagHeader peekedTagHeader,
-      BACnetDateTimeEnclosed dateTimeValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetDateTimeEnclosed dateTimeValue) {
+    super(peekedTagHeader);
     this.dateTimeValue = dateTimeValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetDateTimeEnclosed getDateTimeValue() {
@@ -102,24 +96,20 @@ public static BACnetPriorityValueBuilder staticParseBACnetPriorityValueBuilder(
 
     readBuffer.closeContext("BACnetPriorityValueDateTime");
     // Create the instance
-    return new BACnetPriorityValueDateTimeBuilderImpl(dateTimeValue, objectTypeArgument);
+    return new BACnetPriorityValueDateTimeBuilderImpl(dateTimeValue);
   }
 
   public static class BACnetPriorityValueDateTimeBuilderImpl
       implements BACnetPriorityValue.BACnetPriorityValueBuilder {
     private final BACnetDateTimeEnclosed dateTimeValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetPriorityValueDateTimeBuilderImpl(
-        BACnetDateTimeEnclosed dateTimeValue, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueDateTimeBuilderImpl(BACnetDateTimeEnclosed dateTimeValue) {
       this.dateTimeValue = dateTimeValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetPriorityValueDateTime build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueDateTime build(BACnetTagHeader peekedTagHeader) {
       BACnetPriorityValueDateTime bACnetPriorityValueDateTime =
-          new BACnetPriorityValueDateTime(peekedTagHeader, dateTimeValue, objectTypeArgument);
+          new BACnetPriorityValueDateTime(peekedTagHeader, dateTimeValue);
       return bACnetPriorityValueDateTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueDouble.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueDouble.java
index c01e086bb8b..2d1914f6c6e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueDouble.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueDouble.java
@@ -42,16 +42,10 @@ public class BACnetPriorityValueDouble extends BACnetPriorityValue implements Me
   // Properties.
   protected final BACnetApplicationTagDouble doubleValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPriorityValueDouble(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagDouble doubleValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagDouble doubleValue) {
+    super(peekedTagHeader);
     this.doubleValue = doubleValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagDouble getDoubleValue() {
@@ -103,24 +97,20 @@ public static BACnetPriorityValueBuilder staticParseBACnetPriorityValueBuilder(
 
     readBuffer.closeContext("BACnetPriorityValueDouble");
     // Create the instance
-    return new BACnetPriorityValueDoubleBuilderImpl(doubleValue, objectTypeArgument);
+    return new BACnetPriorityValueDoubleBuilderImpl(doubleValue);
   }
 
   public static class BACnetPriorityValueDoubleBuilderImpl
       implements BACnetPriorityValue.BACnetPriorityValueBuilder {
     private final BACnetApplicationTagDouble doubleValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetPriorityValueDoubleBuilderImpl(
-        BACnetApplicationTagDouble doubleValue, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueDoubleBuilderImpl(BACnetApplicationTagDouble doubleValue) {
       this.doubleValue = doubleValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetPriorityValueDouble build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueDouble build(BACnetTagHeader peekedTagHeader) {
       BACnetPriorityValueDouble bACnetPriorityValueDouble =
-          new BACnetPriorityValueDouble(peekedTagHeader, doubleValue, objectTypeArgument);
+          new BACnetPriorityValueDouble(peekedTagHeader, doubleValue);
       return bACnetPriorityValueDouble;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueEnumerated.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueEnumerated.java
index 516f2a05a74..ea6c010dc2e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueEnumerated.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueEnumerated.java
@@ -42,16 +42,10 @@ public class BACnetPriorityValueEnumerated extends BACnetPriorityValue implement
   // Properties.
   protected final BACnetApplicationTagEnumerated enumeratedValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPriorityValueEnumerated(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagEnumerated enumeratedValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagEnumerated enumeratedValue) {
+    super(peekedTagHeader);
     this.enumeratedValue = enumeratedValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagEnumerated getEnumeratedValue() {
@@ -103,24 +97,21 @@ public static BACnetPriorityValueBuilder staticParseBACnetPriorityValueBuilder(
 
     readBuffer.closeContext("BACnetPriorityValueEnumerated");
     // Create the instance
-    return new BACnetPriorityValueEnumeratedBuilderImpl(enumeratedValue, objectTypeArgument);
+    return new BACnetPriorityValueEnumeratedBuilderImpl(enumeratedValue);
   }
 
   public static class BACnetPriorityValueEnumeratedBuilderImpl
       implements BACnetPriorityValue.BACnetPriorityValueBuilder {
     private final BACnetApplicationTagEnumerated enumeratedValue;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetPriorityValueEnumeratedBuilderImpl(
-        BACnetApplicationTagEnumerated enumeratedValue, BACnetObjectType objectTypeArgument) {
+        BACnetApplicationTagEnumerated enumeratedValue) {
       this.enumeratedValue = enumeratedValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetPriorityValueEnumerated build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueEnumerated build(BACnetTagHeader peekedTagHeader) {
       BACnetPriorityValueEnumerated bACnetPriorityValueEnumerated =
-          new BACnetPriorityValueEnumerated(peekedTagHeader, enumeratedValue, objectTypeArgument);
+          new BACnetPriorityValueEnumerated(peekedTagHeader, enumeratedValue);
       return bACnetPriorityValueEnumerated;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueInteger.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueInteger.java
index 766cbb579bc..ba01251e72e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueInteger.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueInteger.java
@@ -42,16 +42,10 @@ public class BACnetPriorityValueInteger extends BACnetPriorityValue implements M
   // Properties.
   protected final BACnetApplicationTagSignedInteger integerValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPriorityValueInteger(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagSignedInteger integerValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagSignedInteger integerValue) {
+    super(peekedTagHeader);
     this.integerValue = integerValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagSignedInteger getIntegerValue() {
@@ -105,24 +99,20 @@ public static BACnetPriorityValueBuilder staticParseBACnetPriorityValueBuilder(
 
     readBuffer.closeContext("BACnetPriorityValueInteger");
     // Create the instance
-    return new BACnetPriorityValueIntegerBuilderImpl(integerValue, objectTypeArgument);
+    return new BACnetPriorityValueIntegerBuilderImpl(integerValue);
   }
 
   public static class BACnetPriorityValueIntegerBuilderImpl
       implements BACnetPriorityValue.BACnetPriorityValueBuilder {
     private final BACnetApplicationTagSignedInteger integerValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetPriorityValueIntegerBuilderImpl(
-        BACnetApplicationTagSignedInteger integerValue, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueIntegerBuilderImpl(BACnetApplicationTagSignedInteger integerValue) {
       this.integerValue = integerValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetPriorityValueInteger build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueInteger build(BACnetTagHeader peekedTagHeader) {
       BACnetPriorityValueInteger bACnetPriorityValueInteger =
-          new BACnetPriorityValueInteger(peekedTagHeader, integerValue, objectTypeArgument);
+          new BACnetPriorityValueInteger(peekedTagHeader, integerValue);
       return bACnetPriorityValueInteger;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueNull.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueNull.java
index cbea0d740c0..e51a730bbda 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueNull.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueNull.java
@@ -42,16 +42,10 @@ public class BACnetPriorityValueNull extends BACnetPriorityValue implements Mess
   // Properties.
   protected final BACnetApplicationTagNull nullValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPriorityValueNull(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagNull nullValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagNull nullValue) {
+    super(peekedTagHeader);
     this.nullValue = nullValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagNull getNullValue() {
@@ -103,24 +97,20 @@ public static BACnetPriorityValueBuilder staticParseBACnetPriorityValueBuilder(
 
     readBuffer.closeContext("BACnetPriorityValueNull");
     // Create the instance
-    return new BACnetPriorityValueNullBuilderImpl(nullValue, objectTypeArgument);
+    return new BACnetPriorityValueNullBuilderImpl(nullValue);
   }
 
   public static class BACnetPriorityValueNullBuilderImpl
       implements BACnetPriorityValue.BACnetPriorityValueBuilder {
     private final BACnetApplicationTagNull nullValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetPriorityValueNullBuilderImpl(
-        BACnetApplicationTagNull nullValue, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueNullBuilderImpl(BACnetApplicationTagNull nullValue) {
       this.nullValue = nullValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetPriorityValueNull build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueNull build(BACnetTagHeader peekedTagHeader) {
       BACnetPriorityValueNull bACnetPriorityValueNull =
-          new BACnetPriorityValueNull(peekedTagHeader, nullValue, objectTypeArgument);
+          new BACnetPriorityValueNull(peekedTagHeader, nullValue);
       return bACnetPriorityValueNull;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueObjectidentifier.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueObjectidentifier.java
index 3c8b06d08a0..78bcc23b767 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueObjectidentifier.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueObjectidentifier.java
@@ -42,16 +42,10 @@ public class BACnetPriorityValueObjectidentifier extends BACnetPriorityValue imp
   // Properties.
   protected final BACnetApplicationTagObjectIdentifier objectidentifierValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPriorityValueObjectidentifier(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagObjectIdentifier objectidentifierValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagObjectIdentifier objectidentifierValue) {
+    super(peekedTagHeader);
     this.objectidentifierValue = objectidentifierValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagObjectIdentifier getObjectidentifierValue() {
@@ -105,27 +99,21 @@ public static BACnetPriorityValueBuilder staticParseBACnetPriorityValueBuilder(
 
     readBuffer.closeContext("BACnetPriorityValueObjectidentifier");
     // Create the instance
-    return new BACnetPriorityValueObjectidentifierBuilderImpl(
-        objectidentifierValue, objectTypeArgument);
+    return new BACnetPriorityValueObjectidentifierBuilderImpl(objectidentifierValue);
   }
 
   public static class BACnetPriorityValueObjectidentifierBuilderImpl
       implements BACnetPriorityValue.BACnetPriorityValueBuilder {
     private final BACnetApplicationTagObjectIdentifier objectidentifierValue;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetPriorityValueObjectidentifierBuilderImpl(
-        BACnetApplicationTagObjectIdentifier objectidentifierValue,
-        BACnetObjectType objectTypeArgument) {
+        BACnetApplicationTagObjectIdentifier objectidentifierValue) {
       this.objectidentifierValue = objectidentifierValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetPriorityValueObjectidentifier build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueObjectidentifier build(BACnetTagHeader peekedTagHeader) {
       BACnetPriorityValueObjectidentifier bACnetPriorityValueObjectidentifier =
-          new BACnetPriorityValueObjectidentifier(
-              peekedTagHeader, objectidentifierValue, objectTypeArgument);
+          new BACnetPriorityValueObjectidentifier(peekedTagHeader, objectidentifierValue);
       return bACnetPriorityValueObjectidentifier;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueOctetString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueOctetString.java
index 0fa8bbd1f58..9c3d5c17afc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueOctetString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueOctetString.java
@@ -42,16 +42,10 @@ public class BACnetPriorityValueOctetString extends BACnetPriorityValue implemen
   // Properties.
   protected final BACnetApplicationTagOctetString octetStringValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPriorityValueOctetString(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagOctetString octetStringValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagOctetString octetStringValue) {
+    super(peekedTagHeader);
     this.octetStringValue = octetStringValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagOctetString getOctetStringValue() {
@@ -104,24 +98,21 @@ public static BACnetPriorityValueBuilder staticParseBACnetPriorityValueBuilder(
 
     readBuffer.closeContext("BACnetPriorityValueOctetString");
     // Create the instance
-    return new BACnetPriorityValueOctetStringBuilderImpl(octetStringValue, objectTypeArgument);
+    return new BACnetPriorityValueOctetStringBuilderImpl(octetStringValue);
   }
 
   public static class BACnetPriorityValueOctetStringBuilderImpl
       implements BACnetPriorityValue.BACnetPriorityValueBuilder {
     private final BACnetApplicationTagOctetString octetStringValue;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetPriorityValueOctetStringBuilderImpl(
-        BACnetApplicationTagOctetString octetStringValue, BACnetObjectType objectTypeArgument) {
+        BACnetApplicationTagOctetString octetStringValue) {
       this.octetStringValue = octetStringValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetPriorityValueOctetString build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueOctetString build(BACnetTagHeader peekedTagHeader) {
       BACnetPriorityValueOctetString bACnetPriorityValueOctetString =
-          new BACnetPriorityValueOctetString(peekedTagHeader, octetStringValue, objectTypeArgument);
+          new BACnetPriorityValueOctetString(peekedTagHeader, octetStringValue);
       return bACnetPriorityValueOctetString;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueReal.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueReal.java
index 80c30338a85..71f6d23a933 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueReal.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueReal.java
@@ -42,16 +42,10 @@ public class BACnetPriorityValueReal extends BACnetPriorityValue implements Mess
   // Properties.
   protected final BACnetApplicationTagReal realValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPriorityValueReal(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagReal realValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagReal realValue) {
+    super(peekedTagHeader);
     this.realValue = realValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagReal getRealValue() {
@@ -103,24 +97,20 @@ public static BACnetPriorityValueBuilder staticParseBACnetPriorityValueBuilder(
 
     readBuffer.closeContext("BACnetPriorityValueReal");
     // Create the instance
-    return new BACnetPriorityValueRealBuilderImpl(realValue, objectTypeArgument);
+    return new BACnetPriorityValueRealBuilderImpl(realValue);
   }
 
   public static class BACnetPriorityValueRealBuilderImpl
       implements BACnetPriorityValue.BACnetPriorityValueBuilder {
     private final BACnetApplicationTagReal realValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetPriorityValueRealBuilderImpl(
-        BACnetApplicationTagReal realValue, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueRealBuilderImpl(BACnetApplicationTagReal realValue) {
       this.realValue = realValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetPriorityValueReal build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueReal build(BACnetTagHeader peekedTagHeader) {
       BACnetPriorityValueReal bACnetPriorityValueReal =
-          new BACnetPriorityValueReal(peekedTagHeader, realValue, objectTypeArgument);
+          new BACnetPriorityValueReal(peekedTagHeader, realValue);
       return bACnetPriorityValueReal;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueTime.java
index c122253d2fc..1dd70fb91e3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueTime.java
@@ -42,16 +42,10 @@ public class BACnetPriorityValueTime extends BACnetPriorityValue implements Mess
   // Properties.
   protected final BACnetApplicationTagTime timeValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPriorityValueTime(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagTime timeValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagTime timeValue) {
+    super(peekedTagHeader);
     this.timeValue = timeValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagTime getTimeValue() {
@@ -103,24 +97,20 @@ public static BACnetPriorityValueBuilder staticParseBACnetPriorityValueBuilder(
 
     readBuffer.closeContext("BACnetPriorityValueTime");
     // Create the instance
-    return new BACnetPriorityValueTimeBuilderImpl(timeValue, objectTypeArgument);
+    return new BACnetPriorityValueTimeBuilderImpl(timeValue);
   }
 
   public static class BACnetPriorityValueTimeBuilderImpl
       implements BACnetPriorityValue.BACnetPriorityValueBuilder {
     private final BACnetApplicationTagTime timeValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetPriorityValueTimeBuilderImpl(
-        BACnetApplicationTagTime timeValue, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueTimeBuilderImpl(BACnetApplicationTagTime timeValue) {
       this.timeValue = timeValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetPriorityValueTime build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueTime build(BACnetTagHeader peekedTagHeader) {
       BACnetPriorityValueTime bACnetPriorityValueTime =
-          new BACnetPriorityValueTime(peekedTagHeader, timeValue, objectTypeArgument);
+          new BACnetPriorityValueTime(peekedTagHeader, timeValue);
       return bACnetPriorityValueTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueUnsigned.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueUnsigned.java
index 6b6e0caa052..6a925c90898 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueUnsigned.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPriorityValueUnsigned.java
@@ -42,16 +42,10 @@ public class BACnetPriorityValueUnsigned extends BACnetPriorityValue implements
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger unsignedValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPriorityValueUnsigned(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagUnsignedInteger unsignedValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagUnsignedInteger unsignedValue) {
+    super(peekedTagHeader);
     this.unsignedValue = unsignedValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getUnsignedValue() {
@@ -105,24 +99,21 @@ public static BACnetPriorityValueBuilder staticParseBACnetPriorityValueBuilder(
 
     readBuffer.closeContext("BACnetPriorityValueUnsigned");
     // Create the instance
-    return new BACnetPriorityValueUnsignedBuilderImpl(unsignedValue, objectTypeArgument);
+    return new BACnetPriorityValueUnsignedBuilderImpl(unsignedValue);
   }
 
   public static class BACnetPriorityValueUnsignedBuilderImpl
       implements BACnetPriorityValue.BACnetPriorityValueBuilder {
     private final BACnetApplicationTagUnsignedInteger unsignedValue;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetPriorityValueUnsignedBuilderImpl(
-        BACnetApplicationTagUnsignedInteger unsignedValue, BACnetObjectType objectTypeArgument) {
+        BACnetApplicationTagUnsignedInteger unsignedValue) {
       this.unsignedValue = unsignedValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetPriorityValueUnsigned build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetPriorityValueUnsigned build(BACnetTagHeader peekedTagHeader) {
       BACnetPriorityValueUnsigned bACnetPriorityValueUnsigned =
-          new BACnetPriorityValueUnsigned(peekedTagHeader, unsignedValue, objectTypeArgument);
+          new BACnetPriorityValueUnsigned(peekedTagHeader, unsignedValue);
       return bACnetPriorityValueUnsigned;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProgramErrorTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProgramErrorTagged.java
index a02a3141094..20b046c3608 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProgramErrorTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProgramErrorTagged.java
@@ -42,22 +42,12 @@ public class BACnetProgramErrorTagged implements Message {
   protected final BACnetProgramError value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetProgramErrorTagged(
-      BACnetTagHeader header,
-      BACnetProgramError value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetProgramError value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetProgramErrorTagged staticParse(
     readBuffer.closeContext("BACnetProgramErrorTagged");
     // Create the instance
     BACnetProgramErrorTagged _bACnetProgramErrorTagged;
-    _bACnetProgramErrorTagged =
-        new BACnetProgramErrorTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetProgramErrorTagged = new BACnetProgramErrorTagged(header, value, proprietaryValue);
     return _bACnetProgramErrorTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProgramRequestTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProgramRequestTagged.java
index 195f26c95de..dbb83bd2896 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProgramRequestTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProgramRequestTagged.java
@@ -41,17 +41,10 @@ public class BACnetProgramRequestTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetProgramRequest value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetProgramRequestTagged(
-      BACnetTagHeader header, BACnetProgramRequest value, Short tagNumber, TagClass tagClass) {
+  public BACnetProgramRequestTagged(BACnetTagHeader header, BACnetProgramRequest value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,8 +126,7 @@ public static BACnetProgramRequestTagged staticParse(
     readBuffer.closeContext("BACnetProgramRequestTagged");
     // Create the instance
     BACnetProgramRequestTagged _bACnetProgramRequestTagged;
-    _bACnetProgramRequestTagged =
-        new BACnetProgramRequestTagged(header, value, tagNumber, tagClass);
+    _bACnetProgramRequestTagged = new BACnetProgramRequestTagged(header, value);
     return _bACnetProgramRequestTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProgramStateTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProgramStateTagged.java
index 4c6f7368fe6..8b130b81217 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProgramStateTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProgramStateTagged.java
@@ -41,17 +41,10 @@ public class BACnetProgramStateTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetProgramState value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetProgramStateTagged(
-      BACnetTagHeader header, BACnetProgramState value, Short tagNumber, TagClass tagClass) {
+  public BACnetProgramStateTagged(BACnetTagHeader header, BACnetProgramState value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetProgramStateTagged staticParse(
     readBuffer.closeContext("BACnetProgramStateTagged");
     // Create the instance
     BACnetProgramStateTagged _bACnetProgramStateTagged;
-    _bACnetProgramStateTagged = new BACnetProgramStateTagged(header, value, tagNumber, tagClass);
+    _bACnetProgramStateTagged = new BACnetProgramStateTagged(header, value);
     return _bACnetProgramStateTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyAccessResultAccessResult.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyAccessResultAccessResult.java
index d68f250276d..f3dfb02e14e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyAccessResultAccessResult.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyAccessResultAccessResult.java
@@ -42,21 +42,9 @@ public abstract class BACnetPropertyAccessResultAccessResult implements Message
   // Properties.
   protected final BACnetTagHeader peekedTagHeader;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-  protected final BACnetPropertyIdentifier propertyIdentifierArgument;
-  protected final BACnetTagPayloadUnsignedInteger propertyArrayIndexArgument;
-
-  public BACnetPropertyAccessResultAccessResult(
-      BACnetTagHeader peekedTagHeader,
-      BACnetObjectType objectTypeArgument,
-      BACnetPropertyIdentifier propertyIdentifierArgument,
-      BACnetTagPayloadUnsignedInteger propertyArrayIndexArgument) {
+  public BACnetPropertyAccessResultAccessResult(BACnetTagHeader peekedTagHeader) {
     super();
     this.peekedTagHeader = peekedTagHeader;
-    this.objectTypeArgument = objectTypeArgument;
-    this.propertyIdentifierArgument = propertyIdentifierArgument;
-    this.propertyArrayIndexArgument = propertyArrayIndexArgument;
   }
 
   public BACnetTagHeader getPeekedTagHeader() {
@@ -151,20 +139,12 @@ public static BACnetPropertyAccessResultAccessResult staticParse(
     readBuffer.closeContext("BACnetPropertyAccessResultAccessResult");
     // Create the instance
     BACnetPropertyAccessResultAccessResult _bACnetPropertyAccessResultAccessResult =
-        builder.build(
-            peekedTagHeader,
-            objectTypeArgument,
-            propertyIdentifierArgument,
-            propertyArrayIndexArgument);
+        builder.build(peekedTagHeader);
     return _bACnetPropertyAccessResultAccessResult;
   }
 
   public interface BACnetPropertyAccessResultAccessResultBuilder {
-    BACnetPropertyAccessResultAccessResult build(
-        BACnetTagHeader peekedTagHeader,
-        BACnetObjectType objectTypeArgument,
-        BACnetPropertyIdentifier propertyIdentifierArgument,
-        BACnetTagPayloadUnsignedInteger propertyArrayIndexArgument);
+    BACnetPropertyAccessResultAccessResult build(BACnetTagHeader peekedTagHeader);
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyAccessResultAccessResultPropertyAccessError.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyAccessResultAccessResultPropertyAccessError.java
index 86f9d7f4957..95158a16720 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyAccessResultAccessResultPropertyAccessError.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyAccessResultAccessResultPropertyAccessError.java
@@ -43,26 +43,10 @@ public class BACnetPropertyAccessResultAccessResultPropertyAccessError
   // Properties.
   protected final ErrorEnclosed propertyAccessError;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-  protected final BACnetPropertyIdentifier propertyIdentifierArgument;
-  protected final BACnetTagPayloadUnsignedInteger propertyArrayIndexArgument;
-
   public BACnetPropertyAccessResultAccessResultPropertyAccessError(
-      BACnetTagHeader peekedTagHeader,
-      ErrorEnclosed propertyAccessError,
-      BACnetObjectType objectTypeArgument,
-      BACnetPropertyIdentifier propertyIdentifierArgument,
-      BACnetTagPayloadUnsignedInteger propertyArrayIndexArgument) {
-    super(
-        peekedTagHeader,
-        objectTypeArgument,
-        propertyIdentifierArgument,
-        propertyArrayIndexArgument);
+      BACnetTagHeader peekedTagHeader, ErrorEnclosed propertyAccessError) {
+    super(peekedTagHeader);
     this.propertyAccessError = propertyAccessError;
-    this.objectTypeArgument = objectTypeArgument;
-    this.propertyIdentifierArgument = propertyIdentifierArgument;
-    this.propertyArrayIndexArgument = propertyArrayIndexArgument;
   }
 
   public ErrorEnclosed getPropertyAccessError() {
@@ -118,44 +102,25 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetPropertyAccessResultAccessResultPropertyAccessError");
     // Create the instance
     return new BACnetPropertyAccessResultAccessResultPropertyAccessErrorBuilderImpl(
-        propertyAccessError,
-        objectTypeArgument,
-        propertyIdentifierArgument,
-        propertyArrayIndexArgument);
+        propertyAccessError);
   }
 
   public static class BACnetPropertyAccessResultAccessResultPropertyAccessErrorBuilderImpl
       implements BACnetPropertyAccessResultAccessResult
           .BACnetPropertyAccessResultAccessResultBuilder {
     private final ErrorEnclosed propertyAccessError;
-    private final BACnetObjectType objectTypeArgument;
-    private final BACnetPropertyIdentifier propertyIdentifierArgument;
-    private final BACnetTagPayloadUnsignedInteger propertyArrayIndexArgument;
 
     public BACnetPropertyAccessResultAccessResultPropertyAccessErrorBuilderImpl(
-        ErrorEnclosed propertyAccessError,
-        BACnetObjectType objectTypeArgument,
-        BACnetPropertyIdentifier propertyIdentifierArgument,
-        BACnetTagPayloadUnsignedInteger propertyArrayIndexArgument) {
+        ErrorEnclosed propertyAccessError) {
       this.propertyAccessError = propertyAccessError;
-      this.objectTypeArgument = objectTypeArgument;
-      this.propertyIdentifierArgument = propertyIdentifierArgument;
-      this.propertyArrayIndexArgument = propertyArrayIndexArgument;
     }
 
     public BACnetPropertyAccessResultAccessResultPropertyAccessError build(
-        BACnetTagHeader peekedTagHeader,
-        BACnetObjectType objectTypeArgument,
-        BACnetPropertyIdentifier propertyIdentifierArgument,
-        BACnetTagPayloadUnsignedInteger propertyArrayIndexArgument) {
+        BACnetTagHeader peekedTagHeader) {
       BACnetPropertyAccessResultAccessResultPropertyAccessError
           bACnetPropertyAccessResultAccessResultPropertyAccessError =
               new BACnetPropertyAccessResultAccessResultPropertyAccessError(
-                  peekedTagHeader,
-                  propertyAccessError,
-                  objectTypeArgument,
-                  propertyIdentifierArgument,
-                  propertyArrayIndexArgument);
+                  peekedTagHeader, propertyAccessError);
       return bACnetPropertyAccessResultAccessResultPropertyAccessError;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyAccessResultAccessResultPropertyValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyAccessResultAccessResultPropertyValue.java
index 1da481d077e..c9caf747b99 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyAccessResultAccessResultPropertyValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyAccessResultAccessResultPropertyValue.java
@@ -43,26 +43,10 @@ public class BACnetPropertyAccessResultAccessResultPropertyValue
   // Properties.
   protected final BACnetConstructedData propertyValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-  protected final BACnetPropertyIdentifier propertyIdentifierArgument;
-  protected final BACnetTagPayloadUnsignedInteger propertyArrayIndexArgument;
-
   public BACnetPropertyAccessResultAccessResultPropertyValue(
-      BACnetTagHeader peekedTagHeader,
-      BACnetConstructedData propertyValue,
-      BACnetObjectType objectTypeArgument,
-      BACnetPropertyIdentifier propertyIdentifierArgument,
-      BACnetTagPayloadUnsignedInteger propertyArrayIndexArgument) {
-    super(
-        peekedTagHeader,
-        objectTypeArgument,
-        propertyIdentifierArgument,
-        propertyArrayIndexArgument);
+      BACnetTagHeader peekedTagHeader, BACnetConstructedData propertyValue) {
+    super(peekedTagHeader);
     this.propertyValue = propertyValue;
-    this.objectTypeArgument = objectTypeArgument;
-    this.propertyIdentifierArgument = propertyIdentifierArgument;
-    this.propertyArrayIndexArgument = propertyArrayIndexArgument;
   }
 
   public BACnetConstructedData getPropertyValue() {
@@ -125,42 +109,25 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetPropertyAccessResultAccessResultPropertyValue");
     // Create the instance
-    return new BACnetPropertyAccessResultAccessResultPropertyValueBuilderImpl(
-        propertyValue, objectTypeArgument, propertyIdentifierArgument, propertyArrayIndexArgument);
+    return new BACnetPropertyAccessResultAccessResultPropertyValueBuilderImpl(propertyValue);
   }
 
   public static class BACnetPropertyAccessResultAccessResultPropertyValueBuilderImpl
       implements BACnetPropertyAccessResultAccessResult
           .BACnetPropertyAccessResultAccessResultBuilder {
     private final BACnetConstructedData propertyValue;
-    private final BACnetObjectType objectTypeArgument;
-    private final BACnetPropertyIdentifier propertyIdentifierArgument;
-    private final BACnetTagPayloadUnsignedInteger propertyArrayIndexArgument;
 
     public BACnetPropertyAccessResultAccessResultPropertyValueBuilderImpl(
-        BACnetConstructedData propertyValue,
-        BACnetObjectType objectTypeArgument,
-        BACnetPropertyIdentifier propertyIdentifierArgument,
-        BACnetTagPayloadUnsignedInteger propertyArrayIndexArgument) {
+        BACnetConstructedData propertyValue) {
       this.propertyValue = propertyValue;
-      this.objectTypeArgument = objectTypeArgument;
-      this.propertyIdentifierArgument = propertyIdentifierArgument;
-      this.propertyArrayIndexArgument = propertyArrayIndexArgument;
     }
 
     public BACnetPropertyAccessResultAccessResultPropertyValue build(
-        BACnetTagHeader peekedTagHeader,
-        BACnetObjectType objectTypeArgument,
-        BACnetPropertyIdentifier propertyIdentifierArgument,
-        BACnetTagPayloadUnsignedInteger propertyArrayIndexArgument) {
+        BACnetTagHeader peekedTagHeader) {
       BACnetPropertyAccessResultAccessResultPropertyValue
           bACnetPropertyAccessResultAccessResultPropertyValue =
               new BACnetPropertyAccessResultAccessResultPropertyValue(
-                  peekedTagHeader,
-                  propertyValue,
-                  objectTypeArgument,
-                  propertyIdentifierArgument,
-                  propertyArrayIndexArgument);
+                  peekedTagHeader, propertyValue);
       return bACnetPropertyAccessResultAccessResultPropertyValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyIdentifierTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyIdentifierTagged.java
index 51a51869e1b..15c1016df75 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyIdentifierTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyIdentifierTagged.java
@@ -42,22 +42,12 @@ public class BACnetPropertyIdentifierTagged implements Message {
   protected final BACnetPropertyIdentifier value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetPropertyIdentifierTagged(
-      BACnetTagHeader header,
-      BACnetPropertyIdentifier value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetPropertyIdentifier value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -181,7 +171,7 @@ public static BACnetPropertyIdentifierTagged staticParse(
     // Create the instance
     BACnetPropertyIdentifierTagged _bACnetPropertyIdentifierTagged;
     _bACnetPropertyIdentifierTagged =
-        new BACnetPropertyIdentifierTagged(header, value, proprietaryValue, tagNumber, tagClass);
+        new BACnetPropertyIdentifierTagged(header, value, proprietaryValue);
     return _bACnetPropertyIdentifierTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyReferenceEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyReferenceEnclosed.java
index fab26656e6e..15366e811d4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyReferenceEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyReferenceEnclosed.java
@@ -42,19 +42,12 @@ public class BACnetPropertyReferenceEnclosed implements Message {
   protected final BACnetPropertyReference reference;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetPropertyReferenceEnclosed(
-      BACnetOpeningTag openingTag,
-      BACnetPropertyReference reference,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetPropertyReference reference, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.reference = reference;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -136,7 +129,7 @@ public static BACnetPropertyReferenceEnclosed staticParse(ReadBuffer readBuffer,
     // Create the instance
     BACnetPropertyReferenceEnclosed _bACnetPropertyReferenceEnclosed;
     _bACnetPropertyReferenceEnclosed =
-        new BACnetPropertyReferenceEnclosed(openingTag, reference, closingTag, tagNumber);
+        new BACnetPropertyReferenceEnclosed(openingTag, reference, closingTag);
     return _bACnetPropertyReferenceEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyStatesEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyStatesEnclosed.java
index a33a9b453ad..c37f3132921 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyStatesEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyStatesEnclosed.java
@@ -42,19 +42,14 @@ public class BACnetPropertyStatesEnclosed implements Message {
   protected final BACnetPropertyStates propertyState;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetPropertyStatesEnclosed(
       BACnetOpeningTag openingTag,
       BACnetPropertyStates propertyState,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.propertyState = propertyState;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -136,7 +131,7 @@ public static BACnetPropertyStatesEnclosed staticParse(ReadBuffer readBuffer, Sh
     // Create the instance
     BACnetPropertyStatesEnclosed _bACnetPropertyStatesEnclosed;
     _bACnetPropertyStatesEnclosed =
-        new BACnetPropertyStatesEnclosed(openingTag, propertyState, closingTag, tagNumber);
+        new BACnetPropertyStatesEnclosed(openingTag, propertyState, closingTag);
     return _bACnetPropertyStatesEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyValue.java
index f17b178def7..4938752e12c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyValue.java
@@ -43,21 +43,16 @@ public class BACnetPropertyValue implements Message {
   protected final BACnetConstructedDataElement propertyValue;
   protected final BACnetContextTagUnsignedInteger priority;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPropertyValue(
       BACnetPropertyIdentifierTagged propertyIdentifier,
       BACnetContextTagUnsignedInteger propertyArrayIndex,
       BACnetConstructedDataElement propertyValue,
-      BACnetContextTagUnsignedInteger priority,
-      BACnetObjectType objectTypeArgument) {
+      BACnetContextTagUnsignedInteger priority) {
     super();
     this.propertyIdentifier = propertyIdentifier;
     this.propertyArrayIndex = propertyArrayIndex;
     this.propertyValue = propertyValue;
     this.priority = priority;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetPropertyIdentifierTagged getPropertyIdentifier() {
@@ -186,8 +181,7 @@ public static BACnetPropertyValue staticParse(
     // Create the instance
     BACnetPropertyValue _bACnetPropertyValue;
     _bACnetPropertyValue =
-        new BACnetPropertyValue(
-            propertyIdentifier, propertyArrayIndex, propertyValue, priority, objectTypeArgument);
+        new BACnetPropertyValue(propertyIdentifier, propertyArrayIndex, propertyValue, priority);
     return _bACnetPropertyValue;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyValues.java
index 8399326d28f..d61883142d9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyValues.java
@@ -42,22 +42,14 @@ public class BACnetPropertyValues implements Message {
   protected final List<BACnetPropertyValue> data;
   protected final BACnetClosingTag innerClosingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPropertyValues(
       BACnetOpeningTag innerOpeningTag,
       List<BACnetPropertyValue> data,
-      BACnetClosingTag innerClosingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
+      BACnetClosingTag innerClosingTag) {
     super();
     this.innerOpeningTag = innerOpeningTag;
     this.data = data;
     this.innerClosingTag = innerClosingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getInnerOpeningTag() {
@@ -151,9 +143,7 @@ public static BACnetPropertyValues staticParse(
     readBuffer.closeContext("BACnetPropertyValues");
     // Create the instance
     BACnetPropertyValues _bACnetPropertyValues;
-    _bACnetPropertyValues =
-        new BACnetPropertyValues(
-            innerOpeningTag, data, innerClosingTag, tagNumber, objectTypeArgument);
+    _bACnetPropertyValues = new BACnetPropertyValues(innerOpeningTag, data, innerClosingTag);
     return _bACnetPropertyValues;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyWriteDefinition.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyWriteDefinition.java
index b2c302491dd..2df9a92de3d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyWriteDefinition.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetPropertyWriteDefinition.java
@@ -43,21 +43,16 @@ public class BACnetPropertyWriteDefinition implements Message {
   protected final BACnetConstructedData propertyValue;
   protected final BACnetContextTagUnsignedInteger priority;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetPropertyWriteDefinition(
       BACnetPropertyIdentifierTagged propertyIdentifier,
       BACnetContextTagUnsignedInteger arrayIndex,
       BACnetConstructedData propertyValue,
-      BACnetContextTagUnsignedInteger priority,
-      BACnetObjectType objectTypeArgument) {
+      BACnetContextTagUnsignedInteger priority) {
     super();
     this.propertyIdentifier = propertyIdentifier;
     this.arrayIndex = arrayIndex;
     this.propertyValue = propertyValue;
     this.priority = priority;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetPropertyIdentifierTagged getPropertyIdentifier() {
@@ -185,8 +180,7 @@ public static BACnetPropertyWriteDefinition staticParse(
     // Create the instance
     BACnetPropertyWriteDefinition _bACnetPropertyWriteDefinition;
     _bACnetPropertyWriteDefinition =
-        new BACnetPropertyWriteDefinition(
-            propertyIdentifier, arrayIndex, propertyValue, priority, objectTypeArgument);
+        new BACnetPropertyWriteDefinition(propertyIdentifier, arrayIndex, propertyValue, priority);
     return _bACnetPropertyWriteDefinition;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProtocolLevelTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProtocolLevelTagged.java
index 6a9ad5b1bde..404941ad72e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProtocolLevelTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetProtocolLevelTagged.java
@@ -41,17 +41,10 @@ public class BACnetProtocolLevelTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetProtocolLevel value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetProtocolLevelTagged(
-      BACnetTagHeader header, BACnetProtocolLevel value, Short tagNumber, TagClass tagClass) {
+  public BACnetProtocolLevelTagged(BACnetTagHeader header, BACnetProtocolLevel value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetProtocolLevelTagged staticParse(
     readBuffer.closeContext("BACnetProtocolLevelTagged");
     // Create the instance
     BACnetProtocolLevelTagged _bACnetProtocolLevelTagged;
-    _bACnetProtocolLevelTagged = new BACnetProtocolLevelTagged(header, value, tagNumber, tagClass);
+    _bACnetProtocolLevelTagged = new BACnetProtocolLevelTagged(header, value);
     return _bACnetProtocolLevelTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReadAccessProperty.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReadAccessProperty.java
index f7fdf46fcbb..8546b180f40 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReadAccessProperty.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReadAccessProperty.java
@@ -42,19 +42,14 @@ public class BACnetReadAccessProperty implements Message {
   protected final BACnetContextTagUnsignedInteger arrayIndex;
   protected final BACnetReadAccessPropertyReadResult readResult;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetReadAccessProperty(
       BACnetPropertyIdentifierTagged propertyIdentifier,
       BACnetContextTagUnsignedInteger arrayIndex,
-      BACnetReadAccessPropertyReadResult readResult,
-      BACnetObjectType objectTypeArgument) {
+      BACnetReadAccessPropertyReadResult readResult) {
     super();
     this.propertyIdentifier = propertyIdentifier;
     this.arrayIndex = arrayIndex;
     this.readResult = readResult;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetPropertyIdentifierTagged getPropertyIdentifier() {
@@ -157,8 +152,7 @@ public static BACnetReadAccessProperty staticParse(
     // Create the instance
     BACnetReadAccessProperty _bACnetReadAccessProperty;
     _bACnetReadAccessProperty =
-        new BACnetReadAccessProperty(
-            propertyIdentifier, arrayIndex, readResult, objectTypeArgument);
+        new BACnetReadAccessProperty(propertyIdentifier, arrayIndex, readResult);
     return _bACnetReadAccessProperty;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReadAccessPropertyReadResult.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReadAccessPropertyReadResult.java
index 3e5aee5934f..ec59a6cb484 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReadAccessPropertyReadResult.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReadAccessPropertyReadResult.java
@@ -42,25 +42,14 @@ public class BACnetReadAccessPropertyReadResult implements Message {
   protected final BACnetConstructedData propertyValue;
   protected final ErrorEnclosed propertyAccessError;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-  protected final BACnetPropertyIdentifier propertyIdentifierArgument;
-  protected final BACnetTagPayloadUnsignedInteger arrayIndexArgument;
-
   public BACnetReadAccessPropertyReadResult(
       BACnetTagHeader peekedTagHeader,
       BACnetConstructedData propertyValue,
-      ErrorEnclosed propertyAccessError,
-      BACnetObjectType objectTypeArgument,
-      BACnetPropertyIdentifier propertyIdentifierArgument,
-      BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
+      ErrorEnclosed propertyAccessError) {
     super();
     this.peekedTagHeader = peekedTagHeader;
     this.propertyValue = propertyValue;
     this.propertyAccessError = propertyAccessError;
-    this.objectTypeArgument = objectTypeArgument;
-    this.propertyIdentifierArgument = propertyIdentifierArgument;
-    this.arrayIndexArgument = arrayIndexArgument;
   }
 
   public BACnetTagHeader getPeekedTagHeader() {
@@ -89,15 +78,10 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     writeBuffer.writeVirtual("peekedTagNumber", peekedTagNumber);
 
     // Optional Field (propertyValue) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "propertyValue", propertyValue, writeComplex(writeBuffer), (getPeekedTagNumber()) == (4));
+    writeOptionalField("propertyValue", propertyValue, writeComplex(writeBuffer));
 
     // Optional Field (propertyAccessError) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "propertyAccessError",
-        propertyAccessError,
-        writeComplex(writeBuffer),
-        (getPeekedTagNumber()) == (5));
+    writeOptionalField("propertyAccessError", propertyAccessError, writeComplex(writeBuffer));
 
     writeBuffer.popContext("BACnetReadAccessPropertyReadResult");
   }
@@ -183,13 +167,7 @@ public static BACnetReadAccessPropertyReadResult staticParse(
     // Create the instance
     BACnetReadAccessPropertyReadResult _bACnetReadAccessPropertyReadResult;
     _bACnetReadAccessPropertyReadResult =
-        new BACnetReadAccessPropertyReadResult(
-            peekedTagHeader,
-            propertyValue,
-            propertyAccessError,
-            objectTypeArgument,
-            propertyIdentifierArgument,
-            arrayIndexArgument);
+        new BACnetReadAccessPropertyReadResult(peekedTagHeader, propertyValue, propertyAccessError);
     return _bACnetReadAccessPropertyReadResult;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReadAccessResultListOfResults.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReadAccessResultListOfResults.java
index 0aeef424875..803215f788a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReadAccessResultListOfResults.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReadAccessResultListOfResults.java
@@ -42,22 +42,14 @@ public class BACnetReadAccessResultListOfResults implements Message {
   protected final List<BACnetReadAccessProperty> listOfReadAccessProperty;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetReadAccessResultListOfResults(
       BACnetOpeningTag openingTag,
       List<BACnetReadAccessProperty> listOfReadAccessProperty,
-      BACnetClosingTag closingTag,
-      Short tagNumber,
-      BACnetObjectType objectTypeArgument) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listOfReadAccessProperty = listOfReadAccessProperty;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -152,8 +144,7 @@ public static BACnetReadAccessResultListOfResults staticParse(
     // Create the instance
     BACnetReadAccessResultListOfResults _bACnetReadAccessResultListOfResults;
     _bACnetReadAccessResultListOfResults =
-        new BACnetReadAccessResultListOfResults(
-            openingTag, listOfReadAccessProperty, closingTag, tagNumber, objectTypeArgument);
+        new BACnetReadAccessResultListOfResults(openingTag, listOfReadAccessProperty, closingTag);
     return _bACnetReadAccessResultListOfResults;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRecipientEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRecipientEnclosed.java
index 1c2569f4e35..2c891b9c70c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRecipientEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRecipientEnclosed.java
@@ -42,19 +42,12 @@ public class BACnetRecipientEnclosed implements Message {
   protected final BACnetRecipient recipient;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetRecipientEnclosed(
-      BACnetOpeningTag openingTag,
-      BACnetRecipient recipient,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetRecipient recipient, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.recipient = recipient;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -134,8 +127,7 @@ public static BACnetRecipientEnclosed staticParse(ReadBuffer readBuffer, Short t
     readBuffer.closeContext("BACnetRecipientEnclosed");
     // Create the instance
     BACnetRecipientEnclosed _bACnetRecipientEnclosed;
-    _bACnetRecipientEnclosed =
-        new BACnetRecipientEnclosed(openingTag, recipient, closingTag, tagNumber);
+    _bACnetRecipientEnclosed = new BACnetRecipientEnclosed(openingTag, recipient, closingTag);
     return _bACnetRecipientEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRecipientProcessEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRecipientProcessEnclosed.java
index 0cfcc39aa54..41c8525636a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRecipientProcessEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRecipientProcessEnclosed.java
@@ -42,19 +42,14 @@ public class BACnetRecipientProcessEnclosed implements Message {
   protected final BACnetRecipientProcess recipientProcess;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetRecipientProcessEnclosed(
       BACnetOpeningTag openingTag,
       BACnetRecipientProcess recipientProcess,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.recipientProcess = recipientProcess;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -136,7 +131,7 @@ public static BACnetRecipientProcessEnclosed staticParse(ReadBuffer readBuffer,
     // Create the instance
     BACnetRecipientProcessEnclosed _bACnetRecipientProcessEnclosed;
     _bACnetRecipientProcessEnclosed =
-        new BACnetRecipientProcessEnclosed(openingTag, recipientProcess, closingTag, tagNumber);
+        new BACnetRecipientProcessEnclosed(openingTag, recipientProcess, closingTag);
     return _bACnetRecipientProcessEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRejectReasonTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRejectReasonTagged.java
index 6a6a8ff4b9d..75d77cda037 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRejectReasonTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRejectReasonTagged.java
@@ -38,18 +38,20 @@
 public class BACnetRejectReasonTagged implements Message {
 
   // Properties.
+  protected final long actualLength;
   protected final BACnetRejectReason value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Long actualLength;
-
   public BACnetRejectReasonTagged(
-      BACnetRejectReason value, long proprietaryValue, Long actualLength) {
+      long actualLength, BACnetRejectReason value, long proprietaryValue) {
     super();
+    this.actualLength = actualLength;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.actualLength = actualLength;
+  }
+
+  public long getActualLength() {
+    return actualLength;
   }
 
   public BACnetRejectReason getValue() {
@@ -146,7 +148,7 @@ public static BACnetRejectReasonTagged staticParse(ReadBuffer readBuffer, Long a
     readBuffer.closeContext("BACnetRejectReasonTagged");
     // Create the instance
     BACnetRejectReasonTagged _bACnetRejectReasonTagged;
-    _bACnetRejectReasonTagged = new BACnetRejectReasonTagged(value, proprietaryValue, actualLength);
+    _bACnetRejectReasonTagged = new BACnetRejectReasonTagged(actualLength, value, proprietaryValue);
     return _bACnetRejectReasonTagged;
   }
 
@@ -159,14 +161,15 @@ public boolean equals(Object o) {
       return false;
     }
     BACnetRejectReasonTagged that = (BACnetRejectReasonTagged) o;
-    return (getValue() == that.getValue())
+    return (getActualLength() == that.getActualLength())
+        && (getValue() == that.getValue())
         && (getProprietaryValue() == that.getProprietaryValue())
         && true;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(getValue(), getProprietaryValue());
+    return Objects.hash(getActualLength(), getValue(), getProprietaryValue());
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRelationshipTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRelationshipTagged.java
index b908f445dbb..1795c652b5f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRelationshipTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRelationshipTagged.java
@@ -42,22 +42,12 @@ public class BACnetRelationshipTagged implements Message {
   protected final BACnetRelationship value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetRelationshipTagged(
-      BACnetTagHeader header,
-      BACnetRelationship value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetRelationship value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetRelationshipTagged staticParse(
     readBuffer.closeContext("BACnetRelationshipTagged");
     // Create the instance
     BACnetRelationshipTagged _bACnetRelationshipTagged;
-    _bACnetRelationshipTagged =
-        new BACnetRelationshipTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetRelationshipTagged = new BACnetRelationshipTagged(header, value, proprietaryValue);
     return _bACnetRelationshipTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReliabilityTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReliabilityTagged.java
index a2b33dedbd2..fc4452883af 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReliabilityTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetReliabilityTagged.java
@@ -42,22 +42,12 @@ public class BACnetReliabilityTagged implements Message {
   protected final BACnetReliability value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetReliabilityTagged(
-      BACnetTagHeader header,
-      BACnetReliability value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetReliability value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetReliabilityTagged staticParse(
     readBuffer.closeContext("BACnetReliabilityTagged");
     // Create the instance
     BACnetReliabilityTagged _bACnetReliabilityTagged;
-    _bACnetReliabilityTagged =
-        new BACnetReliabilityTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetReliabilityTagged = new BACnetReliabilityTagged(header, value, proprietaryValue);
     return _bACnetReliabilityTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRestartReasonTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRestartReasonTagged.java
index 15cbc0c5179..7ed0b9a2a0d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRestartReasonTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRestartReasonTagged.java
@@ -42,22 +42,12 @@ public class BACnetRestartReasonTagged implements Message {
   protected final BACnetRestartReason value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetRestartReasonTagged(
-      BACnetTagHeader header,
-      BACnetRestartReason value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetRestartReason value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetRestartReasonTagged staticParse(
     readBuffer.closeContext("BACnetRestartReasonTagged");
     // Create the instance
     BACnetRestartReasonTagged _bACnetRestartReasonTagged;
-    _bACnetRestartReasonTagged =
-        new BACnetRestartReasonTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetRestartReasonTagged = new BACnetRestartReasonTagged(header, value, proprietaryValue);
     return _bACnetRestartReasonTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetResultFlagsTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetResultFlagsTagged.java
index 069bcc60c7e..35ca06f55e8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetResultFlagsTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetResultFlagsTagged.java
@@ -41,20 +41,10 @@ public class BACnetResultFlagsTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetTagPayloadBitString payload;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetResultFlagsTagged(
-      BACnetTagHeader header,
-      BACnetTagPayloadBitString payload,
-      Short tagNumber,
-      TagClass tagClass) {
+  public BACnetResultFlagsTagged(BACnetTagHeader header, BACnetTagPayloadBitString payload) {
     super();
     this.header = header;
     this.payload = payload;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -178,7 +168,7 @@ public static BACnetResultFlagsTagged staticParse(
     readBuffer.closeContext("BACnetResultFlagsTagged");
     // Create the instance
     BACnetResultFlagsTagged _bACnetResultFlagsTagged;
-    _bACnetResultFlagsTagged = new BACnetResultFlagsTagged(header, payload, tagNumber, tagClass);
+    _bACnetResultFlagsTagged = new BACnetResultFlagsTagged(header, payload);
     return _bACnetResultFlagsTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRouterEntryStatusTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRouterEntryStatusTagged.java
index fe2fe1abf19..98b24b54b47 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRouterEntryStatusTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetRouterEntryStatusTagged.java
@@ -41,17 +41,10 @@ public class BACnetRouterEntryStatusTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetRouterEntryStatus value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetRouterEntryStatusTagged(
-      BACnetTagHeader header, BACnetRouterEntryStatus value, Short tagNumber, TagClass tagClass) {
+  public BACnetRouterEntryStatusTagged(BACnetTagHeader header, BACnetRouterEntryStatus value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -135,8 +128,7 @@ public static BACnetRouterEntryStatusTagged staticParse(
     readBuffer.closeContext("BACnetRouterEntryStatusTagged");
     // Create the instance
     BACnetRouterEntryStatusTagged _bACnetRouterEntryStatusTagged;
-    _bACnetRouterEntryStatusTagged =
-        new BACnetRouterEntryStatusTagged(header, value, tagNumber, tagClass);
+    _bACnetRouterEntryStatusTagged = new BACnetRouterEntryStatusTagged(header, value);
     return _bACnetRouterEntryStatusTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSecurityKeySetKeyIds.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSecurityKeySetKeyIds.java
index 2b8ae4e5129..60faed5c925 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSecurityKeySetKeyIds.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSecurityKeySetKeyIds.java
@@ -42,19 +42,12 @@ public class BACnetSecurityKeySetKeyIds implements Message {
   protected final List<BACnetKeyIdentifier> keyIds;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetSecurityKeySetKeyIds(
-      BACnetOpeningTag openingTag,
-      List<BACnetKeyIdentifier> keyIds,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, List<BACnetKeyIdentifier> keyIds, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.keyIds = keyIds;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -143,8 +136,7 @@ public static BACnetSecurityKeySetKeyIds staticParse(ReadBuffer readBuffer, Shor
     readBuffer.closeContext("BACnetSecurityKeySetKeyIds");
     // Create the instance
     BACnetSecurityKeySetKeyIds _bACnetSecurityKeySetKeyIds;
-    _bACnetSecurityKeySetKeyIds =
-        new BACnetSecurityKeySetKeyIds(openingTag, keyIds, closingTag, tagNumber);
+    _bACnetSecurityKeySetKeyIds = new BACnetSecurityKeySetKeyIds(openingTag, keyIds, closingTag);
     return _bACnetSecurityKeySetKeyIds;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSecurityLevelTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSecurityLevelTagged.java
index d10fe6d800c..c6f84e1f86f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSecurityLevelTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSecurityLevelTagged.java
@@ -41,17 +41,10 @@ public class BACnetSecurityLevelTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetSecurityLevel value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetSecurityLevelTagged(
-      BACnetTagHeader header, BACnetSecurityLevel value, Short tagNumber, TagClass tagClass) {
+  public BACnetSecurityLevelTagged(BACnetTagHeader header, BACnetSecurityLevel value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetSecurityLevelTagged staticParse(
     readBuffer.closeContext("BACnetSecurityLevelTagged");
     // Create the instance
     BACnetSecurityLevelTagged _bACnetSecurityLevelTagged;
-    _bACnetSecurityLevelTagged = new BACnetSecurityLevelTagged(header, value, tagNumber, tagClass);
+    _bACnetSecurityLevelTagged = new BACnetSecurityLevelTagged(header, value);
     return _bACnetSecurityLevelTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSecurityPolicyTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSecurityPolicyTagged.java
index 53641d69661..cfcc956dac6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSecurityPolicyTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSecurityPolicyTagged.java
@@ -41,17 +41,10 @@ public class BACnetSecurityPolicyTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetSecurityPolicy value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetSecurityPolicyTagged(
-      BACnetTagHeader header, BACnetSecurityPolicy value, Short tagNumber, TagClass tagClass) {
+  public BACnetSecurityPolicyTagged(BACnetTagHeader header, BACnetSecurityPolicy value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -135,8 +128,7 @@ public static BACnetSecurityPolicyTagged staticParse(
     readBuffer.closeContext("BACnetSecurityPolicyTagged");
     // Create the instance
     BACnetSecurityPolicyTagged _bACnetSecurityPolicyTagged;
-    _bACnetSecurityPolicyTagged =
-        new BACnetSecurityPolicyTagged(header, value, tagNumber, tagClass);
+    _bACnetSecurityPolicyTagged = new BACnetSecurityPolicyTagged(header, value);
     return _bACnetSecurityPolicyTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSegmentationTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSegmentationTagged.java
index 5fba32dd6de..0acb7f0d1c8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSegmentationTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSegmentationTagged.java
@@ -41,17 +41,10 @@ public class BACnetSegmentationTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetSegmentation value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetSegmentationTagged(
-      BACnetTagHeader header, BACnetSegmentation value, Short tagNumber, TagClass tagClass) {
+  public BACnetSegmentationTagged(BACnetTagHeader header, BACnetSegmentation value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -135,7 +128,7 @@ public static BACnetSegmentationTagged staticParse(
     readBuffer.closeContext("BACnetSegmentationTagged");
     // Create the instance
     BACnetSegmentationTagged _bACnetSegmentationTagged;
-    _bACnetSegmentationTagged = new BACnetSegmentationTagged(header, value, tagNumber, tagClass);
+    _bACnetSegmentationTagged = new BACnetSegmentationTagged(header, value);
     return _bACnetSegmentationTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAck.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAck.java
index b0012f362f1..b58a1a24259 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAck.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAck.java
@@ -40,14 +40,18 @@ public abstract class BACnetServiceAck implements Message {
   // Abstract accessors for discriminator values.
   public abstract BACnetConfirmedServiceChoice getServiceChoice();
 
-  // Arguments.
-  protected final Long serviceAckLength;
+  // Properties.
+  protected final long serviceAckLength;
 
-  public BACnetServiceAck(Long serviceAckLength) {
+  public BACnetServiceAck(long serviceAckLength) {
     super();
     this.serviceAckLength = serviceAckLength;
   }
 
+  public long getServiceAckLength() {
+    return serviceAckLength;
+  }
+
   public long getServiceAckPayloadLength() {
     return (long) (((((serviceAckLength) > (0))) ? ((serviceAckLength) - (1L)) : 0L));
   }
@@ -198,12 +202,11 @@ public static BACnetServiceAck staticParse(ReadBuffer readBuffer, Long serviceAc
     readBuffer.closeContext("BACnetServiceAck");
     // Create the instance
     BACnetServiceAck _bACnetServiceAck = builder.build(serviceAckLength);
-
     return _bACnetServiceAck;
   }
 
   public interface BACnetServiceAckBuilder {
-    BACnetServiceAck build(Long serviceAckLength);
+    BACnetServiceAck build(long serviceAckLength);
   }
 
   @Override
@@ -215,12 +218,12 @@ public boolean equals(Object o) {
       return false;
     }
     BACnetServiceAck that = (BACnetServiceAck) o;
-    return true;
+    return (getServiceAckLength() == that.getServiceAckLength()) && true;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash();
+    return Objects.hash(getServiceAckLength());
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckAtomicReadFile.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckAtomicReadFile.java
index ba303db268f..aba98056ac7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckAtomicReadFile.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckAtomicReadFile.java
@@ -46,17 +46,13 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetApplicationTagBoolean endOfFile;
   protected final BACnetServiceAckAtomicReadFileStreamOrRecord accessMethod;
 
-  // Arguments.
-  protected final Long serviceAckLength;
-
   public BACnetServiceAckAtomicReadFile(
+      long serviceAckLength,
       BACnetApplicationTagBoolean endOfFile,
-      BACnetServiceAckAtomicReadFileStreamOrRecord accessMethod,
-      Long serviceAckLength) {
+      BACnetServiceAckAtomicReadFileStreamOrRecord accessMethod) {
     super(serviceAckLength);
     this.endOfFile = endOfFile;
     this.accessMethod = accessMethod;
-    this.serviceAckLength = serviceAckLength;
   }
 
   public BACnetApplicationTagBoolean getEndOfFile() {
@@ -125,28 +121,24 @@ public static BACnetServiceAckBuilder staticParseBACnetServiceAckBuilder(
 
     readBuffer.closeContext("BACnetServiceAckAtomicReadFile");
     // Create the instance
-    return new BACnetServiceAckAtomicReadFileBuilderImpl(endOfFile, accessMethod, serviceAckLength);
+    return new BACnetServiceAckAtomicReadFileBuilderImpl(endOfFile, accessMethod);
   }
 
   public static class BACnetServiceAckAtomicReadFileBuilderImpl
       implements BACnetServiceAck.BACnetServiceAckBuilder {
     private final BACnetApplicationTagBoolean endOfFile;
     private final BACnetServiceAckAtomicReadFileStreamOrRecord accessMethod;
-    private final Long serviceAckLength;
 
     public BACnetServiceAckAtomicReadFileBuilderImpl(
         BACnetApplicationTagBoolean endOfFile,
-        BACnetServiceAckAtomicReadFileStreamOrRecord accessMethod,
-        Long serviceAckLength) {
+        BACnetServiceAckAtomicReadFileStreamOrRecord accessMethod) {
       this.endOfFile = endOfFile;
       this.accessMethod = accessMethod;
-      this.serviceAckLength = serviceAckLength;
     }
 
-    public BACnetServiceAckAtomicReadFile build(Long serviceAckLength) {
-
+    public BACnetServiceAckAtomicReadFile build(long serviceAckLength) {
       BACnetServiceAckAtomicReadFile bACnetServiceAckAtomicReadFile =
-          new BACnetServiceAckAtomicReadFile(endOfFile, accessMethod, serviceAckLength);
+          new BACnetServiceAckAtomicReadFile(serviceAckLength, endOfFile, accessMethod);
       return bACnetServiceAckAtomicReadFile;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckAtomicWriteFile.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckAtomicWriteFile.java
index aeb8aa30dc5..0943a47de07 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckAtomicWriteFile.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckAtomicWriteFile.java
@@ -45,14 +45,10 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final BACnetContextTagSignedInteger fileStartPosition;
 
-  // Arguments.
-  protected final Long serviceAckLength;
-
   public BACnetServiceAckAtomicWriteFile(
-      BACnetContextTagSignedInteger fileStartPosition, Long serviceAckLength) {
+      long serviceAckLength, BACnetContextTagSignedInteger fileStartPosition) {
     super(serviceAckLength);
     this.fileStartPosition = fileStartPosition;
-    this.serviceAckLength = serviceAckLength;
   }
 
   public BACnetContextTagSignedInteger getFileStartPosition() {
@@ -109,24 +105,21 @@ public static BACnetServiceAckBuilder staticParseBACnetServiceAckBuilder(
 
     readBuffer.closeContext("BACnetServiceAckAtomicWriteFile");
     // Create the instance
-    return new BACnetServiceAckAtomicWriteFileBuilderImpl(fileStartPosition, serviceAckLength);
+    return new BACnetServiceAckAtomicWriteFileBuilderImpl(fileStartPosition);
   }
 
   public static class BACnetServiceAckAtomicWriteFileBuilderImpl
       implements BACnetServiceAck.BACnetServiceAckBuilder {
     private final BACnetContextTagSignedInteger fileStartPosition;
-    private final Long serviceAckLength;
 
     public BACnetServiceAckAtomicWriteFileBuilderImpl(
-        BACnetContextTagSignedInteger fileStartPosition, Long serviceAckLength) {
+        BACnetContextTagSignedInteger fileStartPosition) {
       this.fileStartPosition = fileStartPosition;
-      this.serviceAckLength = serviceAckLength;
     }
 
-    public BACnetServiceAckAtomicWriteFile build(Long serviceAckLength) {
-
+    public BACnetServiceAckAtomicWriteFile build(long serviceAckLength) {
       BACnetServiceAckAtomicWriteFile bACnetServiceAckAtomicWriteFile =
-          new BACnetServiceAckAtomicWriteFile(fileStartPosition, serviceAckLength);
+          new BACnetServiceAckAtomicWriteFile(serviceAckLength, fileStartPosition);
       return bACnetServiceAckAtomicWriteFile;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckAuthenticate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckAuthenticate.java
index d6127d292a9..907c42aa1ec 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckAuthenticate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckAuthenticate.java
@@ -45,16 +45,9 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final byte[] bytesOfRemovedService;
 
-  // Arguments.
-  protected final Long serviceAckPayloadLength;
-  protected final Long serviceAckLength;
-
-  public BACnetServiceAckAuthenticate(
-      byte[] bytesOfRemovedService, Long serviceAckPayloadLength, Long serviceAckLength) {
+  public BACnetServiceAckAuthenticate(long serviceAckLength, byte[] bytesOfRemovedService) {
     super(serviceAckLength);
     this.bytesOfRemovedService = bytesOfRemovedService;
-    this.serviceAckPayloadLength = serviceAckPayloadLength;
-    this.serviceAckLength = serviceAckLength;
   }
 
   public byte[] getBytesOfRemovedService() {
@@ -106,28 +99,20 @@ public static BACnetServiceAckBuilder staticParseBACnetServiceAckBuilder(
 
     readBuffer.closeContext("BACnetServiceAckAuthenticate");
     // Create the instance
-    return new BACnetServiceAckAuthenticateBuilderImpl(
-        bytesOfRemovedService, serviceAckPayloadLength, serviceAckLength);
+    return new BACnetServiceAckAuthenticateBuilderImpl(bytesOfRemovedService);
   }
 
   public static class BACnetServiceAckAuthenticateBuilderImpl
       implements BACnetServiceAck.BACnetServiceAckBuilder {
     private final byte[] bytesOfRemovedService;
-    private final Long serviceAckPayloadLength;
-    private final Long serviceAckLength;
 
-    public BACnetServiceAckAuthenticateBuilderImpl(
-        byte[] bytesOfRemovedService, Long serviceAckPayloadLength, Long serviceAckLength) {
+    public BACnetServiceAckAuthenticateBuilderImpl(byte[] bytesOfRemovedService) {
       this.bytesOfRemovedService = bytesOfRemovedService;
-      this.serviceAckPayloadLength = serviceAckPayloadLength;
-      this.serviceAckLength = serviceAckLength;
     }
 
-    public BACnetServiceAckAuthenticate build(Long serviceAckLength) {
-
+    public BACnetServiceAckAuthenticate build(long serviceAckLength) {
       BACnetServiceAckAuthenticate bACnetServiceAckAuthenticate =
-          new BACnetServiceAckAuthenticate(
-              bytesOfRemovedService, serviceAckPayloadLength, serviceAckLength);
+          new BACnetServiceAckAuthenticate(serviceAckLength, bytesOfRemovedService);
       return bACnetServiceAckAuthenticate;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckConfirmedPrivateTransfer.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckConfirmedPrivateTransfer.java
index 59829bb0026..aa23e6fd75f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckConfirmedPrivateTransfer.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckConfirmedPrivateTransfer.java
@@ -47,19 +47,15 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetContextTagUnsignedInteger serviceNumber;
   protected final BACnetConstructedData resultBlock;
 
-  // Arguments.
-  protected final Long serviceAckLength;
-
   public BACnetServiceAckConfirmedPrivateTransfer(
+      long serviceAckLength,
       BACnetVendorIdTagged vendorId,
       BACnetContextTagUnsignedInteger serviceNumber,
-      BACnetConstructedData resultBlock,
-      Long serviceAckLength) {
+      BACnetConstructedData resultBlock) {
     super(serviceAckLength);
     this.vendorId = vendorId;
     this.serviceNumber = serviceNumber;
     this.resultBlock = resultBlock;
-    this.serviceAckLength = serviceAckLength;
   }
 
   public BACnetVendorIdTagged getVendorId() {
@@ -162,7 +158,7 @@ public static BACnetServiceAckBuilder staticParseBACnetServiceAckBuilder(
     readBuffer.closeContext("BACnetServiceAckConfirmedPrivateTransfer");
     // Create the instance
     return new BACnetServiceAckConfirmedPrivateTransferBuilderImpl(
-        vendorId, serviceNumber, resultBlock, serviceAckLength);
+        vendorId, serviceNumber, resultBlock);
   }
 
   public static class BACnetServiceAckConfirmedPrivateTransferBuilderImpl
@@ -170,24 +166,20 @@ public static class BACnetServiceAckConfirmedPrivateTransferBuilderImpl
     private final BACnetVendorIdTagged vendorId;
     private final BACnetContextTagUnsignedInteger serviceNumber;
     private final BACnetConstructedData resultBlock;
-    private final Long serviceAckLength;
 
     public BACnetServiceAckConfirmedPrivateTransferBuilderImpl(
         BACnetVendorIdTagged vendorId,
         BACnetContextTagUnsignedInteger serviceNumber,
-        BACnetConstructedData resultBlock,
-        Long serviceAckLength) {
+        BACnetConstructedData resultBlock) {
       this.vendorId = vendorId;
       this.serviceNumber = serviceNumber;
       this.resultBlock = resultBlock;
-      this.serviceAckLength = serviceAckLength;
     }
 
-    public BACnetServiceAckConfirmedPrivateTransfer build(Long serviceAckLength) {
-
+    public BACnetServiceAckConfirmedPrivateTransfer build(long serviceAckLength) {
       BACnetServiceAckConfirmedPrivateTransfer bACnetServiceAckConfirmedPrivateTransfer =
           new BACnetServiceAckConfirmedPrivateTransfer(
-              vendorId, serviceNumber, resultBlock, serviceAckLength);
+              serviceAckLength, vendorId, serviceNumber, resultBlock);
       return bACnetServiceAckConfirmedPrivateTransfer;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckCreateObject.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckCreateObject.java
index 17632e8ad55..0fa9157c952 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckCreateObject.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckCreateObject.java
@@ -45,14 +45,10 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final BACnetApplicationTagObjectIdentifier objectIdentifier;
 
-  // Arguments.
-  protected final Long serviceAckLength;
-
   public BACnetServiceAckCreateObject(
-      BACnetApplicationTagObjectIdentifier objectIdentifier, Long serviceAckLength) {
+      long serviceAckLength, BACnetApplicationTagObjectIdentifier objectIdentifier) {
     super(serviceAckLength);
     this.objectIdentifier = objectIdentifier;
-    this.serviceAckLength = serviceAckLength;
   }
 
   public BACnetApplicationTagObjectIdentifier getObjectIdentifier() {
@@ -106,24 +102,21 @@ public static BACnetServiceAckBuilder staticParseBACnetServiceAckBuilder(
 
     readBuffer.closeContext("BACnetServiceAckCreateObject");
     // Create the instance
-    return new BACnetServiceAckCreateObjectBuilderImpl(objectIdentifier, serviceAckLength);
+    return new BACnetServiceAckCreateObjectBuilderImpl(objectIdentifier);
   }
 
   public static class BACnetServiceAckCreateObjectBuilderImpl
       implements BACnetServiceAck.BACnetServiceAckBuilder {
     private final BACnetApplicationTagObjectIdentifier objectIdentifier;
-    private final Long serviceAckLength;
 
     public BACnetServiceAckCreateObjectBuilderImpl(
-        BACnetApplicationTagObjectIdentifier objectIdentifier, Long serviceAckLength) {
+        BACnetApplicationTagObjectIdentifier objectIdentifier) {
       this.objectIdentifier = objectIdentifier;
-      this.serviceAckLength = serviceAckLength;
     }
 
-    public BACnetServiceAckCreateObject build(Long serviceAckLength) {
-
+    public BACnetServiceAckCreateObject build(long serviceAckLength) {
       BACnetServiceAckCreateObject bACnetServiceAckCreateObject =
-          new BACnetServiceAckCreateObject(objectIdentifier, serviceAckLength);
+          new BACnetServiceAckCreateObject(serviceAckLength, objectIdentifier);
       return bACnetServiceAckCreateObject;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckGetAlarmSummary.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckGetAlarmSummary.java
index 892662b2db7..6ec4d21467c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckGetAlarmSummary.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckGetAlarmSummary.java
@@ -47,19 +47,15 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetEventStateTagged eventState;
   protected final BACnetEventTransitionBitsTagged acknowledgedTransitions;
 
-  // Arguments.
-  protected final Long serviceAckLength;
-
   public BACnetServiceAckGetAlarmSummary(
+      long serviceAckLength,
       BACnetApplicationTagObjectIdentifier objectIdentifier,
       BACnetEventStateTagged eventState,
-      BACnetEventTransitionBitsTagged acknowledgedTransitions,
-      Long serviceAckLength) {
+      BACnetEventTransitionBitsTagged acknowledgedTransitions) {
     super(serviceAckLength);
     this.objectIdentifier = objectIdentifier;
     this.eventState = eventState;
     this.acknowledgedTransitions = acknowledgedTransitions;
-    this.serviceAckLength = serviceAckLength;
   }
 
   public BACnetApplicationTagObjectIdentifier getObjectIdentifier() {
@@ -152,7 +148,7 @@ public static BACnetServiceAckBuilder staticParseBACnetServiceAckBuilder(
     readBuffer.closeContext("BACnetServiceAckGetAlarmSummary");
     // Create the instance
     return new BACnetServiceAckGetAlarmSummaryBuilderImpl(
-        objectIdentifier, eventState, acknowledgedTransitions, serviceAckLength);
+        objectIdentifier, eventState, acknowledgedTransitions);
   }
 
   public static class BACnetServiceAckGetAlarmSummaryBuilderImpl
@@ -160,24 +156,20 @@ public static class BACnetServiceAckGetAlarmSummaryBuilderImpl
     private final BACnetApplicationTagObjectIdentifier objectIdentifier;
     private final BACnetEventStateTagged eventState;
     private final BACnetEventTransitionBitsTagged acknowledgedTransitions;
-    private final Long serviceAckLength;
 
     public BACnetServiceAckGetAlarmSummaryBuilderImpl(
         BACnetApplicationTagObjectIdentifier objectIdentifier,
         BACnetEventStateTagged eventState,
-        BACnetEventTransitionBitsTagged acknowledgedTransitions,
-        Long serviceAckLength) {
+        BACnetEventTransitionBitsTagged acknowledgedTransitions) {
       this.objectIdentifier = objectIdentifier;
       this.eventState = eventState;
       this.acknowledgedTransitions = acknowledgedTransitions;
-      this.serviceAckLength = serviceAckLength;
     }
 
-    public BACnetServiceAckGetAlarmSummary build(Long serviceAckLength) {
-
+    public BACnetServiceAckGetAlarmSummary build(long serviceAckLength) {
       BACnetServiceAckGetAlarmSummary bACnetServiceAckGetAlarmSummary =
           new BACnetServiceAckGetAlarmSummary(
-              objectIdentifier, eventState, acknowledgedTransitions, serviceAckLength);
+              serviceAckLength, objectIdentifier, eventState, acknowledgedTransitions);
       return bACnetServiceAckGetAlarmSummary;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckGetEnrollmentSummary.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckGetEnrollmentSummary.java
index a86cf5a8024..a16959038ec 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckGetEnrollmentSummary.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckGetEnrollmentSummary.java
@@ -49,23 +49,19 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetApplicationTagUnsignedInteger priority;
   protected final BACnetApplicationTagUnsignedInteger notificationClass;
 
-  // Arguments.
-  protected final Long serviceAckLength;
-
   public BACnetServiceAckGetEnrollmentSummary(
+      long serviceAckLength,
       BACnetApplicationTagObjectIdentifier objectIdentifier,
       BACnetEventTypeTagged eventType,
       BACnetEventStateTagged eventState,
       BACnetApplicationTagUnsignedInteger priority,
-      BACnetApplicationTagUnsignedInteger notificationClass,
-      Long serviceAckLength) {
+      BACnetApplicationTagUnsignedInteger notificationClass) {
     super(serviceAckLength);
     this.objectIdentifier = objectIdentifier;
     this.eventType = eventType;
     this.eventState = eventState;
     this.priority = priority;
     this.notificationClass = notificationClass;
-    this.serviceAckLength = serviceAckLength;
   }
 
   public BACnetApplicationTagObjectIdentifier getObjectIdentifier() {
@@ -198,7 +194,7 @@ public static BACnetServiceAckBuilder staticParseBACnetServiceAckBuilder(
     readBuffer.closeContext("BACnetServiceAckGetEnrollmentSummary");
     // Create the instance
     return new BACnetServiceAckGetEnrollmentSummaryBuilderImpl(
-        objectIdentifier, eventType, eventState, priority, notificationClass, serviceAckLength);
+        objectIdentifier, eventType, eventState, priority, notificationClass);
   }
 
   public static class BACnetServiceAckGetEnrollmentSummaryBuilderImpl
@@ -208,33 +204,29 @@ public static class BACnetServiceAckGetEnrollmentSummaryBuilderImpl
     private final BACnetEventStateTagged eventState;
     private final BACnetApplicationTagUnsignedInteger priority;
     private final BACnetApplicationTagUnsignedInteger notificationClass;
-    private final Long serviceAckLength;
 
     public BACnetServiceAckGetEnrollmentSummaryBuilderImpl(
         BACnetApplicationTagObjectIdentifier objectIdentifier,
         BACnetEventTypeTagged eventType,
         BACnetEventStateTagged eventState,
         BACnetApplicationTagUnsignedInteger priority,
-        BACnetApplicationTagUnsignedInteger notificationClass,
-        Long serviceAckLength) {
+        BACnetApplicationTagUnsignedInteger notificationClass) {
       this.objectIdentifier = objectIdentifier;
       this.eventType = eventType;
       this.eventState = eventState;
       this.priority = priority;
       this.notificationClass = notificationClass;
-      this.serviceAckLength = serviceAckLength;
     }
 
-    public BACnetServiceAckGetEnrollmentSummary build(Long serviceAckLength) {
-
+    public BACnetServiceAckGetEnrollmentSummary build(long serviceAckLength) {
       BACnetServiceAckGetEnrollmentSummary bACnetServiceAckGetEnrollmentSummary =
           new BACnetServiceAckGetEnrollmentSummary(
+              serviceAckLength,
               objectIdentifier,
               eventType,
               eventState,
               priority,
-              notificationClass,
-              serviceAckLength);
+              notificationClass);
       return bACnetServiceAckGetEnrollmentSummary;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckGetEventInformation.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckGetEventInformation.java
index 28f09e2dd31..25522bbfc4d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckGetEventInformation.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckGetEventInformation.java
@@ -46,17 +46,13 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetEventSummariesList listOfEventSummaries;
   protected final BACnetContextTagBoolean moreEvents;
 
-  // Arguments.
-  protected final Long serviceAckLength;
-
   public BACnetServiceAckGetEventInformation(
+      long serviceAckLength,
       BACnetEventSummariesList listOfEventSummaries,
-      BACnetContextTagBoolean moreEvents,
-      Long serviceAckLength) {
+      BACnetContextTagBoolean moreEvents) {
     super(serviceAckLength);
     this.listOfEventSummaries = listOfEventSummaries;
     this.moreEvents = moreEvents;
-    this.serviceAckLength = serviceAckLength;
   }
 
   public BACnetEventSummariesList getListOfEventSummaries() {
@@ -127,30 +123,24 @@ public static BACnetServiceAckBuilder staticParseBACnetServiceAckBuilder(
 
     readBuffer.closeContext("BACnetServiceAckGetEventInformation");
     // Create the instance
-    return new BACnetServiceAckGetEventInformationBuilderImpl(
-        listOfEventSummaries, moreEvents, serviceAckLength);
+    return new BACnetServiceAckGetEventInformationBuilderImpl(listOfEventSummaries, moreEvents);
   }
 
   public static class BACnetServiceAckGetEventInformationBuilderImpl
       implements BACnetServiceAck.BACnetServiceAckBuilder {
     private final BACnetEventSummariesList listOfEventSummaries;
     private final BACnetContextTagBoolean moreEvents;
-    private final Long serviceAckLength;
 
     public BACnetServiceAckGetEventInformationBuilderImpl(
-        BACnetEventSummariesList listOfEventSummaries,
-        BACnetContextTagBoolean moreEvents,
-        Long serviceAckLength) {
+        BACnetEventSummariesList listOfEventSummaries, BACnetContextTagBoolean moreEvents) {
       this.listOfEventSummaries = listOfEventSummaries;
       this.moreEvents = moreEvents;
-      this.serviceAckLength = serviceAckLength;
     }
 
-    public BACnetServiceAckGetEventInformation build(Long serviceAckLength) {
-
+    public BACnetServiceAckGetEventInformation build(long serviceAckLength) {
       BACnetServiceAckGetEventInformation bACnetServiceAckGetEventInformation =
           new BACnetServiceAckGetEventInformation(
-              listOfEventSummaries, moreEvents, serviceAckLength);
+              serviceAckLength, listOfEventSummaries, moreEvents);
       return bACnetServiceAckGetEventInformation;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadProperty.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadProperty.java
index 87dfd5cc5b0..0add9e9e676 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadProperty.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadProperty.java
@@ -48,21 +48,17 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetContextTagUnsignedInteger arrayIndex;
   protected final BACnetConstructedData values;
 
-  // Arguments.
-  protected final Long serviceAckLength;
-
   public BACnetServiceAckReadProperty(
+      long serviceAckLength,
       BACnetContextTagObjectIdentifier objectIdentifier,
       BACnetPropertyIdentifierTagged propertyIdentifier,
       BACnetContextTagUnsignedInteger arrayIndex,
-      BACnetConstructedData values,
-      Long serviceAckLength) {
+      BACnetConstructedData values) {
     super(serviceAckLength);
     this.objectIdentifier = objectIdentifier;
     this.propertyIdentifier = propertyIdentifier;
     this.arrayIndex = arrayIndex;
     this.values = values;
-    this.serviceAckLength = serviceAckLength;
   }
 
   public BACnetContextTagObjectIdentifier getObjectIdentifier() {
@@ -189,7 +185,7 @@ public static BACnetServiceAckBuilder staticParseBACnetServiceAckBuilder(
     readBuffer.closeContext("BACnetServiceAckReadProperty");
     // Create the instance
     return new BACnetServiceAckReadPropertyBuilderImpl(
-        objectIdentifier, propertyIdentifier, arrayIndex, values, serviceAckLength);
+        objectIdentifier, propertyIdentifier, arrayIndex, values);
   }
 
   public static class BACnetServiceAckReadPropertyBuilderImpl
@@ -198,26 +194,22 @@ public static class BACnetServiceAckReadPropertyBuilderImpl
     private final BACnetPropertyIdentifierTagged propertyIdentifier;
     private final BACnetContextTagUnsignedInteger arrayIndex;
     private final BACnetConstructedData values;
-    private final Long serviceAckLength;
 
     public BACnetServiceAckReadPropertyBuilderImpl(
         BACnetContextTagObjectIdentifier objectIdentifier,
         BACnetPropertyIdentifierTagged propertyIdentifier,
         BACnetContextTagUnsignedInteger arrayIndex,
-        BACnetConstructedData values,
-        Long serviceAckLength) {
+        BACnetConstructedData values) {
       this.objectIdentifier = objectIdentifier;
       this.propertyIdentifier = propertyIdentifier;
       this.arrayIndex = arrayIndex;
       this.values = values;
-      this.serviceAckLength = serviceAckLength;
     }
 
-    public BACnetServiceAckReadProperty build(Long serviceAckLength) {
-
+    public BACnetServiceAckReadProperty build(long serviceAckLength) {
       BACnetServiceAckReadProperty bACnetServiceAckReadProperty =
           new BACnetServiceAckReadProperty(
-              objectIdentifier, propertyIdentifier, arrayIndex, values, serviceAckLength);
+              serviceAckLength, objectIdentifier, propertyIdentifier, arrayIndex, values);
       return bACnetServiceAckReadProperty;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadPropertyConditional.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadPropertyConditional.java
index 12d29fed2b5..cf520b9918c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadPropertyConditional.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadPropertyConditional.java
@@ -45,16 +45,10 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final byte[] bytesOfRemovedService;
 
-  // Arguments.
-  protected final Long serviceAckPayloadLength;
-  protected final Long serviceAckLength;
-
   public BACnetServiceAckReadPropertyConditional(
-      byte[] bytesOfRemovedService, Long serviceAckPayloadLength, Long serviceAckLength) {
+      long serviceAckLength, byte[] bytesOfRemovedService) {
     super(serviceAckLength);
     this.bytesOfRemovedService = bytesOfRemovedService;
-    this.serviceAckPayloadLength = serviceAckPayloadLength;
-    this.serviceAckLength = serviceAckLength;
   }
 
   public byte[] getBytesOfRemovedService() {
@@ -106,28 +100,20 @@ public static BACnetServiceAckBuilder staticParseBACnetServiceAckBuilder(
 
     readBuffer.closeContext("BACnetServiceAckReadPropertyConditional");
     // Create the instance
-    return new BACnetServiceAckReadPropertyConditionalBuilderImpl(
-        bytesOfRemovedService, serviceAckPayloadLength, serviceAckLength);
+    return new BACnetServiceAckReadPropertyConditionalBuilderImpl(bytesOfRemovedService);
   }
 
   public static class BACnetServiceAckReadPropertyConditionalBuilderImpl
       implements BACnetServiceAck.BACnetServiceAckBuilder {
     private final byte[] bytesOfRemovedService;
-    private final Long serviceAckPayloadLength;
-    private final Long serviceAckLength;
 
-    public BACnetServiceAckReadPropertyConditionalBuilderImpl(
-        byte[] bytesOfRemovedService, Long serviceAckPayloadLength, Long serviceAckLength) {
+    public BACnetServiceAckReadPropertyConditionalBuilderImpl(byte[] bytesOfRemovedService) {
       this.bytesOfRemovedService = bytesOfRemovedService;
-      this.serviceAckPayloadLength = serviceAckPayloadLength;
-      this.serviceAckLength = serviceAckLength;
     }
 
-    public BACnetServiceAckReadPropertyConditional build(Long serviceAckLength) {
-
+    public BACnetServiceAckReadPropertyConditional build(long serviceAckLength) {
       BACnetServiceAckReadPropertyConditional bACnetServiceAckReadPropertyConditional =
-          new BACnetServiceAckReadPropertyConditional(
-              bytesOfRemovedService, serviceAckPayloadLength, serviceAckLength);
+          new BACnetServiceAckReadPropertyConditional(serviceAckLength, bytesOfRemovedService);
       return bACnetServiceAckReadPropertyConditional;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadPropertyMultiple.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadPropertyMultiple.java
index cd8b541dddf..e116dacfc06 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadPropertyMultiple.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadPropertyMultiple.java
@@ -45,16 +45,10 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final List<BACnetReadAccessResult> data;
 
-  // Arguments.
-  protected final Long serviceAckPayloadLength;
-  protected final Long serviceAckLength;
-
   public BACnetServiceAckReadPropertyMultiple(
-      List<BACnetReadAccessResult> data, Long serviceAckPayloadLength, Long serviceAckLength) {
+      long serviceAckLength, List<BACnetReadAccessResult> data) {
     super(serviceAckLength);
     this.data = data;
-    this.serviceAckPayloadLength = serviceAckPayloadLength;
-    this.serviceAckLength = serviceAckLength;
   }
 
   public List<BACnetReadAccessResult> getData() {
@@ -110,27 +104,20 @@ public static BACnetServiceAckBuilder staticParseBACnetServiceAckBuilder(
 
     readBuffer.closeContext("BACnetServiceAckReadPropertyMultiple");
     // Create the instance
-    return new BACnetServiceAckReadPropertyMultipleBuilderImpl(
-        data, serviceAckPayloadLength, serviceAckLength);
+    return new BACnetServiceAckReadPropertyMultipleBuilderImpl(data);
   }
 
   public static class BACnetServiceAckReadPropertyMultipleBuilderImpl
       implements BACnetServiceAck.BACnetServiceAckBuilder {
     private final List<BACnetReadAccessResult> data;
-    private final Long serviceAckPayloadLength;
-    private final Long serviceAckLength;
 
-    public BACnetServiceAckReadPropertyMultipleBuilderImpl(
-        List<BACnetReadAccessResult> data, Long serviceAckPayloadLength, Long serviceAckLength) {
+    public BACnetServiceAckReadPropertyMultipleBuilderImpl(List<BACnetReadAccessResult> data) {
       this.data = data;
-      this.serviceAckPayloadLength = serviceAckPayloadLength;
-      this.serviceAckLength = serviceAckLength;
     }
 
-    public BACnetServiceAckReadPropertyMultiple build(Long serviceAckLength) {
-
+    public BACnetServiceAckReadPropertyMultiple build(long serviceAckLength) {
       BACnetServiceAckReadPropertyMultiple bACnetServiceAckReadPropertyMultiple =
-          new BACnetServiceAckReadPropertyMultiple(data, serviceAckPayloadLength, serviceAckLength);
+          new BACnetServiceAckReadPropertyMultiple(serviceAckLength, data);
       return bACnetServiceAckReadPropertyMultiple;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadRange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadRange.java
index 134a034f269..f05ff2718e7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadRange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckReadRange.java
@@ -51,18 +51,15 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetConstructedData itemData;
   protected final BACnetContextTagUnsignedInteger firstSequenceNumber;
 
-  // Arguments.
-  protected final Long serviceAckLength;
-
   public BACnetServiceAckReadRange(
+      long serviceAckLength,
       BACnetContextTagObjectIdentifier objectIdentifier,
       BACnetPropertyIdentifierTagged propertyIdentifier,
       BACnetContextTagUnsignedInteger propertyArrayIndex,
       BACnetResultFlagsTagged resultFlags,
       BACnetContextTagUnsignedInteger itemCount,
       BACnetConstructedData itemData,
-      BACnetContextTagUnsignedInteger firstSequenceNumber,
-      Long serviceAckLength) {
+      BACnetContextTagUnsignedInteger firstSequenceNumber) {
     super(serviceAckLength);
     this.objectIdentifier = objectIdentifier;
     this.propertyIdentifier = propertyIdentifier;
@@ -71,7 +68,6 @@ public BACnetServiceAckReadRange(
     this.itemCount = itemCount;
     this.itemData = itemData;
     this.firstSequenceNumber = firstSequenceNumber;
-    this.serviceAckLength = serviceAckLength;
   }
 
   public BACnetContextTagObjectIdentifier getObjectIdentifier() {
@@ -271,8 +267,7 @@ public static BACnetServiceAckBuilder staticParseBACnetServiceAckBuilder(
         resultFlags,
         itemCount,
         itemData,
-        firstSequenceNumber,
-        serviceAckLength);
+        firstSequenceNumber);
   }
 
   public static class BACnetServiceAckReadRangeBuilderImpl
@@ -284,7 +279,6 @@ public static class BACnetServiceAckReadRangeBuilderImpl
     private final BACnetContextTagUnsignedInteger itemCount;
     private final BACnetConstructedData itemData;
     private final BACnetContextTagUnsignedInteger firstSequenceNumber;
-    private final Long serviceAckLength;
 
     public BACnetServiceAckReadRangeBuilderImpl(
         BACnetContextTagObjectIdentifier objectIdentifier,
@@ -293,8 +287,7 @@ public BACnetServiceAckReadRangeBuilderImpl(
         BACnetResultFlagsTagged resultFlags,
         BACnetContextTagUnsignedInteger itemCount,
         BACnetConstructedData itemData,
-        BACnetContextTagUnsignedInteger firstSequenceNumber,
-        Long serviceAckLength) {
+        BACnetContextTagUnsignedInteger firstSequenceNumber) {
       this.objectIdentifier = objectIdentifier;
       this.propertyIdentifier = propertyIdentifier;
       this.propertyArrayIndex = propertyArrayIndex;
@@ -302,21 +295,19 @@ public BACnetServiceAckReadRangeBuilderImpl(
       this.itemCount = itemCount;
       this.itemData = itemData;
       this.firstSequenceNumber = firstSequenceNumber;
-      this.serviceAckLength = serviceAckLength;
     }
 
-    public BACnetServiceAckReadRange build(Long serviceAckLength) {
-
+    public BACnetServiceAckReadRange build(long serviceAckLength) {
       BACnetServiceAckReadRange bACnetServiceAckReadRange =
           new BACnetServiceAckReadRange(
+              serviceAckLength,
               objectIdentifier,
               propertyIdentifier,
               propertyArrayIndex,
               resultFlags,
               itemCount,
               itemData,
-              firstSequenceNumber,
-              serviceAckLength);
+              firstSequenceNumber);
       return bACnetServiceAckReadRange;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckRequestKey.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckRequestKey.java
index 845db2d477e..8b24313bdb0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckRequestKey.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckRequestKey.java
@@ -45,16 +45,9 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final byte[] bytesOfRemovedService;
 
-  // Arguments.
-  protected final Long serviceAckPayloadLength;
-  protected final Long serviceAckLength;
-
-  public BACnetServiceAckRequestKey(
-      byte[] bytesOfRemovedService, Long serviceAckPayloadLength, Long serviceAckLength) {
+  public BACnetServiceAckRequestKey(long serviceAckLength, byte[] bytesOfRemovedService) {
     super(serviceAckLength);
     this.bytesOfRemovedService = bytesOfRemovedService;
-    this.serviceAckPayloadLength = serviceAckPayloadLength;
-    this.serviceAckLength = serviceAckLength;
   }
 
   public byte[] getBytesOfRemovedService() {
@@ -106,28 +99,20 @@ public static BACnetServiceAckBuilder staticParseBACnetServiceAckBuilder(
 
     readBuffer.closeContext("BACnetServiceAckRequestKey");
     // Create the instance
-    return new BACnetServiceAckRequestKeyBuilderImpl(
-        bytesOfRemovedService, serviceAckPayloadLength, serviceAckLength);
+    return new BACnetServiceAckRequestKeyBuilderImpl(bytesOfRemovedService);
   }
 
   public static class BACnetServiceAckRequestKeyBuilderImpl
       implements BACnetServiceAck.BACnetServiceAckBuilder {
     private final byte[] bytesOfRemovedService;
-    private final Long serviceAckPayloadLength;
-    private final Long serviceAckLength;
 
-    public BACnetServiceAckRequestKeyBuilderImpl(
-        byte[] bytesOfRemovedService, Long serviceAckPayloadLength, Long serviceAckLength) {
+    public BACnetServiceAckRequestKeyBuilderImpl(byte[] bytesOfRemovedService) {
       this.bytesOfRemovedService = bytesOfRemovedService;
-      this.serviceAckPayloadLength = serviceAckPayloadLength;
-      this.serviceAckLength = serviceAckLength;
     }
 
-    public BACnetServiceAckRequestKey build(Long serviceAckLength) {
-
+    public BACnetServiceAckRequestKey build(long serviceAckLength) {
       BACnetServiceAckRequestKey bACnetServiceAckRequestKey =
-          new BACnetServiceAckRequestKey(
-              bytesOfRemovedService, serviceAckPayloadLength, serviceAckLength);
+          new BACnetServiceAckRequestKey(serviceAckLength, bytesOfRemovedService);
       return bACnetServiceAckRequestKey;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckVTData.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckVTData.java
index 688692fc89e..0eebda63b18 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckVTData.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckVTData.java
@@ -47,19 +47,15 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   protected final BACnetApplicationTagOctetString vtNewData;
   protected final BACnetApplicationTagUnsignedInteger vtDataFlag;
 
-  // Arguments.
-  protected final Long serviceAckLength;
-
   public BACnetServiceAckVTData(
+      long serviceAckLength,
       BACnetApplicationTagUnsignedInteger vtSessionIdentifier,
       BACnetApplicationTagOctetString vtNewData,
-      BACnetApplicationTagUnsignedInteger vtDataFlag,
-      Long serviceAckLength) {
+      BACnetApplicationTagUnsignedInteger vtDataFlag) {
     super(serviceAckLength);
     this.vtSessionIdentifier = vtSessionIdentifier;
     this.vtNewData = vtNewData;
     this.vtDataFlag = vtDataFlag;
-    this.serviceAckLength = serviceAckLength;
   }
 
   public BACnetApplicationTagUnsignedInteger getVtSessionIdentifier() {
@@ -150,8 +146,7 @@ public static BACnetServiceAckBuilder staticParseBACnetServiceAckBuilder(
 
     readBuffer.closeContext("BACnetServiceAckVTData");
     // Create the instance
-    return new BACnetServiceAckVTDataBuilderImpl(
-        vtSessionIdentifier, vtNewData, vtDataFlag, serviceAckLength);
+    return new BACnetServiceAckVTDataBuilderImpl(vtSessionIdentifier, vtNewData, vtDataFlag);
   }
 
   public static class BACnetServiceAckVTDataBuilderImpl
@@ -159,23 +154,19 @@ public static class BACnetServiceAckVTDataBuilderImpl
     private final BACnetApplicationTagUnsignedInteger vtSessionIdentifier;
     private final BACnetApplicationTagOctetString vtNewData;
     private final BACnetApplicationTagUnsignedInteger vtDataFlag;
-    private final Long serviceAckLength;
 
     public BACnetServiceAckVTDataBuilderImpl(
         BACnetApplicationTagUnsignedInteger vtSessionIdentifier,
         BACnetApplicationTagOctetString vtNewData,
-        BACnetApplicationTagUnsignedInteger vtDataFlag,
-        Long serviceAckLength) {
+        BACnetApplicationTagUnsignedInteger vtDataFlag) {
       this.vtSessionIdentifier = vtSessionIdentifier;
       this.vtNewData = vtNewData;
       this.vtDataFlag = vtDataFlag;
-      this.serviceAckLength = serviceAckLength;
     }
 
-    public BACnetServiceAckVTData build(Long serviceAckLength) {
-
+    public BACnetServiceAckVTData build(long serviceAckLength) {
       BACnetServiceAckVTData bACnetServiceAckVTData =
-          new BACnetServiceAckVTData(vtSessionIdentifier, vtNewData, vtDataFlag, serviceAckLength);
+          new BACnetServiceAckVTData(serviceAckLength, vtSessionIdentifier, vtNewData, vtDataFlag);
       return bACnetServiceAckVTData;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckVTOpen.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckVTOpen.java
index 6e8f639087b..6f70daee55a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckVTOpen.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServiceAckVTOpen.java
@@ -45,14 +45,10 @@ public BACnetConfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger remoteVtSessionIdentifier;
 
-  // Arguments.
-  protected final Long serviceAckLength;
-
   public BACnetServiceAckVTOpen(
-      BACnetApplicationTagUnsignedInteger remoteVtSessionIdentifier, Long serviceAckLength) {
+      long serviceAckLength, BACnetApplicationTagUnsignedInteger remoteVtSessionIdentifier) {
     super(serviceAckLength);
     this.remoteVtSessionIdentifier = remoteVtSessionIdentifier;
-    this.serviceAckLength = serviceAckLength;
   }
 
   public BACnetApplicationTagUnsignedInteger getRemoteVtSessionIdentifier() {
@@ -107,24 +103,21 @@ public static BACnetServiceAckBuilder staticParseBACnetServiceAckBuilder(
 
     readBuffer.closeContext("BACnetServiceAckVTOpen");
     // Create the instance
-    return new BACnetServiceAckVTOpenBuilderImpl(remoteVtSessionIdentifier, serviceAckLength);
+    return new BACnetServiceAckVTOpenBuilderImpl(remoteVtSessionIdentifier);
   }
 
   public static class BACnetServiceAckVTOpenBuilderImpl
       implements BACnetServiceAck.BACnetServiceAckBuilder {
     private final BACnetApplicationTagUnsignedInteger remoteVtSessionIdentifier;
-    private final Long serviceAckLength;
 
     public BACnetServiceAckVTOpenBuilderImpl(
-        BACnetApplicationTagUnsignedInteger remoteVtSessionIdentifier, Long serviceAckLength) {
+        BACnetApplicationTagUnsignedInteger remoteVtSessionIdentifier) {
       this.remoteVtSessionIdentifier = remoteVtSessionIdentifier;
-      this.serviceAckLength = serviceAckLength;
     }
 
-    public BACnetServiceAckVTOpen build(Long serviceAckLength) {
-
+    public BACnetServiceAckVTOpen build(long serviceAckLength) {
       BACnetServiceAckVTOpen bACnetServiceAckVTOpen =
-          new BACnetServiceAckVTOpen(remoteVtSessionIdentifier, serviceAckLength);
+          new BACnetServiceAckVTOpen(serviceAckLength, remoteVtSessionIdentifier);
       return bACnetServiceAckVTOpen;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServicesSupportedTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServicesSupportedTagged.java
index b261eaec58e..7b10468edf6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServicesSupportedTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetServicesSupportedTagged.java
@@ -41,20 +41,10 @@ public class BACnetServicesSupportedTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetTagPayloadBitString payload;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetServicesSupportedTagged(
-      BACnetTagHeader header,
-      BACnetTagPayloadBitString payload,
-      Short tagNumber,
-      TagClass tagClass) {
+  public BACnetServicesSupportedTagged(BACnetTagHeader header, BACnetTagPayloadBitString payload) {
     super();
     this.header = header;
     this.payload = payload;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -291,8 +281,7 @@ public static BACnetServicesSupportedTagged staticParse(
     readBuffer.closeContext("BACnetServicesSupportedTagged");
     // Create the instance
     BACnetServicesSupportedTagged _bACnetServicesSupportedTagged;
-    _bACnetServicesSupportedTagged =
-        new BACnetServicesSupportedTagged(header, payload, tagNumber, tagClass);
+    _bACnetServicesSupportedTagged = new BACnetServicesSupportedTagged(header, payload);
     return _bACnetServicesSupportedTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetShedStateTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetShedStateTagged.java
index c8f4370c909..7956d8358e0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetShedStateTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetShedStateTagged.java
@@ -41,17 +41,10 @@ public class BACnetShedStateTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetShedState value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetShedStateTagged(
-      BACnetTagHeader header, BACnetShedState value, Short tagNumber, TagClass tagClass) {
+  public BACnetShedStateTagged(BACnetTagHeader header, BACnetShedState value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetShedStateTagged staticParse(
     readBuffer.closeContext("BACnetShedStateTagged");
     // Create the instance
     BACnetShedStateTagged _bACnetShedStateTagged;
-    _bACnetShedStateTagged = new BACnetShedStateTagged(header, value, tagNumber, tagClass);
+    _bACnetShedStateTagged = new BACnetShedStateTagged(header, value);
     return _bACnetShedStateTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSilencedStateTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSilencedStateTagged.java
index 7ee01b1279d..4bc34238eec 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSilencedStateTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSilencedStateTagged.java
@@ -42,22 +42,12 @@ public class BACnetSilencedStateTagged implements Message {
   protected final BACnetSilencedState value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetSilencedStateTagged(
-      BACnetTagHeader header,
-      BACnetSilencedState value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetSilencedState value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -180,8 +170,7 @@ public static BACnetSilencedStateTagged staticParse(
     readBuffer.closeContext("BACnetSilencedStateTagged");
     // Create the instance
     BACnetSilencedStateTagged _bACnetSilencedStateTagged;
-    _bACnetSilencedStateTagged =
-        new BACnetSilencedStateTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetSilencedStateTagged = new BACnetSilencedStateTagged(header, value, proprietaryValue);
     return _bACnetSilencedStateTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSpecialEventListOfTimeValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSpecialEventListOfTimeValues.java
index c6b6b0e4933..ba9740fe13a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSpecialEventListOfTimeValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetSpecialEventListOfTimeValues.java
@@ -42,19 +42,14 @@ public class BACnetSpecialEventListOfTimeValues implements Message {
   protected final List<BACnetTimeValue> listOfTimeValues;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetSpecialEventListOfTimeValues(
       BACnetOpeningTag openingTag,
       List<BACnetTimeValue> listOfTimeValues,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listOfTimeValues = listOfTimeValues;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -144,7 +139,7 @@ public static BACnetSpecialEventListOfTimeValues staticParse(
     // Create the instance
     BACnetSpecialEventListOfTimeValues _bACnetSpecialEventListOfTimeValues;
     _bACnetSpecialEventListOfTimeValues =
-        new BACnetSpecialEventListOfTimeValues(openingTag, listOfTimeValues, closingTag, tagNumber);
+        new BACnetSpecialEventListOfTimeValues(openingTag, listOfTimeValues, closingTag);
     return _bACnetSpecialEventListOfTimeValues;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetStatusFlagsTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetStatusFlagsTagged.java
index f94be283ccb..f39e26743e9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetStatusFlagsTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetStatusFlagsTagged.java
@@ -41,20 +41,10 @@ public class BACnetStatusFlagsTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetTagPayloadBitString payload;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetStatusFlagsTagged(
-      BACnetTagHeader header,
-      BACnetTagPayloadBitString payload,
-      Short tagNumber,
-      TagClass tagClass) {
+  public BACnetStatusFlagsTagged(BACnetTagHeader header, BACnetTagPayloadBitString payload) {
     super();
     this.header = header;
     this.payload = payload;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -194,7 +184,7 @@ public static BACnetStatusFlagsTagged staticParse(
     readBuffer.closeContext("BACnetStatusFlagsTagged");
     // Create the instance
     BACnetStatusFlagsTagged _bACnetStatusFlagsTagged;
-    _bACnetStatusFlagsTagged = new BACnetStatusFlagsTagged(header, payload, tagNumber, tagClass);
+    _bACnetStatusFlagsTagged = new BACnetStatusFlagsTagged(header, payload);
     return _bACnetStatusFlagsTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagHeader.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagHeader.java
index 14ab583287c..9a41e21dc7c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagHeader.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagHeader.java
@@ -138,8 +138,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     writeSimpleField("lengthValueType", lengthValueType, writeUnsignedByte(writeBuffer, 3));
 
     // Optional Field (extTagNumber) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "extTagNumber", extTagNumber, writeUnsignedShort(writeBuffer, 8), (getTagNumber()) == (15));
+    writeOptionalField("extTagNumber", extTagNumber, writeUnsignedShort(writeBuffer, 8));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     short actualTagNumber = getActualTagNumber();
@@ -158,27 +157,13 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     writeBuffer.writeVirtual("isPrimitiveAndNotBoolean", isPrimitiveAndNotBoolean);
 
     // Optional Field (extLength) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "extLength",
-        extLength,
-        writeUnsignedShort(writeBuffer, 8),
-        (getIsPrimitiveAndNotBoolean()) && ((getLengthValueType()) == (5)));
+    writeOptionalField("extLength", extLength, writeUnsignedShort(writeBuffer, 8));
 
     // Optional Field (extExtLength) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "extExtLength",
-        extExtLength,
-        writeUnsignedInt(writeBuffer, 16),
-        ((getIsPrimitiveAndNotBoolean()) && ((getLengthValueType()) == (5)))
-            && ((getExtLength()) == (254)));
+    writeOptionalField("extExtLength", extExtLength, writeUnsignedInt(writeBuffer, 16));
 
     // Optional Field (extExtExtLength) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "extExtExtLength",
-        extExtExtLength,
-        writeUnsignedLong(writeBuffer, 32),
-        ((getIsPrimitiveAndNotBoolean()) && ((getLengthValueType()) == (5)))
-            && ((getExtLength()) == (255)));
+    writeOptionalField("extExtExtLength", extExtExtLength, writeUnsignedLong(writeBuffer, 32));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     long actualLength = getActualLength();
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadBitString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadBitString.java
index 335daf59aba..03f3fef2612 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadBitString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadBitString.java
@@ -42,16 +42,11 @@ public class BACnetTagPayloadBitString implements Message {
   protected final List<Boolean> data;
   protected final List<Boolean> unused;
 
-  // Arguments.
-  protected final Long actualLength;
-
-  public BACnetTagPayloadBitString(
-      short unusedBits, List<Boolean> data, List<Boolean> unused, Long actualLength) {
+  public BACnetTagPayloadBitString(short unusedBits, List<Boolean> data, List<Boolean> unused) {
     super();
     this.unusedBits = unusedBits;
     this.data = data;
     this.unused = unused;
-    this.actualLength = actualLength;
   }
 
   public short getUnusedBits() {
@@ -127,8 +122,7 @@ public static BACnetTagPayloadBitString staticParse(ReadBuffer readBuffer, Long
     readBuffer.closeContext("BACnetTagPayloadBitString");
     // Create the instance
     BACnetTagPayloadBitString _bACnetTagPayloadBitString;
-    _bACnetTagPayloadBitString =
-        new BACnetTagPayloadBitString(unusedBits, data, unused, actualLength);
+    _bACnetTagPayloadBitString = new BACnetTagPayloadBitString(unusedBits, data, unused);
     return _bACnetTagPayloadBitString;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadBoolean.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadBoolean.java
index 9115cc988ac..f50aec3165a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadBoolean.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadBoolean.java
@@ -37,14 +37,18 @@
 
 public class BACnetTagPayloadBoolean implements Message {
 
-  // Arguments.
-  protected final Long actualLength;
+  // Properties.
+  protected final long actualLength;
 
-  public BACnetTagPayloadBoolean(Long actualLength) {
+  public BACnetTagPayloadBoolean(long actualLength) {
     super();
     this.actualLength = actualLength;
   }
 
+  public long getActualLength() {
+    return actualLength;
+  }
+
   public boolean getValue() {
     return (boolean) ((actualLength) == (1));
   }
@@ -110,7 +114,6 @@ public static BACnetTagPayloadBoolean staticParse(ReadBuffer readBuffer, Long ac
     // Create the instance
     BACnetTagPayloadBoolean _bACnetTagPayloadBoolean;
     _bACnetTagPayloadBoolean = new BACnetTagPayloadBoolean(actualLength);
-
     return _bACnetTagPayloadBoolean;
   }
 
@@ -123,12 +126,12 @@ public boolean equals(Object o) {
       return false;
     }
     BACnetTagPayloadBoolean that = (BACnetTagPayloadBoolean) o;
-    return true;
+    return (getActualLength() == that.getActualLength()) && true;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash();
+    return Objects.hash(getActualLength());
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadCharacterString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadCharacterString.java
index fd0b60b114f..830c78408b6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadCharacterString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadCharacterString.java
@@ -38,18 +38,20 @@
 public class BACnetTagPayloadCharacterString implements Message {
 
   // Properties.
+  protected final long actualLength;
   protected final BACnetCharacterEncoding encoding;
   protected final String value;
 
-  // Arguments.
-  protected final Long actualLength;
-
   public BACnetTagPayloadCharacterString(
-      BACnetCharacterEncoding encoding, String value, Long actualLength) {
+      long actualLength, BACnetCharacterEncoding encoding, String value) {
     super();
+    this.actualLength = actualLength;
     this.encoding = encoding;
     this.value = value;
-    this.actualLength = actualLength;
+  }
+
+  public long getActualLength() {
+    return actualLength;
   }
 
   public BACnetCharacterEncoding getEncoding() {
@@ -137,7 +139,7 @@ public static BACnetTagPayloadCharacterString staticParse(
     // Create the instance
     BACnetTagPayloadCharacterString _bACnetTagPayloadCharacterString;
     _bACnetTagPayloadCharacterString =
-        new BACnetTagPayloadCharacterString(encoding, value, actualLength);
+        new BACnetTagPayloadCharacterString(actualLength, encoding, value);
     return _bACnetTagPayloadCharacterString;
   }
 
@@ -150,12 +152,15 @@ public boolean equals(Object o) {
       return false;
     }
     BACnetTagPayloadCharacterString that = (BACnetTagPayloadCharacterString) o;
-    return (getEncoding() == that.getEncoding()) && (getValue() == that.getValue()) && true;
+    return (getActualLength() == that.getActualLength())
+        && (getEncoding() == that.getEncoding())
+        && (getValue() == that.getValue())
+        && true;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(getEncoding(), getValue());
+    return Objects.hash(getActualLength(), getEncoding(), getValue());
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadEnumerated.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadEnumerated.java
index 180a0c8a9bd..df03ff8da4a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadEnumerated.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadEnumerated.java
@@ -40,13 +40,9 @@ public class BACnetTagPayloadEnumerated implements Message {
   // Properties.
   protected final byte[] data;
 
-  // Arguments.
-  protected final Long actualLength;
-
-  public BACnetTagPayloadEnumerated(byte[] data, Long actualLength) {
+  public BACnetTagPayloadEnumerated(byte[] data) {
     super();
     this.data = data;
-    this.actualLength = actualLength;
   }
 
   public byte[] getData() {
@@ -110,7 +106,7 @@ public static BACnetTagPayloadEnumerated staticParse(ReadBuffer readBuffer, Long
     readBuffer.closeContext("BACnetTagPayloadEnumerated");
     // Create the instance
     BACnetTagPayloadEnumerated _bACnetTagPayloadEnumerated;
-    _bACnetTagPayloadEnumerated = new BACnetTagPayloadEnumerated(data, actualLength);
+    _bACnetTagPayloadEnumerated = new BACnetTagPayloadEnumerated(data);
     return _bACnetTagPayloadEnumerated;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadOctetString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadOctetString.java
index f638de3762b..b4230b11114 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadOctetString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadOctetString.java
@@ -40,13 +40,9 @@ public class BACnetTagPayloadOctetString implements Message {
   // Properties.
   protected final byte[] octets;
 
-  // Arguments.
-  protected final Long actualLength;
-
-  public BACnetTagPayloadOctetString(byte[] octets, Long actualLength) {
+  public BACnetTagPayloadOctetString(byte[] octets) {
     super();
     this.octets = octets;
-    this.actualLength = actualLength;
   }
 
   public byte[] getOctets() {
@@ -94,7 +90,7 @@ public static BACnetTagPayloadOctetString staticParse(ReadBuffer readBuffer, Lon
     readBuffer.closeContext("BACnetTagPayloadOctetString");
     // Create the instance
     BACnetTagPayloadOctetString _bACnetTagPayloadOctetString;
-    _bACnetTagPayloadOctetString = new BACnetTagPayloadOctetString(octets, actualLength);
+    _bACnetTagPayloadOctetString = new BACnetTagPayloadOctetString(octets);
     return _bACnetTagPayloadOctetString;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadSignedInteger.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadSignedInteger.java
index ffe64c2f7e7..9ef9dc72926 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadSignedInteger.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadSignedInteger.java
@@ -39,6 +39,7 @@
 public class BACnetTagPayloadSignedInteger implements Message {
 
   // Properties.
+  protected final long actualLength;
   protected final Byte valueInt8;
   protected final Short valueInt16;
   protected final Integer valueInt24;
@@ -48,10 +49,8 @@ public class BACnetTagPayloadSignedInteger implements Message {
   protected final Long valueInt56;
   protected final Long valueInt64;
 
-  // Arguments.
-  protected final Long actualLength;
-
   public BACnetTagPayloadSignedInteger(
+      long actualLength,
       Byte valueInt8,
       Short valueInt16,
       Integer valueInt24,
@@ -59,9 +58,9 @@ public BACnetTagPayloadSignedInteger(
       Long valueInt40,
       Long valueInt48,
       Long valueInt56,
-      Long valueInt64,
-      Long actualLength) {
+      Long valueInt64) {
     super();
+    this.actualLength = actualLength;
     this.valueInt8 = valueInt8;
     this.valueInt16 = valueInt16;
     this.valueInt24 = valueInt24;
@@ -70,7 +69,10 @@ public BACnetTagPayloadSignedInteger(
     this.valueInt48 = valueInt48;
     this.valueInt56 = valueInt56;
     this.valueInt64 = valueInt64;
-    this.actualLength = actualLength;
+  }
+
+  public long getActualLength() {
+    return actualLength;
   }
 
   public Byte getValueInt8() {
@@ -166,56 +168,56 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     writeBuffer.writeVirtual("isInt8", isInt8);
 
     // Optional Field (valueInt8) (Can be skipped, if the value is null)
-    writeOptionalField("valueInt8", valueInt8, writeSignedByte(writeBuffer, 8), getIsInt8());
+    writeOptionalField("valueInt8", valueInt8, writeSignedByte(writeBuffer, 8));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     boolean isInt16 = getIsInt16();
     writeBuffer.writeVirtual("isInt16", isInt16);
 
     // Optional Field (valueInt16) (Can be skipped, if the value is null)
-    writeOptionalField("valueInt16", valueInt16, writeSignedShort(writeBuffer, 16), getIsInt16());
+    writeOptionalField("valueInt16", valueInt16, writeSignedShort(writeBuffer, 16));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     boolean isInt24 = getIsInt24();
     writeBuffer.writeVirtual("isInt24", isInt24);
 
     // Optional Field (valueInt24) (Can be skipped, if the value is null)
-    writeOptionalField("valueInt24", valueInt24, writeSignedInt(writeBuffer, 24), getIsInt24());
+    writeOptionalField("valueInt24", valueInt24, writeSignedInt(writeBuffer, 24));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     boolean isInt32 = getIsInt32();
     writeBuffer.writeVirtual("isInt32", isInt32);
 
     // Optional Field (valueInt32) (Can be skipped, if the value is null)
-    writeOptionalField("valueInt32", valueInt32, writeSignedInt(writeBuffer, 32), getIsInt32());
+    writeOptionalField("valueInt32", valueInt32, writeSignedInt(writeBuffer, 32));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     boolean isInt40 = getIsInt40();
     writeBuffer.writeVirtual("isInt40", isInt40);
 
     // Optional Field (valueInt40) (Can be skipped, if the value is null)
-    writeOptionalField("valueInt40", valueInt40, writeSignedLong(writeBuffer, 40), getIsInt40());
+    writeOptionalField("valueInt40", valueInt40, writeSignedLong(writeBuffer, 40));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     boolean isInt48 = getIsInt48();
     writeBuffer.writeVirtual("isInt48", isInt48);
 
     // Optional Field (valueInt48) (Can be skipped, if the value is null)
-    writeOptionalField("valueInt48", valueInt48, writeSignedLong(writeBuffer, 48), getIsInt48());
+    writeOptionalField("valueInt48", valueInt48, writeSignedLong(writeBuffer, 48));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     boolean isInt56 = getIsInt56();
     writeBuffer.writeVirtual("isInt56", isInt56);
 
     // Optional Field (valueInt56) (Can be skipped, if the value is null)
-    writeOptionalField("valueInt56", valueInt56, writeSignedLong(writeBuffer, 56), getIsInt56());
+    writeOptionalField("valueInt56", valueInt56, writeSignedLong(writeBuffer, 56));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     boolean isInt64 = getIsInt64();
     writeBuffer.writeVirtual("isInt64", isInt64);
 
     // Optional Field (valueInt64) (Can be skipped, if the value is null)
-    writeOptionalField("valueInt64", valueInt64, writeSignedLong(writeBuffer, 64), getIsInt64());
+    writeOptionalField("valueInt64", valueInt64, writeSignedLong(writeBuffer, 64));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     BigInteger actualValue = getActualValue();
@@ -354,6 +356,7 @@ public static BACnetTagPayloadSignedInteger staticParse(ReadBuffer readBuffer, L
     BACnetTagPayloadSignedInteger _bACnetTagPayloadSignedInteger;
     _bACnetTagPayloadSignedInteger =
         new BACnetTagPayloadSignedInteger(
+            actualLength,
             valueInt8,
             valueInt16,
             valueInt24,
@@ -361,8 +364,7 @@ public static BACnetTagPayloadSignedInteger staticParse(ReadBuffer readBuffer, L
             valueInt40,
             valueInt48,
             valueInt56,
-            valueInt64,
-            actualLength);
+            valueInt64);
     return _bACnetTagPayloadSignedInteger;
   }
 
@@ -375,7 +377,8 @@ public boolean equals(Object o) {
       return false;
     }
     BACnetTagPayloadSignedInteger that = (BACnetTagPayloadSignedInteger) o;
-    return (getValueInt8() == that.getValueInt8())
+    return (getActualLength() == that.getActualLength())
+        && (getValueInt8() == that.getValueInt8())
         && (getValueInt16() == that.getValueInt16())
         && (getValueInt24() == that.getValueInt24())
         && (getValueInt32() == that.getValueInt32())
@@ -389,6 +392,7 @@ public boolean equals(Object o) {
   @Override
   public int hashCode() {
     return Objects.hash(
+        getActualLength(),
         getValueInt8(),
         getValueInt16(),
         getValueInt24(),
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadUnsignedInteger.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadUnsignedInteger.java
index 3e0533d85d7..9050aee71e2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadUnsignedInteger.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadUnsignedInteger.java
@@ -39,6 +39,7 @@
 public class BACnetTagPayloadUnsignedInteger implements Message {
 
   // Properties.
+  protected final long actualLength;
   protected final Short valueUint8;
   protected final Integer valueUint16;
   protected final Integer valueUint24;
@@ -48,10 +49,8 @@ public class BACnetTagPayloadUnsignedInteger implements Message {
   protected final Long valueUint56;
   protected final BigInteger valueUint64;
 
-  // Arguments.
-  protected final Long actualLength;
-
   public BACnetTagPayloadUnsignedInteger(
+      long actualLength,
       Short valueUint8,
       Integer valueUint16,
       Integer valueUint24,
@@ -59,9 +58,9 @@ public BACnetTagPayloadUnsignedInteger(
       Long valueUint40,
       Long valueUint48,
       Long valueUint56,
-      BigInteger valueUint64,
-      Long actualLength) {
+      BigInteger valueUint64) {
     super();
+    this.actualLength = actualLength;
     this.valueUint8 = valueUint8;
     this.valueUint16 = valueUint16;
     this.valueUint24 = valueUint24;
@@ -70,7 +69,10 @@ public BACnetTagPayloadUnsignedInteger(
     this.valueUint48 = valueUint48;
     this.valueUint56 = valueUint56;
     this.valueUint64 = valueUint64;
-    this.actualLength = actualLength;
+  }
+
+  public long getActualLength() {
+    return actualLength;
   }
 
   public Short getValueUint8() {
@@ -168,63 +170,56 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     writeBuffer.writeVirtual("isUint8", isUint8);
 
     // Optional Field (valueUint8) (Can be skipped, if the value is null)
-    writeOptionalField("valueUint8", valueUint8, writeUnsignedShort(writeBuffer, 8), getIsUint8());
+    writeOptionalField("valueUint8", valueUint8, writeUnsignedShort(writeBuffer, 8));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     boolean isUint16 = getIsUint16();
     writeBuffer.writeVirtual("isUint16", isUint16);
 
     // Optional Field (valueUint16) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "valueUint16", valueUint16, writeUnsignedInt(writeBuffer, 16), getIsUint16());
+    writeOptionalField("valueUint16", valueUint16, writeUnsignedInt(writeBuffer, 16));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     boolean isUint24 = getIsUint24();
     writeBuffer.writeVirtual("isUint24", isUint24);
 
     // Optional Field (valueUint24) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "valueUint24", valueUint24, writeUnsignedInt(writeBuffer, 24), getIsUint24());
+    writeOptionalField("valueUint24", valueUint24, writeUnsignedInt(writeBuffer, 24));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     boolean isUint32 = getIsUint32();
     writeBuffer.writeVirtual("isUint32", isUint32);
 
     // Optional Field (valueUint32) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "valueUint32", valueUint32, writeUnsignedLong(writeBuffer, 32), getIsUint32());
+    writeOptionalField("valueUint32", valueUint32, writeUnsignedLong(writeBuffer, 32));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     boolean isUint40 = getIsUint40();
     writeBuffer.writeVirtual("isUint40", isUint40);
 
     // Optional Field (valueUint40) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "valueUint40", valueUint40, writeUnsignedLong(writeBuffer, 40), getIsUint40());
+    writeOptionalField("valueUint40", valueUint40, writeUnsignedLong(writeBuffer, 40));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     boolean isUint48 = getIsUint48();
     writeBuffer.writeVirtual("isUint48", isUint48);
 
     // Optional Field (valueUint48) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "valueUint48", valueUint48, writeUnsignedLong(writeBuffer, 48), getIsUint48());
+    writeOptionalField("valueUint48", valueUint48, writeUnsignedLong(writeBuffer, 48));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     boolean isUint56 = getIsUint56();
     writeBuffer.writeVirtual("isUint56", isUint56);
 
     // Optional Field (valueUint56) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "valueUint56", valueUint56, writeUnsignedLong(writeBuffer, 56), getIsUint56());
+    writeOptionalField("valueUint56", valueUint56, writeUnsignedLong(writeBuffer, 56));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     boolean isUint64 = getIsUint64();
     writeBuffer.writeVirtual("isUint64", isUint64);
 
     // Optional Field (valueUint64) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "valueUint64", valueUint64, writeUnsignedBigInteger(writeBuffer, 64), getIsUint64());
+    writeOptionalField("valueUint64", valueUint64, writeUnsignedBigInteger(writeBuffer, 64));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     BigInteger actualValue = getActualValue();
@@ -366,6 +361,7 @@ public static BACnetTagPayloadUnsignedInteger staticParse(
     BACnetTagPayloadUnsignedInteger _bACnetTagPayloadUnsignedInteger;
     _bACnetTagPayloadUnsignedInteger =
         new BACnetTagPayloadUnsignedInteger(
+            actualLength,
             valueUint8,
             valueUint16,
             valueUint24,
@@ -373,8 +369,7 @@ public static BACnetTagPayloadUnsignedInteger staticParse(
             valueUint40,
             valueUint48,
             valueUint56,
-            valueUint64,
-            actualLength);
+            valueUint64);
     return _bACnetTagPayloadUnsignedInteger;
   }
 
@@ -387,7 +382,8 @@ public boolean equals(Object o) {
       return false;
     }
     BACnetTagPayloadUnsignedInteger that = (BACnetTagPayloadUnsignedInteger) o;
-    return (getValueUint8() == that.getValueUint8())
+    return (getActualLength() == that.getActualLength())
+        && (getValueUint8() == that.getValueUint8())
         && (getValueUint16() == that.getValueUint16())
         && (getValueUint24() == that.getValueUint24())
         && (getValueUint32() == that.getValueUint32())
@@ -401,6 +397,7 @@ public boolean equals(Object o) {
   @Override
   public int hashCode() {
     return Objects.hash(
+        getActualLength(),
         getValueUint8(),
         getValueUint16(),
         getValueUint24(),
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimeStampEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimeStampEnclosed.java
index ad16b012915..5cb93213d18 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimeStampEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimeStampEnclosed.java
@@ -42,19 +42,12 @@ public class BACnetTimeStampEnclosed implements Message {
   protected final BACnetTimeStamp timestamp;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetTimeStampEnclosed(
-      BACnetOpeningTag openingTag,
-      BACnetTimeStamp timestamp,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, BACnetTimeStamp timestamp, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.timestamp = timestamp;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -134,8 +127,7 @@ public static BACnetTimeStampEnclosed staticParse(ReadBuffer readBuffer, Short t
     readBuffer.closeContext("BACnetTimeStampEnclosed");
     // Create the instance
     BACnetTimeStampEnclosed _bACnetTimeStampEnclosed;
-    _bACnetTimeStampEnclosed =
-        new BACnetTimeStampEnclosed(openingTag, timestamp, closingTag, tagNumber);
+    _bACnetTimeStampEnclosed = new BACnetTimeStampEnclosed(openingTag, timestamp, closingTag);
     return _bACnetTimeStampEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimeStampsEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimeStampsEnclosed.java
index 5d5fbe5a5f8..d922da78860 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimeStampsEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimeStampsEnclosed.java
@@ -42,19 +42,12 @@ public class BACnetTimeStampsEnclosed implements Message {
   protected final List<BACnetTimeStamp> timestamps;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public BACnetTimeStampsEnclosed(
-      BACnetOpeningTag openingTag,
-      List<BACnetTimeStamp> timestamps,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetOpeningTag openingTag, List<BACnetTimeStamp> timestamps, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.timestamps = timestamps;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -143,8 +136,7 @@ public static BACnetTimeStampsEnclosed staticParse(ReadBuffer readBuffer, Short
     readBuffer.closeContext("BACnetTimeStampsEnclosed");
     // Create the instance
     BACnetTimeStampsEnclosed _bACnetTimeStampsEnclosed;
-    _bACnetTimeStampsEnclosed =
-        new BACnetTimeStampsEnclosed(openingTag, timestamps, closingTag, tagNumber);
+    _bACnetTimeStampsEnclosed = new BACnetTimeStampsEnclosed(openingTag, timestamps, closingTag);
     return _bACnetTimeStampsEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValue.java
index ec651e08bc4..41715fe2d0d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValue.java
@@ -42,14 +42,9 @@ public abstract class BACnetTimerStateChangeValue implements Message {
   // Properties.
   protected final BACnetTagHeader peekedTagHeader;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
-  public BACnetTimerStateChangeValue(
-      BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+  public BACnetTimerStateChangeValue(BACnetTagHeader peekedTagHeader) {
     super();
     this.peekedTagHeader = peekedTagHeader;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetTagHeader getPeekedTagHeader() {
@@ -232,14 +227,12 @@ public static BACnetTimerStateChangeValue staticParse(
 
     readBuffer.closeContext("BACnetTimerStateChangeValue");
     // Create the instance
-    BACnetTimerStateChangeValue _bACnetTimerStateChangeValue =
-        builder.build(peekedTagHeader, objectTypeArgument);
+    BACnetTimerStateChangeValue _bACnetTimerStateChangeValue = builder.build(peekedTagHeader);
     return _bACnetTimerStateChangeValue;
   }
 
   public interface BACnetTimerStateChangeValueBuilder {
-    BACnetTimerStateChangeValue build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument);
+    BACnetTimerStateChangeValue build(BACnetTagHeader peekedTagHeader);
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueBitString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueBitString.java
index df9af711f42..09f8bc6de61 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueBitString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueBitString.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueBitString extends BACnetTimerStateChange
   // Properties.
   protected final BACnetApplicationTagBitString bitStringValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueBitString(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagBitString bitStringValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagBitString bitStringValue) {
+    super(peekedTagHeader);
     this.bitStringValue = bitStringValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagBitString getBitStringValue() {
@@ -104,25 +98,21 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueBitString");
     // Create the instance
-    return new BACnetTimerStateChangeValueBitStringBuilderImpl(bitStringValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueBitStringBuilderImpl(bitStringValue);
   }
 
   public static class BACnetTimerStateChangeValueBitStringBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetApplicationTagBitString bitStringValue;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetTimerStateChangeValueBitStringBuilderImpl(
-        BACnetApplicationTagBitString bitStringValue, BACnetObjectType objectTypeArgument) {
+        BACnetApplicationTagBitString bitStringValue) {
       this.bitStringValue = bitStringValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueBitString build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueBitString build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueBitString bACnetTimerStateChangeValueBitString =
-          new BACnetTimerStateChangeValueBitString(
-              peekedTagHeader, bitStringValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueBitString(peekedTagHeader, bitStringValue);
       return bACnetTimerStateChangeValueBitString;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueBoolean.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueBoolean.java
index 1ff8004120e..d9baae1d159 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueBoolean.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueBoolean.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueBoolean extends BACnetTimerStateChangeVa
   // Properties.
   protected final BACnetApplicationTagBoolean booleanValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueBoolean(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagBoolean booleanValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagBoolean booleanValue) {
+    super(peekedTagHeader);
     this.booleanValue = booleanValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagBoolean getBooleanValue() {
@@ -104,24 +98,20 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueBoolean");
     // Create the instance
-    return new BACnetTimerStateChangeValueBooleanBuilderImpl(booleanValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueBooleanBuilderImpl(booleanValue);
   }
 
   public static class BACnetTimerStateChangeValueBooleanBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetApplicationTagBoolean booleanValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetTimerStateChangeValueBooleanBuilderImpl(
-        BACnetApplicationTagBoolean booleanValue, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueBooleanBuilderImpl(BACnetApplicationTagBoolean booleanValue) {
       this.booleanValue = booleanValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueBoolean build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueBoolean build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueBoolean bACnetTimerStateChangeValueBoolean =
-          new BACnetTimerStateChangeValueBoolean(peekedTagHeader, booleanValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueBoolean(peekedTagHeader, booleanValue);
       return bACnetTimerStateChangeValueBoolean;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueCharacterString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueCharacterString.java
index 240f4380b44..da51e467fb3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueCharacterString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueCharacterString.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueCharacterString extends BACnetTimerState
   // Properties.
   protected final BACnetApplicationTagCharacterString characterStringValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueCharacterString(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagCharacterString characterStringValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagCharacterString characterStringValue) {
+    super(peekedTagHeader);
     this.characterStringValue = characterStringValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagCharacterString getCharacterStringValue() {
@@ -106,27 +100,21 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueCharacterString");
     // Create the instance
-    return new BACnetTimerStateChangeValueCharacterStringBuilderImpl(
-        characterStringValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueCharacterStringBuilderImpl(characterStringValue);
   }
 
   public static class BACnetTimerStateChangeValueCharacterStringBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetApplicationTagCharacterString characterStringValue;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetTimerStateChangeValueCharacterStringBuilderImpl(
-        BACnetApplicationTagCharacterString characterStringValue,
-        BACnetObjectType objectTypeArgument) {
+        BACnetApplicationTagCharacterString characterStringValue) {
       this.characterStringValue = characterStringValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueCharacterString build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueCharacterString build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueCharacterString bACnetTimerStateChangeValueCharacterString =
-          new BACnetTimerStateChangeValueCharacterString(
-              peekedTagHeader, characterStringValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueCharacterString(peekedTagHeader, characterStringValue);
       return bACnetTimerStateChangeValueCharacterString;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueConstructedValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueConstructedValue.java
index 2e3b4d65342..f84768ba0b5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueConstructedValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueConstructedValue.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueConstructedValue extends BACnetTimerStat
   // Properties.
   protected final BACnetConstructedData constructedValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueConstructedValue(
-      BACnetTagHeader peekedTagHeader,
-      BACnetConstructedData constructedValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetConstructedData constructedValue) {
+    super(peekedTagHeader);
     this.constructedValue = constructedValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetConstructedData getConstructedValue() {
@@ -111,26 +105,21 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueConstructedValue");
     // Create the instance
-    return new BACnetTimerStateChangeValueConstructedValueBuilderImpl(
-        constructedValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueConstructedValueBuilderImpl(constructedValue);
   }
 
   public static class BACnetTimerStateChangeValueConstructedValueBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetConstructedData constructedValue;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetTimerStateChangeValueConstructedValueBuilderImpl(
-        BACnetConstructedData constructedValue, BACnetObjectType objectTypeArgument) {
+        BACnetConstructedData constructedValue) {
       this.constructedValue = constructedValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueConstructedValue build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueConstructedValue build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueConstructedValue bACnetTimerStateChangeValueConstructedValue =
-          new BACnetTimerStateChangeValueConstructedValue(
-              peekedTagHeader, constructedValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueConstructedValue(peekedTagHeader, constructedValue);
       return bACnetTimerStateChangeValueConstructedValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueDate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueDate.java
index 0c3bb476d7a..3b48d681cfd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueDate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueDate.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueDate extends BACnetTimerStateChangeValue
   // Properties.
   protected final BACnetApplicationTagDate dateValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueDate(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagDate dateValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagDate dateValue) {
+    super(peekedTagHeader);
     this.dateValue = dateValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagDate getDateValue() {
@@ -104,24 +98,20 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueDate");
     // Create the instance
-    return new BACnetTimerStateChangeValueDateBuilderImpl(dateValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueDateBuilderImpl(dateValue);
   }
 
   public static class BACnetTimerStateChangeValueDateBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetApplicationTagDate dateValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetTimerStateChangeValueDateBuilderImpl(
-        BACnetApplicationTagDate dateValue, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueDateBuilderImpl(BACnetApplicationTagDate dateValue) {
       this.dateValue = dateValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueDate build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueDate build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueDate bACnetTimerStateChangeValueDate =
-          new BACnetTimerStateChangeValueDate(peekedTagHeader, dateValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueDate(peekedTagHeader, dateValue);
       return bACnetTimerStateChangeValueDate;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueDateTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueDateTime.java
index 99050450321..476601c5adc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueDateTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueDateTime.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueDateTime extends BACnetTimerStateChangeV
   // Properties.
   protected final BACnetDateTimeEnclosed dateTimeValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueDateTime(
-      BACnetTagHeader peekedTagHeader,
-      BACnetDateTimeEnclosed dateTimeValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetDateTimeEnclosed dateTimeValue) {
+    super(peekedTagHeader);
     this.dateTimeValue = dateTimeValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetDateTimeEnclosed getDateTimeValue() {
@@ -103,25 +97,20 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueDateTime");
     // Create the instance
-    return new BACnetTimerStateChangeValueDateTimeBuilderImpl(dateTimeValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueDateTimeBuilderImpl(dateTimeValue);
   }
 
   public static class BACnetTimerStateChangeValueDateTimeBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetDateTimeEnclosed dateTimeValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetTimerStateChangeValueDateTimeBuilderImpl(
-        BACnetDateTimeEnclosed dateTimeValue, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueDateTimeBuilderImpl(BACnetDateTimeEnclosed dateTimeValue) {
       this.dateTimeValue = dateTimeValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueDateTime build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueDateTime build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueDateTime bACnetTimerStateChangeValueDateTime =
-          new BACnetTimerStateChangeValueDateTime(
-              peekedTagHeader, dateTimeValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueDateTime(peekedTagHeader, dateTimeValue);
       return bACnetTimerStateChangeValueDateTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueDouble.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueDouble.java
index 36a59417ad1..b39a1e103d3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueDouble.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueDouble.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueDouble extends BACnetTimerStateChangeVal
   // Properties.
   protected final BACnetApplicationTagDouble doubleValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueDouble(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagDouble doubleValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagDouble doubleValue) {
+    super(peekedTagHeader);
     this.doubleValue = doubleValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagDouble getDoubleValue() {
@@ -104,24 +98,20 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueDouble");
     // Create the instance
-    return new BACnetTimerStateChangeValueDoubleBuilderImpl(doubleValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueDoubleBuilderImpl(doubleValue);
   }
 
   public static class BACnetTimerStateChangeValueDoubleBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetApplicationTagDouble doubleValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetTimerStateChangeValueDoubleBuilderImpl(
-        BACnetApplicationTagDouble doubleValue, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueDoubleBuilderImpl(BACnetApplicationTagDouble doubleValue) {
       this.doubleValue = doubleValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueDouble build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueDouble build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueDouble bACnetTimerStateChangeValueDouble =
-          new BACnetTimerStateChangeValueDouble(peekedTagHeader, doubleValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueDouble(peekedTagHeader, doubleValue);
       return bACnetTimerStateChangeValueDouble;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueEnumerated.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueEnumerated.java
index c35eefee699..e460250e069 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueEnumerated.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueEnumerated.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueEnumerated extends BACnetTimerStateChang
   // Properties.
   protected final BACnetApplicationTagEnumerated enumeratedValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueEnumerated(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagEnumerated enumeratedValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagEnumerated enumeratedValue) {
+    super(peekedTagHeader);
     this.enumeratedValue = enumeratedValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagEnumerated getEnumeratedValue() {
@@ -104,26 +98,21 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueEnumerated");
     // Create the instance
-    return new BACnetTimerStateChangeValueEnumeratedBuilderImpl(
-        enumeratedValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueEnumeratedBuilderImpl(enumeratedValue);
   }
 
   public static class BACnetTimerStateChangeValueEnumeratedBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetApplicationTagEnumerated enumeratedValue;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetTimerStateChangeValueEnumeratedBuilderImpl(
-        BACnetApplicationTagEnumerated enumeratedValue, BACnetObjectType objectTypeArgument) {
+        BACnetApplicationTagEnumerated enumeratedValue) {
       this.enumeratedValue = enumeratedValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueEnumerated build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueEnumerated build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueEnumerated bACnetTimerStateChangeValueEnumerated =
-          new BACnetTimerStateChangeValueEnumerated(
-              peekedTagHeader, enumeratedValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueEnumerated(peekedTagHeader, enumeratedValue);
       return bACnetTimerStateChangeValueEnumerated;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueInteger.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueInteger.java
index b8dbbeb860b..2d8681305df 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueInteger.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueInteger.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueInteger extends BACnetTimerStateChangeVa
   // Properties.
   protected final BACnetApplicationTagSignedInteger integerValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueInteger(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagSignedInteger integerValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagSignedInteger integerValue) {
+    super(peekedTagHeader);
     this.integerValue = integerValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagSignedInteger getIntegerValue() {
@@ -106,24 +100,21 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueInteger");
     // Create the instance
-    return new BACnetTimerStateChangeValueIntegerBuilderImpl(integerValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueIntegerBuilderImpl(integerValue);
   }
 
   public static class BACnetTimerStateChangeValueIntegerBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetApplicationTagSignedInteger integerValue;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetTimerStateChangeValueIntegerBuilderImpl(
-        BACnetApplicationTagSignedInteger integerValue, BACnetObjectType objectTypeArgument) {
+        BACnetApplicationTagSignedInteger integerValue) {
       this.integerValue = integerValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueInteger build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueInteger build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueInteger bACnetTimerStateChangeValueInteger =
-          new BACnetTimerStateChangeValueInteger(peekedTagHeader, integerValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueInteger(peekedTagHeader, integerValue);
       return bACnetTimerStateChangeValueInteger;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueLightingCommand.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueLightingCommand.java
index c7dae17e9f8..7913799bd4f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueLightingCommand.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueLightingCommand.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueLightingCommand extends BACnetTimerState
   // Properties.
   protected final BACnetLightingCommandEnclosed ligthingCommandValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueLightingCommand(
-      BACnetTagHeader peekedTagHeader,
-      BACnetLightingCommandEnclosed ligthingCommandValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetLightingCommandEnclosed ligthingCommandValue) {
+    super(peekedTagHeader);
     this.ligthingCommandValue = ligthingCommandValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetLightingCommandEnclosed getLigthingCommandValue() {
@@ -104,26 +98,21 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueLightingCommand");
     // Create the instance
-    return new BACnetTimerStateChangeValueLightingCommandBuilderImpl(
-        ligthingCommandValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueLightingCommandBuilderImpl(ligthingCommandValue);
   }
 
   public static class BACnetTimerStateChangeValueLightingCommandBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetLightingCommandEnclosed ligthingCommandValue;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetTimerStateChangeValueLightingCommandBuilderImpl(
-        BACnetLightingCommandEnclosed ligthingCommandValue, BACnetObjectType objectTypeArgument) {
+        BACnetLightingCommandEnclosed ligthingCommandValue) {
       this.ligthingCommandValue = ligthingCommandValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueLightingCommand build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueLightingCommand build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueLightingCommand bACnetTimerStateChangeValueLightingCommand =
-          new BACnetTimerStateChangeValueLightingCommand(
-              peekedTagHeader, ligthingCommandValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueLightingCommand(peekedTagHeader, ligthingCommandValue);
       return bACnetTimerStateChangeValueLightingCommand;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueNoValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueNoValue.java
index 26dec7bd0fc..f26a4d06ec5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueNoValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueNoValue.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueNoValue extends BACnetTimerStateChangeVa
   // Properties.
   protected final BACnetContextTagNull noValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueNoValue(
-      BACnetTagHeader peekedTagHeader,
-      BACnetContextTagNull noValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetContextTagNull noValue) {
+    super(peekedTagHeader);
     this.noValue = noValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetContextTagNull getNoValue() {
@@ -107,24 +101,20 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueNoValue");
     // Create the instance
-    return new BACnetTimerStateChangeValueNoValueBuilderImpl(noValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueNoValueBuilderImpl(noValue);
   }
 
   public static class BACnetTimerStateChangeValueNoValueBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetContextTagNull noValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetTimerStateChangeValueNoValueBuilderImpl(
-        BACnetContextTagNull noValue, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueNoValueBuilderImpl(BACnetContextTagNull noValue) {
       this.noValue = noValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueNoValue build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueNoValue build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueNoValue bACnetTimerStateChangeValueNoValue =
-          new BACnetTimerStateChangeValueNoValue(peekedTagHeader, noValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueNoValue(peekedTagHeader, noValue);
       return bACnetTimerStateChangeValueNoValue;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueNull.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueNull.java
index 55f7a93f6e8..e7dd40a1e99 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueNull.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueNull.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueNull extends BACnetTimerStateChangeValue
   // Properties.
   protected final BACnetApplicationTagNull nullValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueNull(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagNull nullValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagNull nullValue) {
+    super(peekedTagHeader);
     this.nullValue = nullValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagNull getNullValue() {
@@ -104,24 +98,20 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueNull");
     // Create the instance
-    return new BACnetTimerStateChangeValueNullBuilderImpl(nullValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueNullBuilderImpl(nullValue);
   }
 
   public static class BACnetTimerStateChangeValueNullBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetApplicationTagNull nullValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetTimerStateChangeValueNullBuilderImpl(
-        BACnetApplicationTagNull nullValue, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueNullBuilderImpl(BACnetApplicationTagNull nullValue) {
       this.nullValue = nullValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueNull build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueNull build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueNull bACnetTimerStateChangeValueNull =
-          new BACnetTimerStateChangeValueNull(peekedTagHeader, nullValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueNull(peekedTagHeader, nullValue);
       return bACnetTimerStateChangeValueNull;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueObjectidentifier.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueObjectidentifier.java
index 99798eb3dbd..7777f5e99af 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueObjectidentifier.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueObjectidentifier.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueObjectidentifier extends BACnetTimerStat
   // Properties.
   protected final BACnetApplicationTagObjectIdentifier objectidentifierValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueObjectidentifier(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagObjectIdentifier objectidentifierValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagObjectIdentifier objectidentifierValue) {
+    super(peekedTagHeader);
     this.objectidentifierValue = objectidentifierValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagObjectIdentifier getObjectidentifierValue() {
@@ -106,27 +100,21 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueObjectidentifier");
     // Create the instance
-    return new BACnetTimerStateChangeValueObjectidentifierBuilderImpl(
-        objectidentifierValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueObjectidentifierBuilderImpl(objectidentifierValue);
   }
 
   public static class BACnetTimerStateChangeValueObjectidentifierBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetApplicationTagObjectIdentifier objectidentifierValue;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetTimerStateChangeValueObjectidentifierBuilderImpl(
-        BACnetApplicationTagObjectIdentifier objectidentifierValue,
-        BACnetObjectType objectTypeArgument) {
+        BACnetApplicationTagObjectIdentifier objectidentifierValue) {
       this.objectidentifierValue = objectidentifierValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueObjectidentifier build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueObjectidentifier build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueObjectidentifier bACnetTimerStateChangeValueObjectidentifier =
-          new BACnetTimerStateChangeValueObjectidentifier(
-              peekedTagHeader, objectidentifierValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueObjectidentifier(peekedTagHeader, objectidentifierValue);
       return bACnetTimerStateChangeValueObjectidentifier;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueOctetString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueOctetString.java
index 8c7b1316712..a4a6818530d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueOctetString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueOctetString.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueOctetString extends BACnetTimerStateChan
   // Properties.
   protected final BACnetApplicationTagOctetString octetStringValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueOctetString(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagOctetString octetStringValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagOctetString octetStringValue) {
+    super(peekedTagHeader);
     this.octetStringValue = octetStringValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagOctetString getOctetStringValue() {
@@ -105,26 +99,21 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueOctetString");
     // Create the instance
-    return new BACnetTimerStateChangeValueOctetStringBuilderImpl(
-        octetStringValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueOctetStringBuilderImpl(octetStringValue);
   }
 
   public static class BACnetTimerStateChangeValueOctetStringBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetApplicationTagOctetString octetStringValue;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetTimerStateChangeValueOctetStringBuilderImpl(
-        BACnetApplicationTagOctetString octetStringValue, BACnetObjectType objectTypeArgument) {
+        BACnetApplicationTagOctetString octetStringValue) {
       this.octetStringValue = octetStringValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueOctetString build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueOctetString build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueOctetString bACnetTimerStateChangeValueOctetString =
-          new BACnetTimerStateChangeValueOctetString(
-              peekedTagHeader, octetStringValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueOctetString(peekedTagHeader, octetStringValue);
       return bACnetTimerStateChangeValueOctetString;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueReal.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueReal.java
index f9d8239f641..1f193b44a82 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueReal.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueReal.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueReal extends BACnetTimerStateChangeValue
   // Properties.
   protected final BACnetApplicationTagReal realValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueReal(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagReal realValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagReal realValue) {
+    super(peekedTagHeader);
     this.realValue = realValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagReal getRealValue() {
@@ -104,24 +98,20 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueReal");
     // Create the instance
-    return new BACnetTimerStateChangeValueRealBuilderImpl(realValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueRealBuilderImpl(realValue);
   }
 
   public static class BACnetTimerStateChangeValueRealBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetApplicationTagReal realValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetTimerStateChangeValueRealBuilderImpl(
-        BACnetApplicationTagReal realValue, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueRealBuilderImpl(BACnetApplicationTagReal realValue) {
       this.realValue = realValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueReal build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueReal build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueReal bACnetTimerStateChangeValueReal =
-          new BACnetTimerStateChangeValueReal(peekedTagHeader, realValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueReal(peekedTagHeader, realValue);
       return bACnetTimerStateChangeValueReal;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueTime.java
index ab9478b4142..8d32ccf98e2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueTime.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueTime extends BACnetTimerStateChangeValue
   // Properties.
   protected final BACnetApplicationTagTime timeValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueTime(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagTime timeValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagTime timeValue) {
+    super(peekedTagHeader);
     this.timeValue = timeValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagTime getTimeValue() {
@@ -104,24 +98,20 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueTime");
     // Create the instance
-    return new BACnetTimerStateChangeValueTimeBuilderImpl(timeValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueTimeBuilderImpl(timeValue);
   }
 
   public static class BACnetTimerStateChangeValueTimeBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetApplicationTagTime timeValue;
-    private final BACnetObjectType objectTypeArgument;
 
-    public BACnetTimerStateChangeValueTimeBuilderImpl(
-        BACnetApplicationTagTime timeValue, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueTimeBuilderImpl(BACnetApplicationTagTime timeValue) {
       this.timeValue = timeValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueTime build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueTime build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueTime bACnetTimerStateChangeValueTime =
-          new BACnetTimerStateChangeValueTime(peekedTagHeader, timeValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueTime(peekedTagHeader, timeValue);
       return bACnetTimerStateChangeValueTime;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueUnsigned.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueUnsigned.java
index 8b478913de0..ce8e36f986b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueUnsigned.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateChangeValueUnsigned.java
@@ -43,16 +43,10 @@ public class BACnetTimerStateChangeValueUnsigned extends BACnetTimerStateChangeV
   // Properties.
   protected final BACnetApplicationTagUnsignedInteger unsignedValue;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public BACnetTimerStateChangeValueUnsigned(
-      BACnetTagHeader peekedTagHeader,
-      BACnetApplicationTagUnsignedInteger unsignedValue,
-      BACnetObjectType objectTypeArgument) {
-    super(peekedTagHeader, objectTypeArgument);
+      BACnetTagHeader peekedTagHeader, BACnetApplicationTagUnsignedInteger unsignedValue) {
+    super(peekedTagHeader);
     this.unsignedValue = unsignedValue;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetApplicationTagUnsignedInteger getUnsignedValue() {
@@ -106,25 +100,21 @@ public static BACnetTimerStateChangeValueBuilder staticParseBACnetTimerStateChan
 
     readBuffer.closeContext("BACnetTimerStateChangeValueUnsigned");
     // Create the instance
-    return new BACnetTimerStateChangeValueUnsignedBuilderImpl(unsignedValue, objectTypeArgument);
+    return new BACnetTimerStateChangeValueUnsignedBuilderImpl(unsignedValue);
   }
 
   public static class BACnetTimerStateChangeValueUnsignedBuilderImpl
       implements BACnetTimerStateChangeValue.BACnetTimerStateChangeValueBuilder {
     private final BACnetApplicationTagUnsignedInteger unsignedValue;
-    private final BACnetObjectType objectTypeArgument;
 
     public BACnetTimerStateChangeValueUnsignedBuilderImpl(
-        BACnetApplicationTagUnsignedInteger unsignedValue, BACnetObjectType objectTypeArgument) {
+        BACnetApplicationTagUnsignedInteger unsignedValue) {
       this.unsignedValue = unsignedValue;
-      this.objectTypeArgument = objectTypeArgument;
     }
 
-    public BACnetTimerStateChangeValueUnsigned build(
-        BACnetTagHeader peekedTagHeader, BACnetObjectType objectTypeArgument) {
+    public BACnetTimerStateChangeValueUnsigned build(BACnetTagHeader peekedTagHeader) {
       BACnetTimerStateChangeValueUnsigned bACnetTimerStateChangeValueUnsigned =
-          new BACnetTimerStateChangeValueUnsigned(
-              peekedTagHeader, unsignedValue, objectTypeArgument);
+          new BACnetTimerStateChangeValueUnsigned(peekedTagHeader, unsignedValue);
       return bACnetTimerStateChangeValueUnsigned;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateTagged.java
index 2ed49309531..5433a0972a4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerStateTagged.java
@@ -41,17 +41,10 @@ public class BACnetTimerStateTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetTimerState value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetTimerStateTagged(
-      BACnetTagHeader header, BACnetTimerState value, Short tagNumber, TagClass tagClass) {
+  public BACnetTimerStateTagged(BACnetTagHeader header, BACnetTimerState value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetTimerStateTagged staticParse(
     readBuffer.closeContext("BACnetTimerStateTagged");
     // Create the instance
     BACnetTimerStateTagged _bACnetTimerStateTagged;
-    _bACnetTimerStateTagged = new BACnetTimerStateTagged(header, value, tagNumber, tagClass);
+    _bACnetTimerStateTagged = new BACnetTimerStateTagged(header, value);
     return _bACnetTimerStateTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerTransitionTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerTransitionTagged.java
index 22d1c70f663..f1c9e69caba 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerTransitionTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTimerTransitionTagged.java
@@ -41,17 +41,10 @@ public class BACnetTimerTransitionTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetTimerTransition value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetTimerTransitionTagged(
-      BACnetTagHeader header, BACnetTimerTransition value, Short tagNumber, TagClass tagClass) {
+  public BACnetTimerTransitionTagged(BACnetTagHeader header, BACnetTimerTransition value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,8 +126,7 @@ public static BACnetTimerTransitionTagged staticParse(
     readBuffer.closeContext("BACnetTimerTransitionTagged");
     // Create the instance
     BACnetTimerTransitionTagged _bACnetTimerTransitionTagged;
-    _bACnetTimerTransitionTagged =
-        new BACnetTimerTransitionTagged(header, value, tagNumber, tagClass);
+    _bACnetTimerTransitionTagged = new BACnetTimerTransitionTagged(header, value);
     return _bACnetTimerTransitionTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceChoiceTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceChoiceTagged.java
index 339f257b24d..35665b7c20d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceChoiceTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceChoiceTagged.java
@@ -41,20 +41,11 @@ public class BACnetUnconfirmedServiceChoiceTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetUnconfirmedServiceChoice value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetUnconfirmedServiceChoiceTagged(
-      BACnetTagHeader header,
-      BACnetUnconfirmedServiceChoice value,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, BACnetUnconfirmedServiceChoice value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -138,8 +129,7 @@ public static BACnetUnconfirmedServiceChoiceTagged staticParse(
     readBuffer.closeContext("BACnetUnconfirmedServiceChoiceTagged");
     // Create the instance
     BACnetUnconfirmedServiceChoiceTagged _bACnetUnconfirmedServiceChoiceTagged;
-    _bACnetUnconfirmedServiceChoiceTagged =
-        new BACnetUnconfirmedServiceChoiceTagged(header, value, tagNumber, tagClass);
+    _bACnetUnconfirmedServiceChoiceTagged = new BACnetUnconfirmedServiceChoiceTagged(header, value);
     return _bACnetUnconfirmedServiceChoiceTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequest.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequest.java
index 3b54eaf4f91..ae59222cdb8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequest.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequest.java
@@ -40,12 +40,8 @@ public abstract class BACnetUnconfirmedServiceRequest implements Message {
   // Abstract accessors for discriminator values.
   public abstract BACnetUnconfirmedServiceChoice getServiceChoice();
 
-  // Arguments.
-  protected final Integer serviceRequestLength;
-
-  public BACnetUnconfirmedServiceRequest(Integer serviceRequestLength) {
+  public BACnetUnconfirmedServiceRequest() {
     super();
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   protected abstract void serializeBACnetUnconfirmedServiceRequestChild(WriteBuffer writeBuffer)
@@ -177,14 +173,12 @@ public static BACnetUnconfirmedServiceRequest staticParse(
 
     readBuffer.closeContext("BACnetUnconfirmedServiceRequest");
     // Create the instance
-    BACnetUnconfirmedServiceRequest _bACnetUnconfirmedServiceRequest =
-        builder.build(serviceRequestLength);
-
+    BACnetUnconfirmedServiceRequest _bACnetUnconfirmedServiceRequest = builder.build();
     return _bACnetUnconfirmedServiceRequest;
   }
 
   public interface BACnetUnconfirmedServiceRequestBuilder {
-    BACnetUnconfirmedServiceRequest build(Integer serviceRequestLength);
+    BACnetUnconfirmedServiceRequest build();
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestIAm.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestIAm.java
index fdb9fb31b67..b2ed8e23b6e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestIAm.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestIAm.java
@@ -49,21 +49,16 @@ public BACnetUnconfirmedServiceChoice getServiceChoice() {
   protected final BACnetSegmentationTagged segmentationSupported;
   protected final BACnetVendorIdTagged vendorId;
 
-  // Arguments.
-  protected final Integer serviceRequestLength;
-
   public BACnetUnconfirmedServiceRequestIAm(
       BACnetApplicationTagObjectIdentifier deviceIdentifier,
       BACnetApplicationTagUnsignedInteger maximumApduLengthAcceptedLength,
       BACnetSegmentationTagged segmentationSupported,
-      BACnetVendorIdTagged vendorId,
-      Integer serviceRequestLength) {
-    super(serviceRequestLength);
+      BACnetVendorIdTagged vendorId) {
+    super();
     this.deviceIdentifier = deviceIdentifier;
     this.maximumApduLengthAcceptedLength = maximumApduLengthAcceptedLength;
     this.segmentationSupported = segmentationSupported;
     this.vendorId = vendorId;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetApplicationTagObjectIdentifier getDeviceIdentifier() {
@@ -179,11 +174,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetUnconfirmedServiceRequestIAm");
     // Create the instance
     return new BACnetUnconfirmedServiceRequestIAmBuilderImpl(
-        deviceIdentifier,
-        maximumApduLengthAcceptedLength,
-        segmentationSupported,
-        vendorId,
-        serviceRequestLength);
+        deviceIdentifier, maximumApduLengthAcceptedLength, segmentationSupported, vendorId);
   }
 
   public static class BACnetUnconfirmedServiceRequestIAmBuilderImpl
@@ -192,30 +183,22 @@ public static class BACnetUnconfirmedServiceRequestIAmBuilderImpl
     private final BACnetApplicationTagUnsignedInteger maximumApduLengthAcceptedLength;
     private final BACnetSegmentationTagged segmentationSupported;
     private final BACnetVendorIdTagged vendorId;
-    private final Integer serviceRequestLength;
 
     public BACnetUnconfirmedServiceRequestIAmBuilderImpl(
         BACnetApplicationTagObjectIdentifier deviceIdentifier,
         BACnetApplicationTagUnsignedInteger maximumApduLengthAcceptedLength,
         BACnetSegmentationTagged segmentationSupported,
-        BACnetVendorIdTagged vendorId,
-        Integer serviceRequestLength) {
+        BACnetVendorIdTagged vendorId) {
       this.deviceIdentifier = deviceIdentifier;
       this.maximumApduLengthAcceptedLength = maximumApduLengthAcceptedLength;
       this.segmentationSupported = segmentationSupported;
       this.vendorId = vendorId;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetUnconfirmedServiceRequestIAm build(Integer serviceRequestLength) {
-
+    public BACnetUnconfirmedServiceRequestIAm build() {
       BACnetUnconfirmedServiceRequestIAm bACnetUnconfirmedServiceRequestIAm =
           new BACnetUnconfirmedServiceRequestIAm(
-              deviceIdentifier,
-              maximumApduLengthAcceptedLength,
-              segmentationSupported,
-              vendorId,
-              serviceRequestLength);
+              deviceIdentifier, maximumApduLengthAcceptedLength, segmentationSupported, vendorId);
       return bACnetUnconfirmedServiceRequestIAm;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestIHave.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestIHave.java
index f69e5f6c642..851910a93af 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestIHave.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestIHave.java
@@ -48,19 +48,14 @@ public BACnetUnconfirmedServiceChoice getServiceChoice() {
   protected final BACnetApplicationTagObjectIdentifier objectIdentifier;
   protected final BACnetApplicationTagCharacterString objectName;
 
-  // Arguments.
-  protected final Integer serviceRequestLength;
-
   public BACnetUnconfirmedServiceRequestIHave(
       BACnetApplicationTagObjectIdentifier deviceIdentifier,
       BACnetApplicationTagObjectIdentifier objectIdentifier,
-      BACnetApplicationTagCharacterString objectName,
-      Integer serviceRequestLength) {
-    super(serviceRequestLength);
+      BACnetApplicationTagCharacterString objectName) {
+    super();
     this.deviceIdentifier = deviceIdentifier;
     this.objectIdentifier = objectIdentifier;
     this.objectName = objectName;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetApplicationTagObjectIdentifier getDeviceIdentifier() {
@@ -154,7 +149,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetUnconfirmedServiceRequestIHave");
     // Create the instance
     return new BACnetUnconfirmedServiceRequestIHaveBuilderImpl(
-        deviceIdentifier, objectIdentifier, objectName, serviceRequestLength);
+        deviceIdentifier, objectIdentifier, objectName);
   }
 
   public static class BACnetUnconfirmedServiceRequestIHaveBuilderImpl
@@ -162,24 +157,19 @@ public static class BACnetUnconfirmedServiceRequestIHaveBuilderImpl
     private final BACnetApplicationTagObjectIdentifier deviceIdentifier;
     private final BACnetApplicationTagObjectIdentifier objectIdentifier;
     private final BACnetApplicationTagCharacterString objectName;
-    private final Integer serviceRequestLength;
 
     public BACnetUnconfirmedServiceRequestIHaveBuilderImpl(
         BACnetApplicationTagObjectIdentifier deviceIdentifier,
         BACnetApplicationTagObjectIdentifier objectIdentifier,
-        BACnetApplicationTagCharacterString objectName,
-        Integer serviceRequestLength) {
+        BACnetApplicationTagCharacterString objectName) {
       this.deviceIdentifier = deviceIdentifier;
       this.objectIdentifier = objectIdentifier;
       this.objectName = objectName;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetUnconfirmedServiceRequestIHave build(Integer serviceRequestLength) {
-
+    public BACnetUnconfirmedServiceRequestIHave build() {
       BACnetUnconfirmedServiceRequestIHave bACnetUnconfirmedServiceRequestIHave =
-          new BACnetUnconfirmedServiceRequestIHave(
-              deviceIdentifier, objectIdentifier, objectName, serviceRequestLength);
+          new BACnetUnconfirmedServiceRequestIHave(deviceIdentifier, objectIdentifier, objectName);
       return bACnetUnconfirmedServiceRequestIHave;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestTimeSynchronization.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestTimeSynchronization.java
index 0d8a1240a9c..a02184a6d65 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestTimeSynchronization.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestTimeSynchronization.java
@@ -47,17 +47,11 @@ public BACnetUnconfirmedServiceChoice getServiceChoice() {
   protected final BACnetApplicationTagDate synchronizedDate;
   protected final BACnetApplicationTagTime synchronizedTime;
 
-  // Arguments.
-  protected final Integer serviceRequestLength;
-
   public BACnetUnconfirmedServiceRequestTimeSynchronization(
-      BACnetApplicationTagDate synchronizedDate,
-      BACnetApplicationTagTime synchronizedTime,
-      Integer serviceRequestLength) {
-    super(serviceRequestLength);
+      BACnetApplicationTagDate synchronizedDate, BACnetApplicationTagTime synchronizedTime) {
+    super();
     this.synchronizedDate = synchronizedDate;
     this.synchronizedTime = synchronizedTime;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetApplicationTagDate getSynchronizedDate() {
@@ -128,30 +122,25 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetUnconfirmedServiceRequestTimeSynchronization");
     // Create the instance
     return new BACnetUnconfirmedServiceRequestTimeSynchronizationBuilderImpl(
-        synchronizedDate, synchronizedTime, serviceRequestLength);
+        synchronizedDate, synchronizedTime);
   }
 
   public static class BACnetUnconfirmedServiceRequestTimeSynchronizationBuilderImpl
       implements BACnetUnconfirmedServiceRequest.BACnetUnconfirmedServiceRequestBuilder {
     private final BACnetApplicationTagDate synchronizedDate;
     private final BACnetApplicationTagTime synchronizedTime;
-    private final Integer serviceRequestLength;
 
     public BACnetUnconfirmedServiceRequestTimeSynchronizationBuilderImpl(
-        BACnetApplicationTagDate synchronizedDate,
-        BACnetApplicationTagTime synchronizedTime,
-        Integer serviceRequestLength) {
+        BACnetApplicationTagDate synchronizedDate, BACnetApplicationTagTime synchronizedTime) {
       this.synchronizedDate = synchronizedDate;
       this.synchronizedTime = synchronizedTime;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetUnconfirmedServiceRequestTimeSynchronization build(Integer serviceRequestLength) {
-
+    public BACnetUnconfirmedServiceRequestTimeSynchronization build() {
       BACnetUnconfirmedServiceRequestTimeSynchronization
           bACnetUnconfirmedServiceRequestTimeSynchronization =
               new BACnetUnconfirmedServiceRequestTimeSynchronization(
-                  synchronizedDate, synchronizedTime, serviceRequestLength);
+                  synchronizedDate, synchronizedTime);
       return bACnetUnconfirmedServiceRequestTimeSynchronization;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.java
index 7a0ba2dbc77..d464bcd3fb9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.java
@@ -47,17 +47,11 @@ public BACnetUnconfirmedServiceChoice getServiceChoice() {
   protected final BACnetApplicationTagDate synchronizedDate;
   protected final BACnetApplicationTagTime synchronizedTime;
 
-  // Arguments.
-  protected final Integer serviceRequestLength;
-
   public BACnetUnconfirmedServiceRequestUTCTimeSynchronization(
-      BACnetApplicationTagDate synchronizedDate,
-      BACnetApplicationTagTime synchronizedTime,
-      Integer serviceRequestLength) {
-    super(serviceRequestLength);
+      BACnetApplicationTagDate synchronizedDate, BACnetApplicationTagTime synchronizedTime) {
+    super();
     this.synchronizedDate = synchronizedDate;
     this.synchronizedTime = synchronizedTime;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetApplicationTagDate getSynchronizedDate() {
@@ -128,30 +122,25 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetUnconfirmedServiceRequestUTCTimeSynchronization");
     // Create the instance
     return new BACnetUnconfirmedServiceRequestUTCTimeSynchronizationBuilderImpl(
-        synchronizedDate, synchronizedTime, serviceRequestLength);
+        synchronizedDate, synchronizedTime);
   }
 
   public static class BACnetUnconfirmedServiceRequestUTCTimeSynchronizationBuilderImpl
       implements BACnetUnconfirmedServiceRequest.BACnetUnconfirmedServiceRequestBuilder {
     private final BACnetApplicationTagDate synchronizedDate;
     private final BACnetApplicationTagTime synchronizedTime;
-    private final Integer serviceRequestLength;
 
     public BACnetUnconfirmedServiceRequestUTCTimeSynchronizationBuilderImpl(
-        BACnetApplicationTagDate synchronizedDate,
-        BACnetApplicationTagTime synchronizedTime,
-        Integer serviceRequestLength) {
+        BACnetApplicationTagDate synchronizedDate, BACnetApplicationTagTime synchronizedTime) {
       this.synchronizedDate = synchronizedDate;
       this.synchronizedTime = synchronizedTime;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetUnconfirmedServiceRequestUTCTimeSynchronization build(
-        Integer serviceRequestLength) {
+    public BACnetUnconfirmedServiceRequestUTCTimeSynchronization build() {
       BACnetUnconfirmedServiceRequestUTCTimeSynchronization
           bACnetUnconfirmedServiceRequestUTCTimeSynchronization =
               new BACnetUnconfirmedServiceRequestUTCTimeSynchronization(
-                  synchronizedDate, synchronizedTime, serviceRequestLength);
+                  synchronizedDate, synchronizedTime);
       return bACnetUnconfirmedServiceRequestUTCTimeSynchronization;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.java
index 04b1c19c2ee..c9fdffb5c48 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.java
@@ -50,23 +50,18 @@ public BACnetUnconfirmedServiceChoice getServiceChoice() {
   protected final BACnetContextTagUnsignedInteger lifetimeInSeconds;
   protected final BACnetPropertyValues listOfValues;
 
-  // Arguments.
-  protected final Integer serviceRequestLength;
-
   public BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification(
       BACnetContextTagUnsignedInteger subscriberProcessIdentifier,
       BACnetContextTagObjectIdentifier initiatingDeviceIdentifier,
       BACnetContextTagObjectIdentifier monitoredObjectIdentifier,
       BACnetContextTagUnsignedInteger lifetimeInSeconds,
-      BACnetPropertyValues listOfValues,
-      Integer serviceRequestLength) {
-    super(serviceRequestLength);
+      BACnetPropertyValues listOfValues) {
+    super();
     this.subscriberProcessIdentifier = subscriberProcessIdentifier;
     this.initiatingDeviceIdentifier = initiatingDeviceIdentifier;
     this.monitoredObjectIdentifier = monitoredObjectIdentifier;
     this.lifetimeInSeconds = lifetimeInSeconds;
     this.listOfValues = listOfValues;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagUnsignedInteger getSubscriberProcessIdentifier() {
@@ -219,8 +214,7 @@ public int getLengthInBits() {
         initiatingDeviceIdentifier,
         monitoredObjectIdentifier,
         lifetimeInSeconds,
-        listOfValues,
-        serviceRequestLength);
+        listOfValues);
   }
 
   public static class BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationBuilderImpl
@@ -230,25 +224,21 @@ public static class BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationBui
     private final BACnetContextTagObjectIdentifier monitoredObjectIdentifier;
     private final BACnetContextTagUnsignedInteger lifetimeInSeconds;
     private final BACnetPropertyValues listOfValues;
-    private final Integer serviceRequestLength;
 
     public BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationBuilderImpl(
         BACnetContextTagUnsignedInteger subscriberProcessIdentifier,
         BACnetContextTagObjectIdentifier initiatingDeviceIdentifier,
         BACnetContextTagObjectIdentifier monitoredObjectIdentifier,
         BACnetContextTagUnsignedInteger lifetimeInSeconds,
-        BACnetPropertyValues listOfValues,
-        Integer serviceRequestLength) {
+        BACnetPropertyValues listOfValues) {
       this.subscriberProcessIdentifier = subscriberProcessIdentifier;
       this.initiatingDeviceIdentifier = initiatingDeviceIdentifier;
       this.monitoredObjectIdentifier = monitoredObjectIdentifier;
       this.lifetimeInSeconds = lifetimeInSeconds;
       this.listOfValues = listOfValues;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification build(
-        Integer serviceRequestLength) {
+    public BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification build() {
       BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification
           bACnetUnconfirmedServiceRequestUnconfirmedCOVNotification =
               new BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification(
@@ -256,8 +246,7 @@ public BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification build(
                   initiatingDeviceIdentifier,
                   monitoredObjectIdentifier,
                   lifetimeInSeconds,
-                  listOfValues,
-                  serviceRequestLength);
+                  listOfValues);
       return bACnetUnconfirmedServiceRequestUnconfirmedCOVNotification;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.java
index 8706eeecbde..f79797e849a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.java
@@ -50,23 +50,18 @@ public BACnetUnconfirmedServiceChoice getServiceChoice() {
   protected final BACnetTimeStampEnclosed timestamp;
   protected final ListOfCovNotificationsList listOfCovNotifications;
 
-  // Arguments.
-  protected final Integer serviceRequestLength;
-
   public BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple(
       BACnetContextTagUnsignedInteger subscriberProcessIdentifier,
       BACnetContextTagObjectIdentifier initiatingDeviceIdentifier,
       BACnetContextTagUnsignedInteger timeRemaining,
       BACnetTimeStampEnclosed timestamp,
-      ListOfCovNotificationsList listOfCovNotifications,
-      Integer serviceRequestLength) {
-    super(serviceRequestLength);
+      ListOfCovNotificationsList listOfCovNotifications) {
+    super();
     this.subscriberProcessIdentifier = subscriberProcessIdentifier;
     this.initiatingDeviceIdentifier = initiatingDeviceIdentifier;
     this.timeRemaining = timeRemaining;
     this.timestamp = timestamp;
     this.listOfCovNotifications = listOfCovNotifications;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagUnsignedInteger getSubscriberProcessIdentifier() {
@@ -209,8 +204,7 @@ public int getLengthInBits() {
         initiatingDeviceIdentifier,
         timeRemaining,
         timestamp,
-        listOfCovNotifications,
-        serviceRequestLength);
+        listOfCovNotifications);
   }
 
   public static class BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultipleBuilderImpl
@@ -220,25 +214,21 @@ public static class BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMul
     private final BACnetContextTagUnsignedInteger timeRemaining;
     private final BACnetTimeStampEnclosed timestamp;
     private final ListOfCovNotificationsList listOfCovNotifications;
-    private final Integer serviceRequestLength;
 
     public BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultipleBuilderImpl(
         BACnetContextTagUnsignedInteger subscriberProcessIdentifier,
         BACnetContextTagObjectIdentifier initiatingDeviceIdentifier,
         BACnetContextTagUnsignedInteger timeRemaining,
         BACnetTimeStampEnclosed timestamp,
-        ListOfCovNotificationsList listOfCovNotifications,
-        Integer serviceRequestLength) {
+        ListOfCovNotificationsList listOfCovNotifications) {
       this.subscriberProcessIdentifier = subscriberProcessIdentifier;
       this.initiatingDeviceIdentifier = initiatingDeviceIdentifier;
       this.timeRemaining = timeRemaining;
       this.timestamp = timestamp;
       this.listOfCovNotifications = listOfCovNotifications;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple build(
-        Integer serviceRequestLength) {
+    public BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple build() {
       BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple
           bACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple =
               new BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple(
@@ -246,8 +236,7 @@ public BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple build(
                   initiatingDeviceIdentifier,
                   timeRemaining,
                   timestamp,
-                  listOfCovNotifications,
-                  serviceRequestLength);
+                  listOfCovNotifications);
       return bACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.java
index 594c86a0d7c..6f079655de6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.java
@@ -58,9 +58,6 @@ public BACnetUnconfirmedServiceChoice getServiceChoice() {
   protected final BACnetEventStateTagged toState;
   protected final BACnetNotificationParameters eventValues;
 
-  // Arguments.
-  protected final Integer serviceRequestLength;
-
   public BACnetUnconfirmedServiceRequestUnconfirmedEventNotification(
       BACnetContextTagUnsignedInteger processIdentifier,
       BACnetContextTagObjectIdentifier initiatingDeviceIdentifier,
@@ -74,9 +71,8 @@ public BACnetUnconfirmedServiceRequestUnconfirmedEventNotification(
       BACnetContextTagBoolean ackRequired,
       BACnetEventStateTagged fromState,
       BACnetEventStateTagged toState,
-      BACnetNotificationParameters eventValues,
-      Integer serviceRequestLength) {
-    super(serviceRequestLength);
+      BACnetNotificationParameters eventValues) {
+    super();
     this.processIdentifier = processIdentifier;
     this.initiatingDeviceIdentifier = initiatingDeviceIdentifier;
     this.eventObjectIdentifier = eventObjectIdentifier;
@@ -90,7 +86,6 @@ public BACnetUnconfirmedServiceRequestUnconfirmedEventNotification(
     this.fromState = fromState;
     this.toState = toState;
     this.eventValues = eventValues;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagUnsignedInteger getProcessIdentifier() {
@@ -413,8 +408,7 @@ public int getLengthInBits() {
         ackRequired,
         fromState,
         toState,
-        eventValues,
-        serviceRequestLength);
+        eventValues);
   }
 
   public static class BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationBuilderImpl
@@ -432,7 +426,6 @@ public static class BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationB
     private final BACnetEventStateTagged fromState;
     private final BACnetEventStateTagged toState;
     private final BACnetNotificationParameters eventValues;
-    private final Integer serviceRequestLength;
 
     public BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationBuilderImpl(
         BACnetContextTagUnsignedInteger processIdentifier,
@@ -447,8 +440,7 @@ public BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationBuilderImpl(
         BACnetContextTagBoolean ackRequired,
         BACnetEventStateTagged fromState,
         BACnetEventStateTagged toState,
-        BACnetNotificationParameters eventValues,
-        Integer serviceRequestLength) {
+        BACnetNotificationParameters eventValues) {
       this.processIdentifier = processIdentifier;
       this.initiatingDeviceIdentifier = initiatingDeviceIdentifier;
       this.eventObjectIdentifier = eventObjectIdentifier;
@@ -462,11 +454,9 @@ public BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationBuilderImpl(
       this.fromState = fromState;
       this.toState = toState;
       this.eventValues = eventValues;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetUnconfirmedServiceRequestUnconfirmedEventNotification build(
-        Integer serviceRequestLength) {
+    public BACnetUnconfirmedServiceRequestUnconfirmedEventNotification build() {
       BACnetUnconfirmedServiceRequestUnconfirmedEventNotification
           bACnetUnconfirmedServiceRequestUnconfirmedEventNotification =
               new BACnetUnconfirmedServiceRequestUnconfirmedEventNotification(
@@ -482,8 +472,7 @@ public BACnetUnconfirmedServiceRequestUnconfirmedEventNotification build(
                   ackRequired,
                   fromState,
                   toState,
-                  eventValues,
-                  serviceRequestLength);
+                  eventValues);
       return bACnetUnconfirmedServiceRequestUnconfirmedEventNotification;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.java
index be9495125a7..d81307b955c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.java
@@ -48,19 +48,14 @@ public BACnetUnconfirmedServiceChoice getServiceChoice() {
   protected final BACnetContextTagUnsignedInteger serviceNumber;
   protected final BACnetConstructedData serviceParameters;
 
-  // Arguments.
-  protected final Integer serviceRequestLength;
-
   public BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer(
       BACnetVendorIdTagged vendorId,
       BACnetContextTagUnsignedInteger serviceNumber,
-      BACnetConstructedData serviceParameters,
-      Integer serviceRequestLength) {
-    super(serviceRequestLength);
+      BACnetConstructedData serviceParameters) {
+    super();
     this.vendorId = vendorId;
     this.serviceNumber = serviceNumber;
     this.serviceParameters = serviceParameters;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetVendorIdTagged getVendorId() {
@@ -164,7 +159,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer");
     // Create the instance
     return new BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferBuilderImpl(
-        vendorId, serviceNumber, serviceParameters, serviceRequestLength);
+        vendorId, serviceNumber, serviceParameters);
   }
 
   public static class BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferBuilderImpl
@@ -172,25 +167,21 @@ public static class BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferBui
     private final BACnetVendorIdTagged vendorId;
     private final BACnetContextTagUnsignedInteger serviceNumber;
     private final BACnetConstructedData serviceParameters;
-    private final Integer serviceRequestLength;
 
     public BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferBuilderImpl(
         BACnetVendorIdTagged vendorId,
         BACnetContextTagUnsignedInteger serviceNumber,
-        BACnetConstructedData serviceParameters,
-        Integer serviceRequestLength) {
+        BACnetConstructedData serviceParameters) {
       this.vendorId = vendorId;
       this.serviceNumber = serviceNumber;
       this.serviceParameters = serviceParameters;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer build(
-        Integer serviceRequestLength) {
+    public BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer build() {
       BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer
           bACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer =
               new BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer(
-                  vendorId, serviceNumber, serviceParameters, serviceRequestLength);
+                  vendorId, serviceNumber, serviceParameters);
       return bACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.java
index c17de7a5df1..bdb065a96b2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.java
@@ -50,21 +50,16 @@ public BACnetUnconfirmedServiceChoice getServiceChoice() {
       messagePriority;
   protected final BACnetContextTagCharacterString message;
 
-  // Arguments.
-  protected final Integer serviceRequestLength;
-
   public BACnetUnconfirmedServiceRequestUnconfirmedTextMessage(
       BACnetContextTagObjectIdentifier textMessageSourceDevice,
       BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass messageClass,
       BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged messagePriority,
-      BACnetContextTagCharacterString message,
-      Integer serviceRequestLength) {
-    super(serviceRequestLength);
+      BACnetContextTagCharacterString message) {
+    super();
     this.textMessageSourceDevice = textMessageSourceDevice;
     this.messageClass = messageClass;
     this.messagePriority = messagePriority;
     this.message = message;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagObjectIdentifier getTextMessageSourceDevice() {
@@ -187,7 +182,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetUnconfirmedServiceRequestUnconfirmedTextMessage");
     // Create the instance
     return new BACnetUnconfirmedServiceRequestUnconfirmedTextMessageBuilderImpl(
-        textMessageSourceDevice, messageClass, messagePriority, message, serviceRequestLength);
+        textMessageSourceDevice, messageClass, messagePriority, message);
   }
 
   public static class BACnetUnconfirmedServiceRequestUnconfirmedTextMessageBuilderImpl
@@ -197,31 +192,23 @@ public static class BACnetUnconfirmedServiceRequestUnconfirmedTextMessageBuilder
     private final BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged
         messagePriority;
     private final BACnetContextTagCharacterString message;
-    private final Integer serviceRequestLength;
 
     public BACnetUnconfirmedServiceRequestUnconfirmedTextMessageBuilderImpl(
         BACnetContextTagObjectIdentifier textMessageSourceDevice,
         BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass messageClass,
         BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged messagePriority,
-        BACnetContextTagCharacterString message,
-        Integer serviceRequestLength) {
+        BACnetContextTagCharacterString message) {
       this.textMessageSourceDevice = textMessageSourceDevice;
       this.messageClass = messageClass;
       this.messagePriority = messagePriority;
       this.message = message;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetUnconfirmedServiceRequestUnconfirmedTextMessage build(
-        Integer serviceRequestLength) {
+    public BACnetUnconfirmedServiceRequestUnconfirmedTextMessage build() {
       BACnetUnconfirmedServiceRequestUnconfirmedTextMessage
           bACnetUnconfirmedServiceRequestUnconfirmedTextMessage =
               new BACnetUnconfirmedServiceRequestUnconfirmedTextMessage(
-                  textMessageSourceDevice,
-                  messageClass,
-                  messagePriority,
-                  message,
-                  serviceRequestLength);
+                  textMessageSourceDevice, messageClass, messagePriority, message);
       return bACnetUnconfirmedServiceRequestUnconfirmedTextMessage;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnknown.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnknown.java
index 6f756ec9c76..ae8800d3585 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnknown.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestUnknown.java
@@ -46,13 +46,9 @@ public BACnetUnconfirmedServiceChoice getServiceChoice() {
   // Properties.
   protected final byte[] unknownBytes;
 
-  // Arguments.
-  protected final Integer serviceRequestLength;
-
-  public BACnetUnconfirmedServiceRequestUnknown(byte[] unknownBytes, Integer serviceRequestLength) {
-    super(serviceRequestLength);
+  public BACnetUnconfirmedServiceRequestUnknown(byte[] unknownBytes) {
+    super();
     this.unknownBytes = unknownBytes;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public byte[] getUnknownBytes() {
@@ -106,25 +102,20 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("BACnetUnconfirmedServiceRequestUnknown");
     // Create the instance
-    return new BACnetUnconfirmedServiceRequestUnknownBuilderImpl(
-        unknownBytes, serviceRequestLength);
+    return new BACnetUnconfirmedServiceRequestUnknownBuilderImpl(unknownBytes);
   }
 
   public static class BACnetUnconfirmedServiceRequestUnknownBuilderImpl
       implements BACnetUnconfirmedServiceRequest.BACnetUnconfirmedServiceRequestBuilder {
     private final byte[] unknownBytes;
-    private final Integer serviceRequestLength;
 
-    public BACnetUnconfirmedServiceRequestUnknownBuilderImpl(
-        byte[] unknownBytes, Integer serviceRequestLength) {
+    public BACnetUnconfirmedServiceRequestUnknownBuilderImpl(byte[] unknownBytes) {
       this.unknownBytes = unknownBytes;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetUnconfirmedServiceRequestUnknown build(Integer serviceRequestLength) {
-
+    public BACnetUnconfirmedServiceRequestUnknown build() {
       BACnetUnconfirmedServiceRequestUnknown bACnetUnconfirmedServiceRequestUnknown =
-          new BACnetUnconfirmedServiceRequestUnknown(unknownBytes, serviceRequestLength);
+          new BACnetUnconfirmedServiceRequestUnknown(unknownBytes);
       return bACnetUnconfirmedServiceRequestUnknown;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestWhoHas.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestWhoHas.java
index 0c4e75214f4..e99126d79d2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestWhoHas.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestWhoHas.java
@@ -48,19 +48,14 @@ public BACnetUnconfirmedServiceChoice getServiceChoice() {
   protected final BACnetContextTagUnsignedInteger deviceInstanceRangeHighLimit;
   protected final BACnetUnconfirmedServiceRequestWhoHasObject object;
 
-  // Arguments.
-  protected final Integer serviceRequestLength;
-
   public BACnetUnconfirmedServiceRequestWhoHas(
       BACnetContextTagUnsignedInteger deviceInstanceRangeLowLimit,
       BACnetContextTagUnsignedInteger deviceInstanceRangeHighLimit,
-      BACnetUnconfirmedServiceRequestWhoHasObject object,
-      Integer serviceRequestLength) {
-    super(serviceRequestLength);
+      BACnetUnconfirmedServiceRequestWhoHasObject object) {
+    super();
     this.deviceInstanceRangeLowLimit = deviceInstanceRangeLowLimit;
     this.deviceInstanceRangeHighLimit = deviceInstanceRangeHighLimit;
     this.object = object;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagUnsignedInteger getDeviceInstanceRangeLowLimit() {
@@ -88,10 +83,7 @@ protected void serializeBACnetUnconfirmedServiceRequestChild(WriteBuffer writeBu
 
     // Optional Field (deviceInstanceRangeHighLimit) (Can be skipped, if the value is null)
     writeOptionalField(
-        "deviceInstanceRangeHighLimit",
-        deviceInstanceRangeHighLimit,
-        writeComplex(writeBuffer),
-        (getDeviceInstanceRangeLowLimit()) != (null));
+        "deviceInstanceRangeHighLimit", deviceInstanceRangeHighLimit, writeComplex(writeBuffer));
 
     // Simple Field (object)
     writeSimpleField("object", object, writeComplex(writeBuffer));
@@ -168,7 +160,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetUnconfirmedServiceRequestWhoHas");
     // Create the instance
     return new BACnetUnconfirmedServiceRequestWhoHasBuilderImpl(
-        deviceInstanceRangeLowLimit, deviceInstanceRangeHighLimit, object, serviceRequestLength);
+        deviceInstanceRangeLowLimit, deviceInstanceRangeHighLimit, object);
   }
 
   public static class BACnetUnconfirmedServiceRequestWhoHasBuilderImpl
@@ -176,27 +168,20 @@ public static class BACnetUnconfirmedServiceRequestWhoHasBuilderImpl
     private final BACnetContextTagUnsignedInteger deviceInstanceRangeLowLimit;
     private final BACnetContextTagUnsignedInteger deviceInstanceRangeHighLimit;
     private final BACnetUnconfirmedServiceRequestWhoHasObject object;
-    private final Integer serviceRequestLength;
 
     public BACnetUnconfirmedServiceRequestWhoHasBuilderImpl(
         BACnetContextTagUnsignedInteger deviceInstanceRangeLowLimit,
         BACnetContextTagUnsignedInteger deviceInstanceRangeHighLimit,
-        BACnetUnconfirmedServiceRequestWhoHasObject object,
-        Integer serviceRequestLength) {
+        BACnetUnconfirmedServiceRequestWhoHasObject object) {
       this.deviceInstanceRangeLowLimit = deviceInstanceRangeLowLimit;
       this.deviceInstanceRangeHighLimit = deviceInstanceRangeHighLimit;
       this.object = object;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetUnconfirmedServiceRequestWhoHas build(Integer serviceRequestLength) {
-
+    public BACnetUnconfirmedServiceRequestWhoHas build() {
       BACnetUnconfirmedServiceRequestWhoHas bACnetUnconfirmedServiceRequestWhoHas =
           new BACnetUnconfirmedServiceRequestWhoHas(
-              deviceInstanceRangeLowLimit,
-              deviceInstanceRangeHighLimit,
-              object,
-              serviceRequestLength);
+              deviceInstanceRangeLowLimit, deviceInstanceRangeHighLimit, object);
       return bACnetUnconfirmedServiceRequestWhoHas;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestWhoIs.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestWhoIs.java
index 783550e7b84..9c3a2bdde74 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestWhoIs.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestWhoIs.java
@@ -47,17 +47,12 @@ public BACnetUnconfirmedServiceChoice getServiceChoice() {
   protected final BACnetContextTagUnsignedInteger deviceInstanceRangeLowLimit;
   protected final BACnetContextTagUnsignedInteger deviceInstanceRangeHighLimit;
 
-  // Arguments.
-  protected final Integer serviceRequestLength;
-
   public BACnetUnconfirmedServiceRequestWhoIs(
       BACnetContextTagUnsignedInteger deviceInstanceRangeLowLimit,
-      BACnetContextTagUnsignedInteger deviceInstanceRangeHighLimit,
-      Integer serviceRequestLength) {
-    super(serviceRequestLength);
+      BACnetContextTagUnsignedInteger deviceInstanceRangeHighLimit) {
+    super();
     this.deviceInstanceRangeLowLimit = deviceInstanceRangeLowLimit;
     this.deviceInstanceRangeHighLimit = deviceInstanceRangeHighLimit;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagUnsignedInteger getDeviceInstanceRangeLowLimit() {
@@ -81,10 +76,7 @@ protected void serializeBACnetUnconfirmedServiceRequestChild(WriteBuffer writeBu
 
     // Optional Field (deviceInstanceRangeHighLimit) (Can be skipped, if the value is null)
     writeOptionalField(
-        "deviceInstanceRangeHighLimit",
-        deviceInstanceRangeHighLimit,
-        writeComplex(writeBuffer),
-        (getDeviceInstanceRangeLowLimit()) != (null));
+        "deviceInstanceRangeHighLimit", deviceInstanceRangeHighLimit, writeComplex(writeBuffer));
 
     writeBuffer.popContext("BACnetUnconfirmedServiceRequestWhoIs");
   }
@@ -148,29 +140,25 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetUnconfirmedServiceRequestWhoIs");
     // Create the instance
     return new BACnetUnconfirmedServiceRequestWhoIsBuilderImpl(
-        deviceInstanceRangeLowLimit, deviceInstanceRangeHighLimit, serviceRequestLength);
+        deviceInstanceRangeLowLimit, deviceInstanceRangeHighLimit);
   }
 
   public static class BACnetUnconfirmedServiceRequestWhoIsBuilderImpl
       implements BACnetUnconfirmedServiceRequest.BACnetUnconfirmedServiceRequestBuilder {
     private final BACnetContextTagUnsignedInteger deviceInstanceRangeLowLimit;
     private final BACnetContextTagUnsignedInteger deviceInstanceRangeHighLimit;
-    private final Integer serviceRequestLength;
 
     public BACnetUnconfirmedServiceRequestWhoIsBuilderImpl(
         BACnetContextTagUnsignedInteger deviceInstanceRangeLowLimit,
-        BACnetContextTagUnsignedInteger deviceInstanceRangeHighLimit,
-        Integer serviceRequestLength) {
+        BACnetContextTagUnsignedInteger deviceInstanceRangeHighLimit) {
       this.deviceInstanceRangeLowLimit = deviceInstanceRangeLowLimit;
       this.deviceInstanceRangeHighLimit = deviceInstanceRangeHighLimit;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetUnconfirmedServiceRequestWhoIs build(Integer serviceRequestLength) {
-
+    public BACnetUnconfirmedServiceRequestWhoIs build() {
       BACnetUnconfirmedServiceRequestWhoIs bACnetUnconfirmedServiceRequestWhoIs =
           new BACnetUnconfirmedServiceRequestWhoIs(
-              deviceInstanceRangeLowLimit, deviceInstanceRangeHighLimit, serviceRequestLength);
+              deviceInstanceRangeLowLimit, deviceInstanceRangeHighLimit);
       return bACnetUnconfirmedServiceRequestWhoIs;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestWriteGroup.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestWriteGroup.java
index 40331848108..95afe1c5ce8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestWriteGroup.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestWriteGroup.java
@@ -49,21 +49,16 @@ public BACnetUnconfirmedServiceChoice getServiceChoice() {
   protected final BACnetGroupChannelValueList changeList;
   protected final BACnetContextTagUnsignedInteger inhibitDelay;
 
-  // Arguments.
-  protected final Integer serviceRequestLength;
-
   public BACnetUnconfirmedServiceRequestWriteGroup(
       BACnetContextTagUnsignedInteger groupNumber,
       BACnetContextTagUnsignedInteger writePriority,
       BACnetGroupChannelValueList changeList,
-      BACnetContextTagUnsignedInteger inhibitDelay,
-      Integer serviceRequestLength) {
-    super(serviceRequestLength);
+      BACnetContextTagUnsignedInteger inhibitDelay) {
+    super();
     this.groupNumber = groupNumber;
     this.writePriority = writePriority;
     this.changeList = changeList;
     this.inhibitDelay = inhibitDelay;
-    this.serviceRequestLength = serviceRequestLength;
   }
 
   public BACnetContextTagUnsignedInteger getGroupNumber() {
@@ -185,7 +180,7 @@ public int getLengthInBits() {
     readBuffer.closeContext("BACnetUnconfirmedServiceRequestWriteGroup");
     // Create the instance
     return new BACnetUnconfirmedServiceRequestWriteGroupBuilderImpl(
-        groupNumber, writePriority, changeList, inhibitDelay, serviceRequestLength);
+        groupNumber, writePriority, changeList, inhibitDelay);
   }
 
   public static class BACnetUnconfirmedServiceRequestWriteGroupBuilderImpl
@@ -194,26 +189,22 @@ public static class BACnetUnconfirmedServiceRequestWriteGroupBuilderImpl
     private final BACnetContextTagUnsignedInteger writePriority;
     private final BACnetGroupChannelValueList changeList;
     private final BACnetContextTagUnsignedInteger inhibitDelay;
-    private final Integer serviceRequestLength;
 
     public BACnetUnconfirmedServiceRequestWriteGroupBuilderImpl(
         BACnetContextTagUnsignedInteger groupNumber,
         BACnetContextTagUnsignedInteger writePriority,
         BACnetGroupChannelValueList changeList,
-        BACnetContextTagUnsignedInteger inhibitDelay,
-        Integer serviceRequestLength) {
+        BACnetContextTagUnsignedInteger inhibitDelay) {
       this.groupNumber = groupNumber;
       this.writePriority = writePriority;
       this.changeList = changeList;
       this.inhibitDelay = inhibitDelay;
-      this.serviceRequestLength = serviceRequestLength;
     }
 
-    public BACnetUnconfirmedServiceRequestWriteGroup build(Integer serviceRequestLength) {
-
+    public BACnetUnconfirmedServiceRequestWriteGroup build() {
       BACnetUnconfirmedServiceRequestWriteGroup bACnetUnconfirmedServiceRequestWriteGroup =
           new BACnetUnconfirmedServiceRequestWriteGroup(
-              groupNumber, writePriority, changeList, inhibitDelay, serviceRequestLength);
+              groupNumber, writePriority, changeList, inhibitDelay);
       return bACnetUnconfirmedServiceRequestWriteGroup;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVTClassTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVTClassTagged.java
index 1441d07c4ab..b563ea3e489 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVTClassTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVTClassTagged.java
@@ -42,22 +42,11 @@ public class BACnetVTClassTagged implements Message {
   protected final BACnetVTClass value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetVTClassTagged(
-      BACnetTagHeader header,
-      BACnetVTClass value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+  public BACnetVTClassTagged(BACnetTagHeader header, BACnetVTClass value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -178,8 +167,7 @@ public static BACnetVTClassTagged staticParse(
     readBuffer.closeContext("BACnetVTClassTagged");
     // Create the instance
     BACnetVTClassTagged _bACnetVTClassTagged;
-    _bACnetVTClassTagged =
-        new BACnetVTClassTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _bACnetVTClassTagged = new BACnetVTClassTagged(header, value, proprietaryValue);
     return _bACnetVTClassTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
index 055e243d9f7..0de17686f2c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
@@ -1790,6 +1790,14 @@ public enum BACnetVendorId {
   ZAPHIREAS((int) 1557, (int) 1557, (String) "Zaphire AS"),
   AJ_MANUFACTURING((int) 1558, (int) 1558, (String) "AJ Manufacturing"),
   FUTURE_MOTORS_LTD((int) 1559, (int) 1559, (String) "Future Motors Ltd."),
+  HIMEL_HONG_KONG_LIMITED((int) 1560, (int) 1560, (String) "Himel Hong Kong Limited"),
+  SHENZHEN_SUNRICHER_TECHNOLOGY_CO_LTD(
+      (int) 1561, (int) 1561, (String) "Shenzhen Sunricher Technology Co., Ltd."),
+  ACTILITYSA((int) 1562, (int) 1562, (String) "Actility S.A."),
+  OY_HALTON_GROUP_LTD((int) 1563, (int) 1563, (String) "Oy Halton Group Ltd."),
+  AVTECH_SOFTWARE_INC((int) 1564, (int) 1564, (String) "AVTECH Software, Inc."),
+  IN_CONTROL_ENGINEERINGLLC((int) 1565, (int) 1565, (String) "InControl Engineering LLC"),
+  SOUND_WATER_TECHNOLOGIESLLC((int) 1566, (int) 1566, (String) "SoundWater Technologies LLC"),
   UNKNOWN_VENDOR((int) 0xFFFF, (int) 0xFFFF, (String) "Unknown");
   private static final Map<Integer, BACnetVendorId> map;
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorIdTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorIdTagged.java
index df355a5821c..e2bd8195b99 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorIdTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorIdTagged.java
@@ -42,22 +42,11 @@ public class BACnetVendorIdTagged implements Message {
   protected final BACnetVendorId value;
   protected final long unknownId;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetVendorIdTagged(
-      BACnetTagHeader header,
-      BACnetVendorId value,
-      long unknownId,
-      Short tagNumber,
-      TagClass tagClass) {
+  public BACnetVendorIdTagged(BACnetTagHeader header, BACnetVendorId value, long unknownId) {
     super();
     this.header = header;
     this.value = value;
     this.unknownId = unknownId;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -176,7 +165,7 @@ public static BACnetVendorIdTagged staticParse(
     readBuffer.closeContext("BACnetVendorIdTagged");
     // Create the instance
     BACnetVendorIdTagged _bACnetVendorIdTagged;
-    _bACnetVendorIdTagged = new BACnetVendorIdTagged(header, value, unknownId, tagNumber, tagClass);
+    _bACnetVendorIdTagged = new BACnetVendorIdTagged(header, value, unknownId);
     return _bACnetVendorIdTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetWeekNDayTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetWeekNDayTagged.java
index 559fa94d5d6..b337a63d5f1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetWeekNDayTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetWeekNDayTagged.java
@@ -43,24 +43,13 @@ public class BACnetWeekNDayTagged implements Message {
   protected final short weekOfMonth;
   protected final short dayOfWeek;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
   public BACnetWeekNDayTagged(
-      BACnetTagHeader header,
-      short month,
-      short weekOfMonth,
-      short dayOfWeek,
-      Short tagNumber,
-      TagClass tagClass) {
+      BACnetTagHeader header, short month, short weekOfMonth, short dayOfWeek) {
     super();
     this.header = header;
     this.month = month;
     this.weekOfMonth = weekOfMonth;
     this.dayOfWeek = dayOfWeek;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -322,8 +311,7 @@ public static BACnetWeekNDayTagged staticParse(
     readBuffer.closeContext("BACnetWeekNDayTagged");
     // Create the instance
     BACnetWeekNDayTagged _bACnetWeekNDayTagged;
-    _bACnetWeekNDayTagged =
-        new BACnetWeekNDayTagged(header, month, weekOfMonth, dayOfWeek, tagNumber, tagClass);
+    _bACnetWeekNDayTagged = new BACnetWeekNDayTagged(header, month, weekOfMonth, dayOfWeek);
     return _bACnetWeekNDayTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetWriteStatusTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetWriteStatusTagged.java
index d012c1e7373..8f8eba13b56 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetWriteStatusTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetWriteStatusTagged.java
@@ -41,17 +41,10 @@ public class BACnetWriteStatusTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BACnetWriteStatus value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BACnetWriteStatusTagged(
-      BACnetTagHeader header, BACnetWriteStatus value, Short tagNumber, TagClass tagClass) {
+  public BACnetWriteStatusTagged(BACnetTagHeader header, BACnetWriteStatus value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,7 +126,7 @@ public static BACnetWriteStatusTagged staticParse(
     readBuffer.closeContext("BACnetWriteStatusTagged");
     // Create the instance
     BACnetWriteStatusTagged _bACnetWriteStatusTagged;
-    _bACnetWriteStatusTagged = new BACnetWriteStatusTagged(header, value, tagNumber, tagClass);
+    _bACnetWriteStatusTagged = new BACnetWriteStatusTagged(header, value);
     return _bACnetWriteStatusTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCDistributeBroadcastToNetwork.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCDistributeBroadcastToNetwork.java
index be0264abdba..3064e775b03 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCDistributeBroadcastToNetwork.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCDistributeBroadcastToNetwork.java
@@ -45,13 +45,9 @@ public Short getBvlcFunction() {
   // Properties.
   protected final NPDU npdu;
 
-  // Arguments.
-  protected final Integer bvlcPayloadLength;
-
-  public BVLCDistributeBroadcastToNetwork(NPDU npdu, Integer bvlcPayloadLength) {
+  public BVLCDistributeBroadcastToNetwork(NPDU npdu) {
     super();
     this.npdu = npdu;
-    this.bvlcPayloadLength = bvlcPayloadLength;
   }
 
   public NPDU getNpdu() {
@@ -102,21 +98,19 @@ public static BVLCBuilder staticParseBVLCBuilder(ReadBuffer readBuffer, Integer
 
     readBuffer.closeContext("BVLCDistributeBroadcastToNetwork");
     // Create the instance
-    return new BVLCDistributeBroadcastToNetworkBuilderImpl(npdu, bvlcPayloadLength);
+    return new BVLCDistributeBroadcastToNetworkBuilderImpl(npdu);
   }
 
   public static class BVLCDistributeBroadcastToNetworkBuilderImpl implements BVLC.BVLCBuilder {
     private final NPDU npdu;
-    private final Integer bvlcPayloadLength;
 
-    public BVLCDistributeBroadcastToNetworkBuilderImpl(NPDU npdu, Integer bvlcPayloadLength) {
+    public BVLCDistributeBroadcastToNetworkBuilderImpl(NPDU npdu) {
       this.npdu = npdu;
-      this.bvlcPayloadLength = bvlcPayloadLength;
     }
 
     public BVLCDistributeBroadcastToNetwork build() {
       BVLCDistributeBroadcastToNetwork bVLCDistributeBroadcastToNetwork =
-          new BVLCDistributeBroadcastToNetwork(npdu, bvlcPayloadLength);
+          new BVLCDistributeBroadcastToNetwork(npdu);
       return bVLCDistributeBroadcastToNetwork;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCForwardedNPDU.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCForwardedNPDU.java
index 2cfe5d7924d..e99a03f6fb8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCForwardedNPDU.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCForwardedNPDU.java
@@ -47,15 +47,11 @@ public Short getBvlcFunction() {
   protected final int port;
   protected final NPDU npdu;
 
-  // Arguments.
-  protected final Integer bvlcPayloadLength;
-
-  public BVLCForwardedNPDU(List<Short> ip, int port, NPDU npdu, Integer bvlcPayloadLength) {
+  public BVLCForwardedNPDU(List<Short> ip, int port, NPDU npdu) {
     super();
     this.ip = ip;
     this.port = port;
     this.npdu = npdu;
-    this.bvlcPayloadLength = bvlcPayloadLength;
   }
 
   public List<Short> getIp() {
@@ -150,26 +146,22 @@ public static BVLCBuilder staticParseBVLCBuilder(ReadBuffer readBuffer, Integer
 
     readBuffer.closeContext("BVLCForwardedNPDU");
     // Create the instance
-    return new BVLCForwardedNPDUBuilderImpl(ip, port, npdu, bvlcPayloadLength);
+    return new BVLCForwardedNPDUBuilderImpl(ip, port, npdu);
   }
 
   public static class BVLCForwardedNPDUBuilderImpl implements BVLC.BVLCBuilder {
     private final List<Short> ip;
     private final int port;
     private final NPDU npdu;
-    private final Integer bvlcPayloadLength;
 
-    public BVLCForwardedNPDUBuilderImpl(
-        List<Short> ip, int port, NPDU npdu, Integer bvlcPayloadLength) {
+    public BVLCForwardedNPDUBuilderImpl(List<Short> ip, int port, NPDU npdu) {
       this.ip = ip;
       this.port = port;
       this.npdu = npdu;
-      this.bvlcPayloadLength = bvlcPayloadLength;
     }
 
     public BVLCForwardedNPDU build() {
-      BVLCForwardedNPDU bVLCForwardedNPDU =
-          new BVLCForwardedNPDU(ip, port, npdu, bvlcPayloadLength);
+      BVLCForwardedNPDU bVLCForwardedNPDU = new BVLCForwardedNPDU(ip, port, npdu);
       return bVLCForwardedNPDU;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCOriginalBroadcastNPDU.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCOriginalBroadcastNPDU.java
index bec14111334..b730a4027de 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCOriginalBroadcastNPDU.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCOriginalBroadcastNPDU.java
@@ -45,13 +45,9 @@ public Short getBvlcFunction() {
   // Properties.
   protected final NPDU npdu;
 
-  // Arguments.
-  protected final Integer bvlcPayloadLength;
-
-  public BVLCOriginalBroadcastNPDU(NPDU npdu, Integer bvlcPayloadLength) {
+  public BVLCOriginalBroadcastNPDU(NPDU npdu) {
     super();
     this.npdu = npdu;
-    this.bvlcPayloadLength = bvlcPayloadLength;
   }
 
   public NPDU getNpdu() {
@@ -102,21 +98,18 @@ public static BVLCBuilder staticParseBVLCBuilder(ReadBuffer readBuffer, Integer
 
     readBuffer.closeContext("BVLCOriginalBroadcastNPDU");
     // Create the instance
-    return new BVLCOriginalBroadcastNPDUBuilderImpl(npdu, bvlcPayloadLength);
+    return new BVLCOriginalBroadcastNPDUBuilderImpl(npdu);
   }
 
   public static class BVLCOriginalBroadcastNPDUBuilderImpl implements BVLC.BVLCBuilder {
     private final NPDU npdu;
-    private final Integer bvlcPayloadLength;
 
-    public BVLCOriginalBroadcastNPDUBuilderImpl(NPDU npdu, Integer bvlcPayloadLength) {
+    public BVLCOriginalBroadcastNPDUBuilderImpl(NPDU npdu) {
       this.npdu = npdu;
-      this.bvlcPayloadLength = bvlcPayloadLength;
     }
 
     public BVLCOriginalBroadcastNPDU build() {
-      BVLCOriginalBroadcastNPDU bVLCOriginalBroadcastNPDU =
-          new BVLCOriginalBroadcastNPDU(npdu, bvlcPayloadLength);
+      BVLCOriginalBroadcastNPDU bVLCOriginalBroadcastNPDU = new BVLCOriginalBroadcastNPDU(npdu);
       return bVLCOriginalBroadcastNPDU;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCOriginalUnicastNPDU.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCOriginalUnicastNPDU.java
index 8c60ed63977..84fc68bc6b1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCOriginalUnicastNPDU.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCOriginalUnicastNPDU.java
@@ -45,13 +45,9 @@ public Short getBvlcFunction() {
   // Properties.
   protected final NPDU npdu;
 
-  // Arguments.
-  protected final Integer bvlcPayloadLength;
-
-  public BVLCOriginalUnicastNPDU(NPDU npdu, Integer bvlcPayloadLength) {
+  public BVLCOriginalUnicastNPDU(NPDU npdu) {
     super();
     this.npdu = npdu;
-    this.bvlcPayloadLength = bvlcPayloadLength;
   }
 
   public NPDU getNpdu() {
@@ -102,21 +98,18 @@ public static BVLCBuilder staticParseBVLCBuilder(ReadBuffer readBuffer, Integer
 
     readBuffer.closeContext("BVLCOriginalUnicastNPDU");
     // Create the instance
-    return new BVLCOriginalUnicastNPDUBuilderImpl(npdu, bvlcPayloadLength);
+    return new BVLCOriginalUnicastNPDUBuilderImpl(npdu);
   }
 
   public static class BVLCOriginalUnicastNPDUBuilderImpl implements BVLC.BVLCBuilder {
     private final NPDU npdu;
-    private final Integer bvlcPayloadLength;
 
-    public BVLCOriginalUnicastNPDUBuilderImpl(NPDU npdu, Integer bvlcPayloadLength) {
+    public BVLCOriginalUnicastNPDUBuilderImpl(NPDU npdu) {
       this.npdu = npdu;
-      this.bvlcPayloadLength = bvlcPayloadLength;
     }
 
     public BVLCOriginalUnicastNPDU build() {
-      BVLCOriginalUnicastNPDU bVLCOriginalUnicastNPDU =
-          new BVLCOriginalUnicastNPDU(npdu, bvlcPayloadLength);
+      BVLCOriginalUnicastNPDU bVLCOriginalUnicastNPDU = new BVLCOriginalUnicastNPDU(npdu);
       return bVLCOriginalUnicastNPDU;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCReadBroadcastDistributionTableAck.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCReadBroadcastDistributionTableAck.java
index 658e7fb1914..1cb324251ea 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCReadBroadcastDistributionTableAck.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCReadBroadcastDistributionTableAck.java
@@ -45,14 +45,9 @@ public Short getBvlcFunction() {
   // Properties.
   protected final List<BVLCBroadcastDistributionTableEntry> table;
 
-  // Arguments.
-  protected final Integer bvlcPayloadLength;
-
-  public BVLCReadBroadcastDistributionTableAck(
-      List<BVLCBroadcastDistributionTableEntry> table, Integer bvlcPayloadLength) {
+  public BVLCReadBroadcastDistributionTableAck(List<BVLCBroadcastDistributionTableEntry> table) {
     super();
     this.table = table;
-    this.bvlcPayloadLength = bvlcPayloadLength;
   }
 
   public List<BVLCBroadcastDistributionTableEntry> getTable() {
@@ -109,22 +104,20 @@ public static BVLCBuilder staticParseBVLCBuilder(ReadBuffer readBuffer, Integer
 
     readBuffer.closeContext("BVLCReadBroadcastDistributionTableAck");
     // Create the instance
-    return new BVLCReadBroadcastDistributionTableAckBuilderImpl(table, bvlcPayloadLength);
+    return new BVLCReadBroadcastDistributionTableAckBuilderImpl(table);
   }
 
   public static class BVLCReadBroadcastDistributionTableAckBuilderImpl implements BVLC.BVLCBuilder {
     private final List<BVLCBroadcastDistributionTableEntry> table;
-    private final Integer bvlcPayloadLength;
 
     public BVLCReadBroadcastDistributionTableAckBuilderImpl(
-        List<BVLCBroadcastDistributionTableEntry> table, Integer bvlcPayloadLength) {
+        List<BVLCBroadcastDistributionTableEntry> table) {
       this.table = table;
-      this.bvlcPayloadLength = bvlcPayloadLength;
     }
 
     public BVLCReadBroadcastDistributionTableAck build() {
       BVLCReadBroadcastDistributionTableAck bVLCReadBroadcastDistributionTableAck =
-          new BVLCReadBroadcastDistributionTableAck(table, bvlcPayloadLength);
+          new BVLCReadBroadcastDistributionTableAck(table);
       return bVLCReadBroadcastDistributionTableAck;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCReadForeignDeviceTableAck.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCReadForeignDeviceTableAck.java
index 61fe0ff7e49..79b5561d2a8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCReadForeignDeviceTableAck.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCReadForeignDeviceTableAck.java
@@ -45,14 +45,9 @@ public Short getBvlcFunction() {
   // Properties.
   protected final List<BVLCForeignDeviceTableEntry> table;
 
-  // Arguments.
-  protected final Integer bvlcPayloadLength;
-
-  public BVLCReadForeignDeviceTableAck(
-      List<BVLCForeignDeviceTableEntry> table, Integer bvlcPayloadLength) {
+  public BVLCReadForeignDeviceTableAck(List<BVLCForeignDeviceTableEntry> table) {
     super();
     this.table = table;
-    this.bvlcPayloadLength = bvlcPayloadLength;
   }
 
   public List<BVLCForeignDeviceTableEntry> getTable() {
@@ -108,22 +103,19 @@ public static BVLCBuilder staticParseBVLCBuilder(ReadBuffer readBuffer, Integer
 
     readBuffer.closeContext("BVLCReadForeignDeviceTableAck");
     // Create the instance
-    return new BVLCReadForeignDeviceTableAckBuilderImpl(table, bvlcPayloadLength);
+    return new BVLCReadForeignDeviceTableAckBuilderImpl(table);
   }
 
   public static class BVLCReadForeignDeviceTableAckBuilderImpl implements BVLC.BVLCBuilder {
     private final List<BVLCForeignDeviceTableEntry> table;
-    private final Integer bvlcPayloadLength;
 
-    public BVLCReadForeignDeviceTableAckBuilderImpl(
-        List<BVLCForeignDeviceTableEntry> table, Integer bvlcPayloadLength) {
+    public BVLCReadForeignDeviceTableAckBuilderImpl(List<BVLCForeignDeviceTableEntry> table) {
       this.table = table;
-      this.bvlcPayloadLength = bvlcPayloadLength;
     }
 
     public BVLCReadForeignDeviceTableAck build() {
       BVLCReadForeignDeviceTableAck bVLCReadForeignDeviceTableAck =
-          new BVLCReadForeignDeviceTableAck(table, bvlcPayloadLength);
+          new BVLCReadForeignDeviceTableAck(table);
       return bVLCReadForeignDeviceTableAck;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCResultCodeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCResultCodeTagged.java
index 9bcb5b832ea..8dda57ce9f5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCResultCodeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCResultCodeTagged.java
@@ -41,17 +41,10 @@ public class BVLCResultCodeTagged implements Message {
   protected final BACnetTagHeader header;
   protected final BVLCResultCode value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public BVLCResultCodeTagged(
-      BACnetTagHeader header, BVLCResultCode value, Short tagNumber, TagClass tagClass) {
+  public BVLCResultCodeTagged(BACnetTagHeader header, BVLCResultCode value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -135,7 +128,7 @@ public static BVLCResultCodeTagged staticParse(
     readBuffer.closeContext("BVLCResultCodeTagged");
     // Create the instance
     BVLCResultCodeTagged _bVLCResultCodeTagged;
-    _bVLCResultCodeTagged = new BVLCResultCodeTagged(header, value, tagNumber, tagClass);
+    _bVLCResultCodeTagged = new BVLCResultCodeTagged(header, value);
     return _bVLCResultCodeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCSecureBVLL.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCSecureBVLL.java
index a3a67784125..49b8c139711 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCSecureBVLL.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCSecureBVLL.java
@@ -45,13 +45,9 @@ public Short getBvlcFunction() {
   // Properties.
   protected final byte[] securityWrapper;
 
-  // Arguments.
-  protected final Integer bvlcPayloadLength;
-
-  public BVLCSecureBVLL(byte[] securityWrapper, Integer bvlcPayloadLength) {
+  public BVLCSecureBVLL(byte[] securityWrapper) {
     super();
     this.securityWrapper = securityWrapper;
-    this.bvlcPayloadLength = bvlcPayloadLength;
   }
 
   public byte[] getSecurityWrapper() {
@@ -107,20 +103,18 @@ public static BVLCBuilder staticParseBVLCBuilder(ReadBuffer readBuffer, Integer
 
     readBuffer.closeContext("BVLCSecureBVLL");
     // Create the instance
-    return new BVLCSecureBVLLBuilderImpl(securityWrapper, bvlcPayloadLength);
+    return new BVLCSecureBVLLBuilderImpl(securityWrapper);
   }
 
   public static class BVLCSecureBVLLBuilderImpl implements BVLC.BVLCBuilder {
     private final byte[] securityWrapper;
-    private final Integer bvlcPayloadLength;
 
-    public BVLCSecureBVLLBuilderImpl(byte[] securityWrapper, Integer bvlcPayloadLength) {
+    public BVLCSecureBVLLBuilderImpl(byte[] securityWrapper) {
       this.securityWrapper = securityWrapper;
-      this.bvlcPayloadLength = bvlcPayloadLength;
     }
 
     public BVLCSecureBVLL build() {
-      BVLCSecureBVLL bVLCSecureBVLL = new BVLCSecureBVLL(securityWrapper, bvlcPayloadLength);
+      BVLCSecureBVLL bVLCSecureBVLL = new BVLCSecureBVLL(securityWrapper);
       return bVLCSecureBVLL;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCWriteBroadcastDistributionTable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCWriteBroadcastDistributionTable.java
index ea690cd1003..1ea9111a8a1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCWriteBroadcastDistributionTable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BVLCWriteBroadcastDistributionTable.java
@@ -45,14 +45,9 @@ public Short getBvlcFunction() {
   // Properties.
   protected final List<BVLCBroadcastDistributionTableEntry> table;
 
-  // Arguments.
-  protected final Integer bvlcPayloadLength;
-
-  public BVLCWriteBroadcastDistributionTable(
-      List<BVLCBroadcastDistributionTableEntry> table, Integer bvlcPayloadLength) {
+  public BVLCWriteBroadcastDistributionTable(List<BVLCBroadcastDistributionTableEntry> table) {
     super();
     this.table = table;
-    this.bvlcPayloadLength = bvlcPayloadLength;
   }
 
   public List<BVLCBroadcastDistributionTableEntry> getTable() {
@@ -109,22 +104,20 @@ public static BVLCBuilder staticParseBVLCBuilder(ReadBuffer readBuffer, Integer
 
     readBuffer.closeContext("BVLCWriteBroadcastDistributionTable");
     // Create the instance
-    return new BVLCWriteBroadcastDistributionTableBuilderImpl(table, bvlcPayloadLength);
+    return new BVLCWriteBroadcastDistributionTableBuilderImpl(table);
   }
 
   public static class BVLCWriteBroadcastDistributionTableBuilderImpl implements BVLC.BVLCBuilder {
     private final List<BVLCBroadcastDistributionTableEntry> table;
-    private final Integer bvlcPayloadLength;
 
     public BVLCWriteBroadcastDistributionTableBuilderImpl(
-        List<BVLCBroadcastDistributionTableEntry> table, Integer bvlcPayloadLength) {
+        List<BVLCBroadcastDistributionTableEntry> table) {
       this.table = table;
-      this.bvlcPayloadLength = bvlcPayloadLength;
     }
 
     public BVLCWriteBroadcastDistributionTable build() {
       BVLCWriteBroadcastDistributionTable bVLCWriteBroadcastDistributionTable =
-          new BVLCWriteBroadcastDistributionTable(table, bvlcPayloadLength);
+          new BVLCWriteBroadcastDistributionTable(table);
       return bVLCWriteBroadcastDistributionTable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BacnetConstants.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BacnetConstants.java
deleted file mode 100644
index 79667d2c397..00000000000
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BacnetConstants.java
+++ /dev/null
@@ -1,125 +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.bacnetip.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 BacnetConstants implements Message {
-
-  // Constant values.
-  public static final Integer BACNETUDPDEFAULTPORT = 47808;
-
-  public BacnetConstants() {
-    super();
-  }
-
-  public int getBacnetUdpDefaultPort() {
-    return BACNETUDPDEFAULTPORT;
-  }
-
-  public void serialize(WriteBuffer writeBuffer) throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("BacnetConstants");
-
-    // Const Field (bacnetUdpDefaultPort)
-    writeConstField(
-        "bacnetUdpDefaultPort", BACNETUDPDEFAULTPORT, writeUnsignedInt(writeBuffer, 16));
-
-    writeBuffer.popContext("BacnetConstants");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = 0;
-    BacnetConstants _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    // Const Field (bacnetUdpDefaultPort)
-    lengthInBits += 16;
-
-    return lengthInBits;
-  }
-
-  public static BacnetConstants staticParse(ReadBuffer readBuffer) throws ParseException {
-    readBuffer.pullContext("BacnetConstants");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    int bacnetUdpDefaultPort =
-        readConstField(
-            "bacnetUdpDefaultPort",
-            readUnsignedInt(readBuffer, 16),
-            BacnetConstants.BACNETUDPDEFAULTPORT);
-
-    readBuffer.closeContext("BacnetConstants");
-    // Create the instance
-    BacnetConstants _bacnetConstants;
-    _bacnetConstants = new BacnetConstants();
-    return _bacnetConstants;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof BacnetConstants)) {
-      return false;
-    }
-    BacnetConstants that = (BacnetConstants) o;
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash();
-  }
-
-  @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/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/Constants.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/Constants.java
new file mode 100644
index 00000000000..211f7c10094
--- /dev/null
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/Constants.java
@@ -0,0 +1,42 @@
+/*
+ * 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.bacnetip.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 Constants {
+
+  // Constant values.
+  public static final Integer BACNETUDPDEFAULTPORT = 47808;
+}
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ErrorClassTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ErrorClassTagged.java
index 9407b292ccc..3edfa38cf99 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ErrorClassTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ErrorClassTagged.java
@@ -42,22 +42,11 @@ public class ErrorClassTagged implements Message {
   protected final ErrorClass value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public ErrorClassTagged(
-      BACnetTagHeader header,
-      ErrorClass value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+  public ErrorClassTagged(BACnetTagHeader header, ErrorClass value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -178,7 +167,7 @@ public static ErrorClassTagged staticParse(
     readBuffer.closeContext("ErrorClassTagged");
     // Create the instance
     ErrorClassTagged _errorClassTagged;
-    _errorClassTagged = new ErrorClassTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _errorClassTagged = new ErrorClassTagged(header, value, proprietaryValue);
     return _errorClassTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ErrorCodeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ErrorCodeTagged.java
index f05d5f22c8e..6db54135b71 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ErrorCodeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ErrorCodeTagged.java
@@ -42,22 +42,11 @@ public class ErrorCodeTagged implements Message {
   protected final ErrorCode value;
   protected final long proprietaryValue;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public ErrorCodeTagged(
-      BACnetTagHeader header,
-      ErrorCode value,
-      long proprietaryValue,
-      Short tagNumber,
-      TagClass tagClass) {
+  public ErrorCodeTagged(BACnetTagHeader header, ErrorCode value, long proprietaryValue) {
     super();
     this.header = header;
     this.value = value;
     this.proprietaryValue = proprietaryValue;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -176,7 +165,7 @@ public static ErrorCodeTagged staticParse(
     readBuffer.closeContext("ErrorCodeTagged");
     // Create the instance
     ErrorCodeTagged _errorCodeTagged;
-    _errorCodeTagged = new ErrorCodeTagged(header, value, proprietaryValue, tagNumber, tagClass);
+    _errorCodeTagged = new ErrorCodeTagged(header, value, proprietaryValue);
     return _errorCodeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ErrorEnclosed.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ErrorEnclosed.java
index 8ac5eb008d0..3d8c43849b2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ErrorEnclosed.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ErrorEnclosed.java
@@ -42,16 +42,11 @@ public class ErrorEnclosed implements Message {
   protected final Error error;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
-  public ErrorEnclosed(
-      BACnetOpeningTag openingTag, Error error, BACnetClosingTag closingTag, Short tagNumber) {
+  public ErrorEnclosed(BACnetOpeningTag openingTag, Error error, BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.error = error;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -130,7 +125,7 @@ public static ErrorEnclosed staticParse(ReadBuffer readBuffer, Short tagNumber)
     readBuffer.closeContext("ErrorEnclosed");
     // Create the instance
     ErrorEnclosed _errorEnclosed;
-    _errorEnclosed = new ErrorEnclosed(openingTag, error, closingTag, tagNumber);
+    _errorEnclosed = new ErrorEnclosed(openingTag, error, closingTag);
     return _errorEnclosed;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ListOfCovNotificationsList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ListOfCovNotificationsList.java
index 9769457be9e..08322c1cf16 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ListOfCovNotificationsList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ListOfCovNotificationsList.java
@@ -42,19 +42,14 @@ public class ListOfCovNotificationsList implements Message {
   protected final List<ListOfCovNotifications> specifications;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public ListOfCovNotificationsList(
       BACnetOpeningTag openingTag,
       List<ListOfCovNotifications> specifications,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.specifications = specifications;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -144,7 +139,7 @@ public static ListOfCovNotificationsList staticParse(ReadBuffer readBuffer, Shor
     // Create the instance
     ListOfCovNotificationsList _listOfCovNotificationsList;
     _listOfCovNotificationsList =
-        new ListOfCovNotificationsList(openingTag, specifications, closingTag, tagNumber);
+        new ListOfCovNotificationsList(openingTag, specifications, closingTag);
     return _listOfCovNotificationsList;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ListOfCovNotificationsValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ListOfCovNotificationsValue.java
index aa5cf2339f9..4d0144fc6ba 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ListOfCovNotificationsValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/ListOfCovNotificationsValue.java
@@ -43,21 +43,16 @@ public class ListOfCovNotificationsValue implements Message {
   protected final BACnetConstructedData propertyValue;
   protected final BACnetContextTagTime timeOfChange;
 
-  // Arguments.
-  protected final BACnetObjectType objectTypeArgument;
-
   public ListOfCovNotificationsValue(
       BACnetPropertyIdentifierTagged propertyIdentifier,
       BACnetContextTagUnsignedInteger arrayIndex,
       BACnetConstructedData propertyValue,
-      BACnetContextTagTime timeOfChange,
-      BACnetObjectType objectTypeArgument) {
+      BACnetContextTagTime timeOfChange) {
     super();
     this.propertyIdentifier = propertyIdentifier;
     this.arrayIndex = arrayIndex;
     this.propertyValue = propertyValue;
     this.timeOfChange = timeOfChange;
-    this.objectTypeArgument = objectTypeArgument;
   }
 
   public BACnetPropertyIdentifierTagged getPropertyIdentifier() {
@@ -182,7 +177,7 @@ public static ListOfCovNotificationsValue staticParse(
     ListOfCovNotificationsValue _listOfCovNotificationsValue;
     _listOfCovNotificationsValue =
         new ListOfCovNotificationsValue(
-            propertyIdentifier, arrayIndex, propertyValue, timeOfChange, objectTypeArgument);
+            propertyIdentifier, arrayIndex, propertyValue, timeOfChange);
     return _listOfCovNotificationsValue;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLM.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLM.java
index c5fac1a1ad6..0e5d459f34e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLM.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLM.java
@@ -40,12 +40,8 @@ public abstract class NLM implements Message {
   // Abstract accessors for discriminator values.
   public abstract Short getMessageType();
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public NLM(Integer apduLength) {
+  public NLM() {
     super();
-    this.apduLength = apduLength;
   }
 
   public boolean getIsVendorProprietaryMessage() {
@@ -163,13 +159,12 @@ public static NLM staticParse(ReadBuffer readBuffer, Integer apduLength) throws
 
     readBuffer.closeContext("NLM");
     // Create the instance
-    NLM _nLM = builder.build(apduLength);
-
+    NLM _nLM = builder.build();
     return _nLM;
   }
 
   public interface NLMBuilder {
-    NLM build(Integer apduLength);
+    NLM build();
   }
 
   @Override
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMChallengeRequest.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMChallengeRequest.java
index 358f7af7296..31991346142 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMChallengeRequest.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMChallengeRequest.java
@@ -47,16 +47,12 @@ public Short getMessageType() {
   protected final long originalMessageId;
   protected final long originalTimestamp;
 
-  // Arguments.
-  protected final Integer apduLength;
-
   public NLMChallengeRequest(
-      byte messageChallenge, long originalMessageId, long originalTimestamp, Integer apduLength) {
-    super(apduLength);
+      byte messageChallenge, long originalMessageId, long originalTimestamp) {
+    super();
     this.messageChallenge = messageChallenge;
     this.originalMessageId = originalMessageId;
     this.originalTimestamp = originalTimestamp;
-    this.apduLength = apduLength;
   }
 
   public byte getMessageChallenge() {
@@ -127,28 +123,24 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
     readBuffer.closeContext("NLMChallengeRequest");
     // Create the instance
     return new NLMChallengeRequestBuilderImpl(
-        messageChallenge, originalMessageId, originalTimestamp, apduLength);
+        messageChallenge, originalMessageId, originalTimestamp);
   }
 
   public static class NLMChallengeRequestBuilderImpl implements NLM.NLMBuilder {
     private final byte messageChallenge;
     private final long originalMessageId;
     private final long originalTimestamp;
-    private final Integer apduLength;
 
     public NLMChallengeRequestBuilderImpl(
-        byte messageChallenge, long originalMessageId, long originalTimestamp, Integer apduLength) {
+        byte messageChallenge, long originalMessageId, long originalTimestamp) {
       this.messageChallenge = messageChallenge;
       this.originalMessageId = originalMessageId;
       this.originalTimestamp = originalTimestamp;
-      this.apduLength = apduLength;
     }
 
-    public NLMChallengeRequest build(Integer apduLength) {
-
+    public NLMChallengeRequest build() {
       NLMChallengeRequest nLMChallengeRequest =
-          new NLMChallengeRequest(
-              messageChallenge, originalMessageId, originalTimestamp, apduLength);
+          new NLMChallengeRequest(messageChallenge, originalMessageId, originalTimestamp);
       return nLMChallengeRequest;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMDisconnectConnectionToNetwork.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMDisconnectConnectionToNetwork.java
index 702e7fb21db..c993fd92877 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMDisconnectConnectionToNetwork.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMDisconnectConnectionToNetwork.java
@@ -45,13 +45,9 @@ public Short getMessageType() {
   // Properties.
   protected final int destinationNetworkAddress;
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public NLMDisconnectConnectionToNetwork(int destinationNetworkAddress, Integer apduLength) {
-    super(apduLength);
+  public NLMDisconnectConnectionToNetwork(int destinationNetworkAddress) {
+    super();
     this.destinationNetworkAddress = destinationNetworkAddress;
-    this.apduLength = apduLength;
   }
 
   public int getDestinationNetworkAddress() {
@@ -99,23 +95,19 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
 
     readBuffer.closeContext("NLMDisconnectConnectionToNetwork");
     // Create the instance
-    return new NLMDisconnectConnectionToNetworkBuilderImpl(destinationNetworkAddress, apduLength);
+    return new NLMDisconnectConnectionToNetworkBuilderImpl(destinationNetworkAddress);
   }
 
   public static class NLMDisconnectConnectionToNetworkBuilderImpl implements NLM.NLMBuilder {
     private final int destinationNetworkAddress;
-    private final Integer apduLength;
 
-    public NLMDisconnectConnectionToNetworkBuilderImpl(
-        int destinationNetworkAddress, Integer apduLength) {
+    public NLMDisconnectConnectionToNetworkBuilderImpl(int destinationNetworkAddress) {
       this.destinationNetworkAddress = destinationNetworkAddress;
-      this.apduLength = apduLength;
     }
 
-    public NLMDisconnectConnectionToNetwork build(Integer apduLength) {
-
+    public NLMDisconnectConnectionToNetwork build() {
       NLMDisconnectConnectionToNetwork nLMDisconnectConnectionToNetwork =
-          new NLMDisconnectConnectionToNetwork(destinationNetworkAddress, apduLength);
+          new NLMDisconnectConnectionToNetwork(destinationNetworkAddress);
       return nLMDisconnectConnectionToNetwork;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMEstablishConnectionToNetwork.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMEstablishConnectionToNetwork.java
index 42b885773c7..7daefcc6066 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMEstablishConnectionToNetwork.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMEstablishConnectionToNetwork.java
@@ -46,15 +46,10 @@ public Short getMessageType() {
   protected final int destinationNetworkAddress;
   protected final short terminationTime;
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public NLMEstablishConnectionToNetwork(
-      int destinationNetworkAddress, short terminationTime, Integer apduLength) {
-    super(apduLength);
+  public NLMEstablishConnectionToNetwork(int destinationNetworkAddress, short terminationTime) {
+    super();
     this.destinationNetworkAddress = destinationNetworkAddress;
     this.terminationTime = terminationTime;
-    this.apduLength = apduLength;
   }
 
   public int getDestinationNetworkAddress() {
@@ -115,26 +110,22 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
     readBuffer.closeContext("NLMEstablishConnectionToNetwork");
     // Create the instance
     return new NLMEstablishConnectionToNetworkBuilderImpl(
-        destinationNetworkAddress, terminationTime, apduLength);
+        destinationNetworkAddress, terminationTime);
   }
 
   public static class NLMEstablishConnectionToNetworkBuilderImpl implements NLM.NLMBuilder {
     private final int destinationNetworkAddress;
     private final short terminationTime;
-    private final Integer apduLength;
 
     public NLMEstablishConnectionToNetworkBuilderImpl(
-        int destinationNetworkAddress, short terminationTime, Integer apduLength) {
+        int destinationNetworkAddress, short terminationTime) {
       this.destinationNetworkAddress = destinationNetworkAddress;
       this.terminationTime = terminationTime;
-      this.apduLength = apduLength;
     }
 
-    public NLMEstablishConnectionToNetwork build(Integer apduLength) {
-
+    public NLMEstablishConnectionToNetwork build() {
       NLMEstablishConnectionToNetwork nLMEstablishConnectionToNetwork =
-          new NLMEstablishConnectionToNetwork(
-              destinationNetworkAddress, terminationTime, apduLength);
+          new NLMEstablishConnectionToNetwork(destinationNetworkAddress, terminationTime);
       return nLMEstablishConnectionToNetwork;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMIAmRouterToNetwork.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMIAmRouterToNetwork.java
index a0d1a35be7c..6b38f807ccf 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMIAmRouterToNetwork.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMIAmRouterToNetwork.java
@@ -45,13 +45,9 @@ public Short getMessageType() {
   // Properties.
   protected final List<Integer> destinationNetworkAddresses;
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public NLMIAmRouterToNetwork(List<Integer> destinationNetworkAddresses, Integer apduLength) {
-    super(apduLength);
+  public NLMIAmRouterToNetwork(List<Integer> destinationNetworkAddresses) {
+    super();
     this.destinationNetworkAddresses = destinationNetworkAddresses;
-    this.apduLength = apduLength;
   }
 
   public List<Integer> getDestinationNetworkAddresses() {
@@ -104,23 +100,19 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
 
     readBuffer.closeContext("NLMIAmRouterToNetwork");
     // Create the instance
-    return new NLMIAmRouterToNetworkBuilderImpl(destinationNetworkAddresses, apduLength);
+    return new NLMIAmRouterToNetworkBuilderImpl(destinationNetworkAddresses);
   }
 
   public static class NLMIAmRouterToNetworkBuilderImpl implements NLM.NLMBuilder {
     private final List<Integer> destinationNetworkAddresses;
-    private final Integer apduLength;
 
-    public NLMIAmRouterToNetworkBuilderImpl(
-        List<Integer> destinationNetworkAddresses, Integer apduLength) {
+    public NLMIAmRouterToNetworkBuilderImpl(List<Integer> destinationNetworkAddresses) {
       this.destinationNetworkAddresses = destinationNetworkAddresses;
-      this.apduLength = apduLength;
     }
 
-    public NLMIAmRouterToNetwork build(Integer apduLength) {
-
+    public NLMIAmRouterToNetwork build() {
       NLMIAmRouterToNetwork nLMIAmRouterToNetwork =
-          new NLMIAmRouterToNetwork(destinationNetworkAddresses, apduLength);
+          new NLMIAmRouterToNetwork(destinationNetworkAddresses);
       return nLMIAmRouterToNetwork;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMICouldBeRouterToNetwork.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMICouldBeRouterToNetwork.java
index 30bb6f7d778..39bddc402f5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMICouldBeRouterToNetwork.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMICouldBeRouterToNetwork.java
@@ -46,15 +46,10 @@ public Short getMessageType() {
   protected final int destinationNetworkAddress;
   protected final short performanceIndex;
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public NLMICouldBeRouterToNetwork(
-      int destinationNetworkAddress, short performanceIndex, Integer apduLength) {
-    super(apduLength);
+  public NLMICouldBeRouterToNetwork(int destinationNetworkAddress, short performanceIndex) {
+    super();
     this.destinationNetworkAddress = destinationNetworkAddress;
     this.performanceIndex = performanceIndex;
-    this.apduLength = apduLength;
   }
 
   public int getDestinationNetworkAddress() {
@@ -114,26 +109,22 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
 
     readBuffer.closeContext("NLMICouldBeRouterToNetwork");
     // Create the instance
-    return new NLMICouldBeRouterToNetworkBuilderImpl(
-        destinationNetworkAddress, performanceIndex, apduLength);
+    return new NLMICouldBeRouterToNetworkBuilderImpl(destinationNetworkAddress, performanceIndex);
   }
 
   public static class NLMICouldBeRouterToNetworkBuilderImpl implements NLM.NLMBuilder {
     private final int destinationNetworkAddress;
     private final short performanceIndex;
-    private final Integer apduLength;
 
     public NLMICouldBeRouterToNetworkBuilderImpl(
-        int destinationNetworkAddress, short performanceIndex, Integer apduLength) {
+        int destinationNetworkAddress, short performanceIndex) {
       this.destinationNetworkAddress = destinationNetworkAddress;
       this.performanceIndex = performanceIndex;
-      this.apduLength = apduLength;
     }
 
-    public NLMICouldBeRouterToNetwork build(Integer apduLength) {
-
+    public NLMICouldBeRouterToNetwork build() {
       NLMICouldBeRouterToNetwork nLMICouldBeRouterToNetwork =
-          new NLMICouldBeRouterToNetwork(destinationNetworkAddress, performanceIndex, apduLength);
+          new NLMICouldBeRouterToNetwork(destinationNetworkAddress, performanceIndex);
       return nLMICouldBeRouterToNetwork;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMInitializeRoutingTable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMInitializeRoutingTable.java
index 0887973d352..d132e721858 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMInitializeRoutingTable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMInitializeRoutingTable.java
@@ -46,17 +46,11 @@ public Short getMessageType() {
   protected final short numberOfPorts;
   protected final List<NLMInitializeRoutingTablePortMapping> portMappings;
 
-  // Arguments.
-  protected final Integer apduLength;
-
   public NLMInitializeRoutingTable(
-      short numberOfPorts,
-      List<NLMInitializeRoutingTablePortMapping> portMappings,
-      Integer apduLength) {
-    super(apduLength);
+      short numberOfPorts, List<NLMInitializeRoutingTablePortMapping> portMappings) {
+    super();
     this.numberOfPorts = numberOfPorts;
     this.portMappings = portMappings;
-    this.apduLength = apduLength;
   }
 
   public short getNumberOfPorts() {
@@ -125,27 +119,22 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
 
     readBuffer.closeContext("NLMInitializeRoutingTable");
     // Create the instance
-    return new NLMInitializeRoutingTableBuilderImpl(numberOfPorts, portMappings, apduLength);
+    return new NLMInitializeRoutingTableBuilderImpl(numberOfPorts, portMappings);
   }
 
   public static class NLMInitializeRoutingTableBuilderImpl implements NLM.NLMBuilder {
     private final short numberOfPorts;
     private final List<NLMInitializeRoutingTablePortMapping> portMappings;
-    private final Integer apduLength;
 
     public NLMInitializeRoutingTableBuilderImpl(
-        short numberOfPorts,
-        List<NLMInitializeRoutingTablePortMapping> portMappings,
-        Integer apduLength) {
+        short numberOfPorts, List<NLMInitializeRoutingTablePortMapping> portMappings) {
       this.numberOfPorts = numberOfPorts;
       this.portMappings = portMappings;
-      this.apduLength = apduLength;
     }
 
-    public NLMInitializeRoutingTable build(Integer apduLength) {
-
+    public NLMInitializeRoutingTable build() {
       NLMInitializeRoutingTable nLMInitializeRoutingTable =
-          new NLMInitializeRoutingTable(numberOfPorts, portMappings, apduLength);
+          new NLMInitializeRoutingTable(numberOfPorts, portMappings);
       return nLMInitializeRoutingTable;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMInitializeRoutingTableAck.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMInitializeRoutingTableAck.java
index 603b80f1a09..0523f45719e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMInitializeRoutingTableAck.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMInitializeRoutingTableAck.java
@@ -46,17 +46,11 @@ public Short getMessageType() {
   protected final short numberOfPorts;
   protected final List<NLMInitializeRoutingTablePortMapping> portMappings;
 
-  // Arguments.
-  protected final Integer apduLength;
-
   public NLMInitializeRoutingTableAck(
-      short numberOfPorts,
-      List<NLMInitializeRoutingTablePortMapping> portMappings,
-      Integer apduLength) {
-    super(apduLength);
+      short numberOfPorts, List<NLMInitializeRoutingTablePortMapping> portMappings) {
+    super();
     this.numberOfPorts = numberOfPorts;
     this.portMappings = portMappings;
-    this.apduLength = apduLength;
   }
 
   public short getNumberOfPorts() {
@@ -125,27 +119,22 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
 
     readBuffer.closeContext("NLMInitializeRoutingTableAck");
     // Create the instance
-    return new NLMInitializeRoutingTableAckBuilderImpl(numberOfPorts, portMappings, apduLength);
+    return new NLMInitializeRoutingTableAckBuilderImpl(numberOfPorts, portMappings);
   }
 
   public static class NLMInitializeRoutingTableAckBuilderImpl implements NLM.NLMBuilder {
     private final short numberOfPorts;
     private final List<NLMInitializeRoutingTablePortMapping> portMappings;
-    private final Integer apduLength;
 
     public NLMInitializeRoutingTableAckBuilderImpl(
-        short numberOfPorts,
-        List<NLMInitializeRoutingTablePortMapping> portMappings,
-        Integer apduLength) {
+        short numberOfPorts, List<NLMInitializeRoutingTablePortMapping> portMappings) {
       this.numberOfPorts = numberOfPorts;
       this.portMappings = portMappings;
-      this.apduLength = apduLength;
     }
 
-    public NLMInitializeRoutingTableAck build(Integer apduLength) {
-
+    public NLMInitializeRoutingTableAck build() {
       NLMInitializeRoutingTableAck nLMInitializeRoutingTableAck =
-          new NLMInitializeRoutingTableAck(numberOfPorts, portMappings, apduLength);
+          new NLMInitializeRoutingTableAck(numberOfPorts, portMappings);
       return nLMInitializeRoutingTableAck;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMNetworkNumberIs.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMNetworkNumberIs.java
index f132c1b0060..0de658ead15 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMNetworkNumberIs.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMNetworkNumberIs.java
@@ -45,18 +45,13 @@ public Short getMessageType() {
   // Properties.
   protected final int networkNumber;
   protected final boolean networkNumberConfigured;
-
-  // Arguments.
-  protected final Integer apduLength;
   // Reserved Fields
   private Byte reservedField0;
 
-  public NLMNetworkNumberIs(
-      int networkNumber, boolean networkNumberConfigured, Integer apduLength) {
-    super(apduLength);
+  public NLMNetworkNumberIs(int networkNumber, boolean networkNumberConfigured) {
+    super();
     this.networkNumber = networkNumber;
     this.networkNumberConfigured = networkNumberConfigured;
-    this.apduLength = apduLength;
   }
 
   public int getNetworkNumber() {
@@ -127,30 +122,24 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
     readBuffer.closeContext("NLMNetworkNumberIs");
     // Create the instance
     return new NLMNetworkNumberIsBuilderImpl(
-        networkNumber, networkNumberConfigured, apduLength, reservedField0);
+        networkNumber, networkNumberConfigured, reservedField0);
   }
 
   public static class NLMNetworkNumberIsBuilderImpl implements NLM.NLMBuilder {
     private final int networkNumber;
     private final boolean networkNumberConfigured;
-    private final Integer apduLength;
     private final Byte reservedField0;
 
     public NLMNetworkNumberIsBuilderImpl(
-        int networkNumber,
-        boolean networkNumberConfigured,
-        Integer apduLength,
-        Byte reservedField0) {
+        int networkNumber, boolean networkNumberConfigured, Byte reservedField0) {
       this.networkNumber = networkNumber;
       this.networkNumberConfigured = networkNumberConfigured;
-      this.apduLength = apduLength;
       this.reservedField0 = reservedField0;
     }
 
-    public NLMNetworkNumberIs build(Integer apduLength) {
-
+    public NLMNetworkNumberIs build() {
       NLMNetworkNumberIs nLMNetworkNumberIs =
-          new NLMNetworkNumberIs(networkNumber, networkNumberConfigured, apduLength);
+          new NLMNetworkNumberIs(networkNumber, networkNumberConfigured);
       nLMNetworkNumberIs.reservedField0 = reservedField0;
       return nLMNetworkNumberIs;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectMessageToNetwork.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectMessageToNetwork.java
index a5c7ca63f55..8d5c1b0ff03 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectMessageToNetwork.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectMessageToNetwork.java
@@ -46,17 +46,11 @@ public Short getMessageType() {
   protected final NLMRejectMessageToNetworkRejectReason rejectReason;
   protected final int destinationNetworkAddress;
 
-  // Arguments.
-  protected final Integer apduLength;
-
   public NLMRejectMessageToNetwork(
-      NLMRejectMessageToNetworkRejectReason rejectReason,
-      int destinationNetworkAddress,
-      Integer apduLength) {
-    super(apduLength);
+      NLMRejectMessageToNetworkRejectReason rejectReason, int destinationNetworkAddress) {
+    super();
     this.rejectReason = rejectReason;
     this.destinationNetworkAddress = destinationNetworkAddress;
-    this.apduLength = apduLength;
   }
 
   public NLMRejectMessageToNetworkRejectReason getRejectReason() {
@@ -129,28 +123,22 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
 
     readBuffer.closeContext("NLMRejectMessageToNetwork");
     // Create the instance
-    return new NLMRejectMessageToNetworkBuilderImpl(
-        rejectReason, destinationNetworkAddress, apduLength);
+    return new NLMRejectMessageToNetworkBuilderImpl(rejectReason, destinationNetworkAddress);
   }
 
   public static class NLMRejectMessageToNetworkBuilderImpl implements NLM.NLMBuilder {
     private final NLMRejectMessageToNetworkRejectReason rejectReason;
     private final int destinationNetworkAddress;
-    private final Integer apduLength;
 
     public NLMRejectMessageToNetworkBuilderImpl(
-        NLMRejectMessageToNetworkRejectReason rejectReason,
-        int destinationNetworkAddress,
-        Integer apduLength) {
+        NLMRejectMessageToNetworkRejectReason rejectReason, int destinationNetworkAddress) {
       this.rejectReason = rejectReason;
       this.destinationNetworkAddress = destinationNetworkAddress;
-      this.apduLength = apduLength;
     }
 
-    public NLMRejectMessageToNetwork build(Integer apduLength) {
-
+    public NLMRejectMessageToNetwork build() {
       NLMRejectMessageToNetwork nLMRejectMessageToNetwork =
-          new NLMRejectMessageToNetwork(rejectReason, destinationNetworkAddress, apduLength);
+          new NLMRejectMessageToNetwork(rejectReason, destinationNetworkAddress);
       return nLMRejectMessageToNetwork;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRequestKeyUpdate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRequestKeyUpdate.java
index 2f9e165d089..b69b56f29e2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRequestKeyUpdate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRequestKeyUpdate.java
@@ -51,9 +51,6 @@ public Short getMessageType() {
   protected final long set2ExpirationTime;
   protected final byte distributionKeyRevision;
 
-  // Arguments.
-  protected final Integer apduLength;
-
   public NLMRequestKeyUpdate(
       byte set1KeyRevision,
       long set1ActivationTime,
@@ -61,9 +58,8 @@ public NLMRequestKeyUpdate(
       byte set2KeyRevision,
       long set2ActivationTime,
       long set2ExpirationTime,
-      byte distributionKeyRevision,
-      Integer apduLength) {
-    super(apduLength);
+      byte distributionKeyRevision) {
+    super();
     this.set1KeyRevision = set1KeyRevision;
     this.set1ActivationTime = set1ActivationTime;
     this.set1ExpirationTime = set1ExpirationTime;
@@ -71,7 +67,6 @@ public NLMRequestKeyUpdate(
     this.set2ActivationTime = set2ActivationTime;
     this.set2ExpirationTime = set2ExpirationTime;
     this.distributionKeyRevision = distributionKeyRevision;
-    this.apduLength = apduLength;
   }
 
   public byte getSet1KeyRevision() {
@@ -201,8 +196,7 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
         set2KeyRevision,
         set2ActivationTime,
         set2ExpirationTime,
-        distributionKeyRevision,
-        apduLength);
+        distributionKeyRevision);
   }
 
   public static class NLMRequestKeyUpdateBuilderImpl implements NLM.NLMBuilder {
@@ -213,7 +207,6 @@ public static class NLMRequestKeyUpdateBuilderImpl implements NLM.NLMBuilder {
     private final long set2ActivationTime;
     private final long set2ExpirationTime;
     private final byte distributionKeyRevision;
-    private final Integer apduLength;
 
     public NLMRequestKeyUpdateBuilderImpl(
         byte set1KeyRevision,
@@ -222,8 +215,7 @@ public NLMRequestKeyUpdateBuilderImpl(
         byte set2KeyRevision,
         long set2ActivationTime,
         long set2ExpirationTime,
-        byte distributionKeyRevision,
-        Integer apduLength) {
+        byte distributionKeyRevision) {
       this.set1KeyRevision = set1KeyRevision;
       this.set1ActivationTime = set1ActivationTime;
       this.set1ExpirationTime = set1ExpirationTime;
@@ -231,11 +223,9 @@ public NLMRequestKeyUpdateBuilderImpl(
       this.set2ActivationTime = set2ActivationTime;
       this.set2ExpirationTime = set2ExpirationTime;
       this.distributionKeyRevision = distributionKeyRevision;
-      this.apduLength = apduLength;
     }
 
-    public NLMRequestKeyUpdate build(Integer apduLength) {
-
+    public NLMRequestKeyUpdate build() {
       NLMRequestKeyUpdate nLMRequestKeyUpdate =
           new NLMRequestKeyUpdate(
               set1KeyRevision,
@@ -244,8 +234,7 @@ public NLMRequestKeyUpdate build(Integer apduLength) {
               set2KeyRevision,
               set2ActivationTime,
               set2ExpirationTime,
-              distributionKeyRevision,
-              apduLength);
+              distributionKeyRevision);
       return nLMRequestKeyUpdate;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRequestMasterKey.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRequestMasterKey.java
index 1941a70e676..ce52e7732de 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRequestMasterKey.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRequestMasterKey.java
@@ -46,17 +46,11 @@ public Short getMessageType() {
   protected final short numberOfSupportedKeyAlgorithms;
   protected final byte[] encryptionAndSignatureAlgorithms;
 
-  // Arguments.
-  protected final Integer apduLength;
-
   public NLMRequestMasterKey(
-      short numberOfSupportedKeyAlgorithms,
-      byte[] encryptionAndSignatureAlgorithms,
-      Integer apduLength) {
-    super(apduLength);
+      short numberOfSupportedKeyAlgorithms, byte[] encryptionAndSignatureAlgorithms) {
+    super();
     this.numberOfSupportedKeyAlgorithms = numberOfSupportedKeyAlgorithms;
     this.encryptionAndSignatureAlgorithms = encryptionAndSignatureAlgorithms;
-    this.apduLength = apduLength;
   }
 
   public short getNumberOfSupportedKeyAlgorithms() {
@@ -126,28 +120,22 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
     readBuffer.closeContext("NLMRequestMasterKey");
     // Create the instance
     return new NLMRequestMasterKeyBuilderImpl(
-        numberOfSupportedKeyAlgorithms, encryptionAndSignatureAlgorithms, apduLength);
+        numberOfSupportedKeyAlgorithms, encryptionAndSignatureAlgorithms);
   }
 
   public static class NLMRequestMasterKeyBuilderImpl implements NLM.NLMBuilder {
     private final short numberOfSupportedKeyAlgorithms;
     private final byte[] encryptionAndSignatureAlgorithms;
-    private final Integer apduLength;
 
     public NLMRequestMasterKeyBuilderImpl(
-        short numberOfSupportedKeyAlgorithms,
-        byte[] encryptionAndSignatureAlgorithms,
-        Integer apduLength) {
+        short numberOfSupportedKeyAlgorithms, byte[] encryptionAndSignatureAlgorithms) {
       this.numberOfSupportedKeyAlgorithms = numberOfSupportedKeyAlgorithms;
       this.encryptionAndSignatureAlgorithms = encryptionAndSignatureAlgorithms;
-      this.apduLength = apduLength;
     }
 
-    public NLMRequestMasterKey build(Integer apduLength) {
-
+    public NLMRequestMasterKey build() {
       NLMRequestMasterKey nLMRequestMasterKey =
-          new NLMRequestMasterKey(
-              numberOfSupportedKeyAlgorithms, encryptionAndSignatureAlgorithms, apduLength);
+          new NLMRequestMasterKey(numberOfSupportedKeyAlgorithms, encryptionAndSignatureAlgorithms);
       return nLMRequestMasterKey;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMReserved.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMReserved.java
index d4b5f01f50b..5e5a522a855 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMReserved.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMReserved.java
@@ -45,13 +45,9 @@ public Short getMessageType() {
   // Properties.
   protected final byte[] unknownBytes;
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public NLMReserved(byte[] unknownBytes, Integer apduLength) {
-    super(apduLength);
+  public NLMReserved(byte[] unknownBytes) {
+    super();
     this.unknownBytes = unknownBytes;
-    this.apduLength = apduLength;
   }
 
   public byte[] getUnknownBytes() {
@@ -101,21 +97,18 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
 
     readBuffer.closeContext("NLMReserved");
     // Create the instance
-    return new NLMReservedBuilderImpl(unknownBytes, apduLength);
+    return new NLMReservedBuilderImpl(unknownBytes);
   }
 
   public static class NLMReservedBuilderImpl implements NLM.NLMBuilder {
     private final byte[] unknownBytes;
-    private final Integer apduLength;
 
-    public NLMReservedBuilderImpl(byte[] unknownBytes, Integer apduLength) {
+    public NLMReservedBuilderImpl(byte[] unknownBytes) {
       this.unknownBytes = unknownBytes;
-      this.apduLength = apduLength;
     }
 
-    public NLMReserved build(Integer apduLength) {
-
-      NLMReserved nLMReserved = new NLMReserved(unknownBytes, apduLength);
+    public NLMReserved build() {
+      NLMReserved nLMReserved = new NLMReserved(unknownBytes);
       return nLMReserved;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRouterAvailableToNetwork.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRouterAvailableToNetwork.java
index 3e3cef7173c..f52a162087e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRouterAvailableToNetwork.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRouterAvailableToNetwork.java
@@ -45,14 +45,9 @@ public Short getMessageType() {
   // Properties.
   protected final List<Integer> destinationNetworkAddresses;
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public NLMRouterAvailableToNetwork(
-      List<Integer> destinationNetworkAddresses, Integer apduLength) {
-    super(apduLength);
+  public NLMRouterAvailableToNetwork(List<Integer> destinationNetworkAddresses) {
+    super();
     this.destinationNetworkAddresses = destinationNetworkAddresses;
-    this.apduLength = apduLength;
   }
 
   public List<Integer> getDestinationNetworkAddresses() {
@@ -105,23 +100,19 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
 
     readBuffer.closeContext("NLMRouterAvailableToNetwork");
     // Create the instance
-    return new NLMRouterAvailableToNetworkBuilderImpl(destinationNetworkAddresses, apduLength);
+    return new NLMRouterAvailableToNetworkBuilderImpl(destinationNetworkAddresses);
   }
 
   public static class NLMRouterAvailableToNetworkBuilderImpl implements NLM.NLMBuilder {
     private final List<Integer> destinationNetworkAddresses;
-    private final Integer apduLength;
 
-    public NLMRouterAvailableToNetworkBuilderImpl(
-        List<Integer> destinationNetworkAddresses, Integer apduLength) {
+    public NLMRouterAvailableToNetworkBuilderImpl(List<Integer> destinationNetworkAddresses) {
       this.destinationNetworkAddresses = destinationNetworkAddresses;
-      this.apduLength = apduLength;
     }
 
-    public NLMRouterAvailableToNetwork build(Integer apduLength) {
-
+    public NLMRouterAvailableToNetwork build() {
       NLMRouterAvailableToNetwork nLMRouterAvailableToNetwork =
-          new NLMRouterAvailableToNetwork(destinationNetworkAddresses, apduLength);
+          new NLMRouterAvailableToNetwork(destinationNetworkAddresses);
       return nLMRouterAvailableToNetwork;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRouterBusyToNetwork.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRouterBusyToNetwork.java
index 3237321d204..16f099d3fca 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRouterBusyToNetwork.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRouterBusyToNetwork.java
@@ -45,13 +45,9 @@ public Short getMessageType() {
   // Properties.
   protected final List<Integer> destinationNetworkAddresses;
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public NLMRouterBusyToNetwork(List<Integer> destinationNetworkAddresses, Integer apduLength) {
-    super(apduLength);
+  public NLMRouterBusyToNetwork(List<Integer> destinationNetworkAddresses) {
+    super();
     this.destinationNetworkAddresses = destinationNetworkAddresses;
-    this.apduLength = apduLength;
   }
 
   public List<Integer> getDestinationNetworkAddresses() {
@@ -104,23 +100,19 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
 
     readBuffer.closeContext("NLMRouterBusyToNetwork");
     // Create the instance
-    return new NLMRouterBusyToNetworkBuilderImpl(destinationNetworkAddresses, apduLength);
+    return new NLMRouterBusyToNetworkBuilderImpl(destinationNetworkAddresses);
   }
 
   public static class NLMRouterBusyToNetworkBuilderImpl implements NLM.NLMBuilder {
     private final List<Integer> destinationNetworkAddresses;
-    private final Integer apduLength;
 
-    public NLMRouterBusyToNetworkBuilderImpl(
-        List<Integer> destinationNetworkAddresses, Integer apduLength) {
+    public NLMRouterBusyToNetworkBuilderImpl(List<Integer> destinationNetworkAddresses) {
       this.destinationNetworkAddresses = destinationNetworkAddresses;
-      this.apduLength = apduLength;
     }
 
-    public NLMRouterBusyToNetwork build(Integer apduLength) {
-
+    public NLMRouterBusyToNetwork build() {
       NLMRouterBusyToNetwork nLMRouterBusyToNetwork =
-          new NLMRouterBusyToNetwork(destinationNetworkAddresses, apduLength);
+          new NLMRouterBusyToNetwork(destinationNetworkAddresses);
       return nLMRouterBusyToNetwork;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMSecurityPayload.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMSecurityPayload.java
index 0e60adc5008..6e5eb14853d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMSecurityPayload.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMSecurityPayload.java
@@ -46,14 +46,10 @@ public Short getMessageType() {
   protected final int payloadLength;
   protected final byte[] payload;
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public NLMSecurityPayload(int payloadLength, byte[] payload, Integer apduLength) {
-    super(apduLength);
+  public NLMSecurityPayload(int payloadLength, byte[] payload) {
+    super();
     this.payloadLength = payloadLength;
     this.payload = payload;
-    this.apduLength = apduLength;
   }
 
   public int getPayloadLength() {
@@ -113,24 +109,20 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
 
     readBuffer.closeContext("NLMSecurityPayload");
     // Create the instance
-    return new NLMSecurityPayloadBuilderImpl(payloadLength, payload, apduLength);
+    return new NLMSecurityPayloadBuilderImpl(payloadLength, payload);
   }
 
   public static class NLMSecurityPayloadBuilderImpl implements NLM.NLMBuilder {
     private final int payloadLength;
     private final byte[] payload;
-    private final Integer apduLength;
 
-    public NLMSecurityPayloadBuilderImpl(int payloadLength, byte[] payload, Integer apduLength) {
+    public NLMSecurityPayloadBuilderImpl(int payloadLength, byte[] payload) {
       this.payloadLength = payloadLength;
       this.payload = payload;
-      this.apduLength = apduLength;
     }
 
-    public NLMSecurityPayload build(Integer apduLength) {
-
-      NLMSecurityPayload nLMSecurityPayload =
-          new NLMSecurityPayload(payloadLength, payload, apduLength);
+    public NLMSecurityPayload build() {
+      NLMSecurityPayload nLMSecurityPayload = new NLMSecurityPayload(payloadLength, payload);
       return nLMSecurityPayload;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMSecurityResponse.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMSecurityResponse.java
index 885b1bce39c..f96c8b03767 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMSecurityResponse.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMSecurityResponse.java
@@ -48,21 +48,16 @@ public Short getMessageType() {
   protected final long originalTimestamp;
   protected final byte[] variableParameters;
 
-  // Arguments.
-  protected final Integer apduLength;
-
   public NLMSecurityResponse(
       SecurityResponseCode responseCode,
       long originalMessageId,
       long originalTimestamp,
-      byte[] variableParameters,
-      Integer apduLength) {
-    super(apduLength);
+      byte[] variableParameters) {
+    super();
     this.responseCode = responseCode;
     this.originalMessageId = originalMessageId;
     this.originalTimestamp = originalTimestamp;
     this.variableParameters = variableParameters;
-    this.apduLength = apduLength;
   }
 
   public SecurityResponseCode getResponseCode() {
@@ -160,7 +155,7 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
     readBuffer.closeContext("NLMSecurityResponse");
     // Create the instance
     return new NLMSecurityResponseBuilderImpl(
-        responseCode, originalMessageId, originalTimestamp, variableParameters, apduLength);
+        responseCode, originalMessageId, originalTimestamp, variableParameters);
   }
 
   public static class NLMSecurityResponseBuilderImpl implements NLM.NLMBuilder {
@@ -168,26 +163,22 @@ public static class NLMSecurityResponseBuilderImpl implements NLM.NLMBuilder {
     private final long originalMessageId;
     private final long originalTimestamp;
     private final byte[] variableParameters;
-    private final Integer apduLength;
 
     public NLMSecurityResponseBuilderImpl(
         SecurityResponseCode responseCode,
         long originalMessageId,
         long originalTimestamp,
-        byte[] variableParameters,
-        Integer apduLength) {
+        byte[] variableParameters) {
       this.responseCode = responseCode;
       this.originalMessageId = originalMessageId;
       this.originalTimestamp = originalTimestamp;
       this.variableParameters = variableParameters;
-      this.apduLength = apduLength;
     }
 
-    public NLMSecurityResponse build(Integer apduLength) {
-
+    public NLMSecurityResponse build() {
       NLMSecurityResponse nLMSecurityResponse =
           new NLMSecurityResponse(
-              responseCode, originalMessageId, originalTimestamp, variableParameters, apduLength);
+              responseCode, originalMessageId, originalTimestamp, variableParameters);
       return nLMSecurityResponse;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMSetMasterKey.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMSetMasterKey.java
index f8c9309a7ab..7f5ecce5b47 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMSetMasterKey.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMSetMasterKey.java
@@ -45,13 +45,9 @@ public Short getMessageType() {
   // Properties.
   protected final NLMUpdateKeyUpdateKeyEntry key;
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public NLMSetMasterKey(NLMUpdateKeyUpdateKeyEntry key, Integer apduLength) {
-    super(apduLength);
+  public NLMSetMasterKey(NLMUpdateKeyUpdateKeyEntry key) {
+    super();
     this.key = key;
-    this.apduLength = apduLength;
   }
 
   public NLMUpdateKeyUpdateKeyEntry getKey() {
@@ -100,21 +96,18 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
 
     readBuffer.closeContext("NLMSetMasterKey");
     // Create the instance
-    return new NLMSetMasterKeyBuilderImpl(key, apduLength);
+    return new NLMSetMasterKeyBuilderImpl(key);
   }
 
   public static class NLMSetMasterKeyBuilderImpl implements NLM.NLMBuilder {
     private final NLMUpdateKeyUpdateKeyEntry key;
-    private final Integer apduLength;
 
-    public NLMSetMasterKeyBuilderImpl(NLMUpdateKeyUpdateKeyEntry key, Integer apduLength) {
+    public NLMSetMasterKeyBuilderImpl(NLMUpdateKeyUpdateKeyEntry key) {
       this.key = key;
-      this.apduLength = apduLength;
     }
 
-    public NLMSetMasterKey build(Integer apduLength) {
-
-      NLMSetMasterKey nLMSetMasterKey = new NLMSetMasterKey(key, apduLength);
+    public NLMSetMasterKey build() {
+      NLMSetMasterKey nLMSetMasterKey = new NLMSetMasterKey(key);
       return nLMSetMasterKey;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMUpdateKeyDistributionKey.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMUpdateKeyDistributionKey.java
index d629849874b..2fe5c58b525 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMUpdateKeyDistributionKey.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMUpdateKeyDistributionKey.java
@@ -46,15 +46,10 @@ public Short getMessageType() {
   protected final byte keyRevision;
   protected final NLMUpdateKeyUpdateKeyEntry key;
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public NLMUpdateKeyDistributionKey(
-      byte keyRevision, NLMUpdateKeyUpdateKeyEntry key, Integer apduLength) {
-    super(apduLength);
+  public NLMUpdateKeyDistributionKey(byte keyRevision, NLMUpdateKeyUpdateKeyEntry key) {
+    super();
     this.keyRevision = keyRevision;
     this.key = key;
-    this.apduLength = apduLength;
   }
 
   public byte getKeyRevision() {
@@ -115,25 +110,22 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
 
     readBuffer.closeContext("NLMUpdateKeyDistributionKey");
     // Create the instance
-    return new NLMUpdateKeyDistributionKeyBuilderImpl(keyRevision, key, apduLength);
+    return new NLMUpdateKeyDistributionKeyBuilderImpl(keyRevision, key);
   }
 
   public static class NLMUpdateKeyDistributionKeyBuilderImpl implements NLM.NLMBuilder {
     private final byte keyRevision;
     private final NLMUpdateKeyUpdateKeyEntry key;
-    private final Integer apduLength;
 
     public NLMUpdateKeyDistributionKeyBuilderImpl(
-        byte keyRevision, NLMUpdateKeyUpdateKeyEntry key, Integer apduLength) {
+        byte keyRevision, NLMUpdateKeyUpdateKeyEntry key) {
       this.keyRevision = keyRevision;
       this.key = key;
-      this.apduLength = apduLength;
     }
 
-    public NLMUpdateKeyDistributionKey build(Integer apduLength) {
-
+    public NLMUpdateKeyDistributionKey build() {
       NLMUpdateKeyDistributionKey nLMUpdateKeyDistributionKey =
-          new NLMUpdateKeyDistributionKey(keyRevision, key, apduLength);
+          new NLMUpdateKeyDistributionKey(keyRevision, key);
       return nLMUpdateKeyDistributionKey;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMUpdateKeyUpdate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMUpdateKeyUpdate.java
index dbf4f8f4896..a47bf0eb5dd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMUpdateKeyUpdate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMUpdateKeyUpdate.java
@@ -55,9 +55,6 @@ public Short getMessageType() {
   protected final Short set2KeyCount;
   protected final List<NLMUpdateKeyUpdateKeyEntry> set2Keys;
 
-  // Arguments.
-  protected final Integer apduLength;
-
   public NLMUpdateKeyUpdate(
       NLMUpdateKeyUpdateControlFlags controlFlags,
       Byte set1KeyRevision,
@@ -69,9 +66,8 @@ public NLMUpdateKeyUpdate(
       Long set2ActivationTime,
       Long set2ExpirationTime,
       Short set2KeyCount,
-      List<NLMUpdateKeyUpdateKeyEntry> set2Keys,
-      Integer apduLength) {
-    super(apduLength);
+      List<NLMUpdateKeyUpdateKeyEntry> set2Keys) {
+    super();
     this.controlFlags = controlFlags;
     this.set1KeyRevision = set1KeyRevision;
     this.set1ActivationTime = set1ActivationTime;
@@ -83,7 +79,6 @@ public NLMUpdateKeyUpdate(
     this.set2ExpirationTime = set2ExpirationTime;
     this.set2KeyCount = set2KeyCount;
     this.set2Keys = set2Keys;
-    this.apduLength = apduLength;
   }
 
   public NLMUpdateKeyUpdateControlFlags getControlFlags() {
@@ -140,63 +135,35 @@ protected void serializeNLMChild(WriteBuffer writeBuffer) throws SerializationEx
     writeSimpleField("controlFlags", controlFlags, writeComplex(writeBuffer));
 
     // Optional Field (set1KeyRevision) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "set1KeyRevision",
-        set1KeyRevision,
-        writeByte(writeBuffer, 8),
-        getControlFlags().getSet1KeyRevisionActivationTimeExpirationTimePresent());
+    writeOptionalField("set1KeyRevision", set1KeyRevision, writeByte(writeBuffer, 8));
 
     // Optional Field (set1ActivationTime) (Can be skipped, if the value is null)
     writeOptionalField(
-        "set1ActivationTime",
-        set1ActivationTime,
-        writeUnsignedLong(writeBuffer, 32),
-        getControlFlags().getSet1KeyRevisionActivationTimeExpirationTimePresent());
+        "set1ActivationTime", set1ActivationTime, writeUnsignedLong(writeBuffer, 32));
 
     // Optional Field (set1ExpirationTime) (Can be skipped, if the value is null)
     writeOptionalField(
-        "set1ExpirationTime",
-        set1ExpirationTime,
-        writeUnsignedLong(writeBuffer, 32),
-        getControlFlags().getSet1KeyCountKeyParametersPresent());
+        "set1ExpirationTime", set1ExpirationTime, writeUnsignedLong(writeBuffer, 32));
 
     // Optional Field (set1KeyCount) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "set1KeyCount",
-        set1KeyCount,
-        writeUnsignedShort(writeBuffer, 8),
-        getControlFlags().getSet1KeyCountKeyParametersPresent());
+    writeOptionalField("set1KeyCount", set1KeyCount, writeUnsignedShort(writeBuffer, 8));
 
     // Array Field (set1Keys)
     writeComplexTypeArrayField("set1Keys", set1Keys, writeBuffer);
 
     // Optional Field (set2KeyRevision) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "set2KeyRevision",
-        set2KeyRevision,
-        writeByte(writeBuffer, 8),
-        getControlFlags().getSet1KeyRevisionActivationTimeExpirationTimePresent());
+    writeOptionalField("set2KeyRevision", set2KeyRevision, writeByte(writeBuffer, 8));
 
     // Optional Field (set2ActivationTime) (Can be skipped, if the value is null)
     writeOptionalField(
-        "set2ActivationTime",
-        set2ActivationTime,
-        writeUnsignedLong(writeBuffer, 32),
-        getControlFlags().getSet1KeyRevisionActivationTimeExpirationTimePresent());
+        "set2ActivationTime", set2ActivationTime, writeUnsignedLong(writeBuffer, 32));
 
     // Optional Field (set2ExpirationTime) (Can be skipped, if the value is null)
     writeOptionalField(
-        "set2ExpirationTime",
-        set2ExpirationTime,
-        writeUnsignedLong(writeBuffer, 32),
-        getControlFlags().getSet1KeyCountKeyParametersPresent());
+        "set2ExpirationTime", set2ExpirationTime, writeUnsignedLong(writeBuffer, 32));
 
     // Optional Field (set2KeyCount) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "set2KeyCount",
-        set2KeyCount,
-        writeUnsignedShort(writeBuffer, 8),
-        getControlFlags().getSet1KeyCountKeyParametersPresent());
+    writeOptionalField("set2KeyCount", set2KeyCount, writeUnsignedShort(writeBuffer, 8));
 
     // Array Field (set2Keys)
     writeComplexTypeArrayField("set2Keys", set2Keys, writeBuffer);
@@ -363,8 +330,7 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
         set2ActivationTime,
         set2ExpirationTime,
         set2KeyCount,
-        set2Keys,
-        apduLength);
+        set2Keys);
   }
 
   public static class NLMUpdateKeyUpdateBuilderImpl implements NLM.NLMBuilder {
@@ -379,7 +345,6 @@ public static class NLMUpdateKeyUpdateBuilderImpl implements NLM.NLMBuilder {
     private final Long set2ExpirationTime;
     private final Short set2KeyCount;
     private final List<NLMUpdateKeyUpdateKeyEntry> set2Keys;
-    private final Integer apduLength;
 
     public NLMUpdateKeyUpdateBuilderImpl(
         NLMUpdateKeyUpdateControlFlags controlFlags,
@@ -392,8 +357,7 @@ public NLMUpdateKeyUpdateBuilderImpl(
         Long set2ActivationTime,
         Long set2ExpirationTime,
         Short set2KeyCount,
-        List<NLMUpdateKeyUpdateKeyEntry> set2Keys,
-        Integer apduLength) {
+        List<NLMUpdateKeyUpdateKeyEntry> set2Keys) {
       this.controlFlags = controlFlags;
       this.set1KeyRevision = set1KeyRevision;
       this.set1ActivationTime = set1ActivationTime;
@@ -405,11 +369,9 @@ public NLMUpdateKeyUpdateBuilderImpl(
       this.set2ExpirationTime = set2ExpirationTime;
       this.set2KeyCount = set2KeyCount;
       this.set2Keys = set2Keys;
-      this.apduLength = apduLength;
     }
 
-    public NLMUpdateKeyUpdate build(Integer apduLength) {
-
+    public NLMUpdateKeyUpdate build() {
       NLMUpdateKeyUpdate nLMUpdateKeyUpdate =
           new NLMUpdateKeyUpdate(
               controlFlags,
@@ -422,8 +384,7 @@ public NLMUpdateKeyUpdate build(Integer apduLength) {
               set2ActivationTime,
               set2ExpirationTime,
               set2KeyCount,
-              set2Keys,
-              apduLength);
+              set2Keys);
       return nLMUpdateKeyUpdate;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMVendorProprietaryMessage.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMVendorProprietaryMessage.java
index fa4ddfb164e..ee3271c5013 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMVendorProprietaryMessage.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMVendorProprietaryMessage.java
@@ -46,15 +46,10 @@ public Short getMessageType() {
   protected final BACnetVendorId vendorId;
   protected final byte[] proprietaryMessage;
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public NLMVendorProprietaryMessage(
-      BACnetVendorId vendorId, byte[] proprietaryMessage, Integer apduLength) {
-    super(apduLength);
+  public NLMVendorProprietaryMessage(BACnetVendorId vendorId, byte[] proprietaryMessage) {
+    super();
     this.vendorId = vendorId;
     this.proprietaryMessage = proprietaryMessage;
-    this.apduLength = apduLength;
   }
 
   public BACnetVendorId getVendorId() {
@@ -126,25 +121,22 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
 
     readBuffer.closeContext("NLMVendorProprietaryMessage");
     // Create the instance
-    return new NLMVendorProprietaryMessageBuilderImpl(vendorId, proprietaryMessage, apduLength);
+    return new NLMVendorProprietaryMessageBuilderImpl(vendorId, proprietaryMessage);
   }
 
   public static class NLMVendorProprietaryMessageBuilderImpl implements NLM.NLMBuilder {
     private final BACnetVendorId vendorId;
     private final byte[] proprietaryMessage;
-    private final Integer apduLength;
 
     public NLMVendorProprietaryMessageBuilderImpl(
-        BACnetVendorId vendorId, byte[] proprietaryMessage, Integer apduLength) {
+        BACnetVendorId vendorId, byte[] proprietaryMessage) {
       this.vendorId = vendorId;
       this.proprietaryMessage = proprietaryMessage;
-      this.apduLength = apduLength;
     }
 
-    public NLMVendorProprietaryMessage build(Integer apduLength) {
-
+    public NLMVendorProprietaryMessage build() {
       NLMVendorProprietaryMessage nLMVendorProprietaryMessage =
-          new NLMVendorProprietaryMessage(vendorId, proprietaryMessage, apduLength);
+          new NLMVendorProprietaryMessage(vendorId, proprietaryMessage);
       return nLMVendorProprietaryMessage;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMWhatIsNetworkNumber.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMWhatIsNetworkNumber.java
index 02a08e4eaac..8fb85ffaf92 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMWhatIsNetworkNumber.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMWhatIsNetworkNumber.java
@@ -42,12 +42,8 @@ public Short getMessageType() {
     return (short) 0x12;
   }
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public NLMWhatIsNetworkNumber(Integer apduLength) {
-    super(apduLength);
-    this.apduLength = apduLength;
+  public NLMWhatIsNetworkNumber() {
+    super();
   }
 
   @Override
@@ -81,20 +77,15 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
 
     readBuffer.closeContext("NLMWhatIsNetworkNumber");
     // Create the instance
-    return new NLMWhatIsNetworkNumberBuilderImpl(apduLength);
+    return new NLMWhatIsNetworkNumberBuilderImpl();
   }
 
   public static class NLMWhatIsNetworkNumberBuilderImpl implements NLM.NLMBuilder {
-    private final Integer apduLength;
-
-    public NLMWhatIsNetworkNumberBuilderImpl(Integer apduLength) {
-      this.apduLength = apduLength;
-    }
-
-    public NLMWhatIsNetworkNumber build(Integer apduLength) {
 
-      NLMWhatIsNetworkNumber nLMWhatIsNetworkNumber = new NLMWhatIsNetworkNumber(apduLength);
+    public NLMWhatIsNetworkNumberBuilderImpl() {}
 
+    public NLMWhatIsNetworkNumber build() {
+      NLMWhatIsNetworkNumber nLMWhatIsNetworkNumber = new NLMWhatIsNetworkNumber();
       return nLMWhatIsNetworkNumber;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMWhoIsRouterToNetwork.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMWhoIsRouterToNetwork.java
index 593eb39e7e6..61a98e584c6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMWhoIsRouterToNetwork.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMWhoIsRouterToNetwork.java
@@ -45,13 +45,9 @@ public Short getMessageType() {
   // Properties.
   protected final Integer destinationNetworkAddress;
 
-  // Arguments.
-  protected final Integer apduLength;
-
-  public NLMWhoIsRouterToNetwork(Integer destinationNetworkAddress, Integer apduLength) {
-    super(apduLength);
+  public NLMWhoIsRouterToNetwork(Integer destinationNetworkAddress) {
+    super();
     this.destinationNetworkAddress = destinationNetworkAddress;
-    this.apduLength = apduLength;
   }
 
   public Integer getDestinationNetworkAddress() {
@@ -101,23 +97,19 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap
 
     readBuffer.closeContext("NLMWhoIsRouterToNetwork");
     // Create the instance
-    return new NLMWhoIsRouterToNetworkBuilderImpl(destinationNetworkAddress, apduLength);
+    return new NLMWhoIsRouterToNetworkBuilderImpl(destinationNetworkAddress);
   }
 
   public static class NLMWhoIsRouterToNetworkBuilderImpl implements NLM.NLMBuilder {
     private final Integer destinationNetworkAddress;
-    private final Integer apduLength;
 
-    public NLMWhoIsRouterToNetworkBuilderImpl(
-        Integer destinationNetworkAddress, Integer apduLength) {
+    public NLMWhoIsRouterToNetworkBuilderImpl(Integer destinationNetworkAddress) {
       this.destinationNetworkAddress = destinationNetworkAddress;
-      this.apduLength = apduLength;
     }
 
-    public NLMWhoIsRouterToNetwork build(Integer apduLength) {
-
+    public NLMWhoIsRouterToNetwork build() {
       NLMWhoIsRouterToNetwork nLMWhoIsRouterToNetwork =
-          new NLMWhoIsRouterToNetwork(destinationNetworkAddress, apduLength);
+          new NLMWhoIsRouterToNetwork(destinationNetworkAddress);
       return nLMWhoIsRouterToNetwork;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NPDU.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NPDU.java
index 0961192589a..52cd097a224 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NPDU.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NPDU.java
@@ -50,9 +50,6 @@ public class NPDU implements Message {
   protected final NLM nlm;
   protected final APDU apdu;
 
-  // Arguments.
-  protected final Integer npduLength;
-
   public NPDU(
       short protocolVersionNumber,
       NPDUControl control,
@@ -64,8 +61,7 @@ public NPDU(
       List<Short> sourceAddress,
       Short hopCount,
       NLM nlm,
-      APDU apdu,
-      Integer npduLength) {
+      APDU apdu) {
     super();
     this.protocolVersionNumber = protocolVersionNumber;
     this.control = control;
@@ -78,7 +74,6 @@ public NPDU(
     this.hopCount = hopCount;
     this.nlm = nlm;
     this.apdu = apdu;
-    this.npduLength = npduLength;
   }
 
   public short getProtocolVersionNumber() {
@@ -155,17 +150,10 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
 
     // Optional Field (destinationNetworkAddress) (Can be skipped, if the value is null)
     writeOptionalField(
-        "destinationNetworkAddress",
-        destinationNetworkAddress,
-        writeUnsignedInt(writeBuffer, 16),
-        getControl().getDestinationSpecified());
+        "destinationNetworkAddress", destinationNetworkAddress, writeUnsignedInt(writeBuffer, 16));
 
     // Optional Field (destinationLength) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "destinationLength",
-        destinationLength,
-        writeUnsignedShort(writeBuffer, 8),
-        getControl().getDestinationSpecified());
+    writeOptionalField("destinationLength", destinationLength, writeUnsignedShort(writeBuffer, 8));
 
     // Array Field (destinationAddress)
     writeSimpleTypeArrayField(
@@ -177,17 +165,10 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
 
     // Optional Field (sourceNetworkAddress) (Can be skipped, if the value is null)
     writeOptionalField(
-        "sourceNetworkAddress",
-        sourceNetworkAddress,
-        writeUnsignedInt(writeBuffer, 16),
-        getControl().getSourceSpecified());
+        "sourceNetworkAddress", sourceNetworkAddress, writeUnsignedInt(writeBuffer, 16));
 
     // Optional Field (sourceLength) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "sourceLength",
-        sourceLength,
-        writeUnsignedShort(writeBuffer, 8),
-        getControl().getSourceSpecified());
+    writeOptionalField("sourceLength", sourceLength, writeUnsignedShort(writeBuffer, 8));
 
     // Array Field (sourceAddress)
     writeSimpleTypeArrayField("sourceAddress", sourceAddress, writeUnsignedShort(writeBuffer, 8));
@@ -197,23 +178,17 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     writeBuffer.writeVirtual("sourceLengthAddon", sourceLengthAddon);
 
     // Optional Field (hopCount) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "hopCount",
-        hopCount,
-        writeUnsignedShort(writeBuffer, 8),
-        getControl().getDestinationSpecified());
+    writeOptionalField("hopCount", hopCount, writeUnsignedShort(writeBuffer, 8));
 
     // Virtual field (doesn't actually serialize anything, just makes the value available)
     int payloadSubtraction = getPayloadSubtraction();
     writeBuffer.writeVirtual("payloadSubtraction", payloadSubtraction);
 
     // Optional Field (nlm) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "nlm", nlm, writeComplex(writeBuffer), getControl().getMessageTypeFieldPresent());
+    writeOptionalField("nlm", nlm, writeComplex(writeBuffer));
 
     // Optional Field (apdu) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "apdu", apdu, writeComplex(writeBuffer), !(getControl().getMessageTypeFieldPresent()));
+    writeOptionalField("apdu", apdu, writeComplex(writeBuffer));
 
     writeBuffer.popContext("NPDU");
   }
@@ -403,8 +378,7 @@ public static NPDU staticParse(ReadBuffer readBuffer, Integer npduLength) throws
             sourceAddress,
             hopCount,
             nlm,
-            apdu,
-            npduLength);
+            apdu);
     return _nPDU;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NPDUControl.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NPDUControl.java
index 4cf5e6210b6..8c0cb42315d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NPDUControl.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NPDUControl.java
@@ -43,7 +43,6 @@ public class NPDUControl implements Message {
   protected final boolean sourceSpecified;
   protected final boolean expectingReply;
   protected final NPDUNetworkPriority networkPriority;
-
   // Reserved Fields
   private Byte reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NPDUNetworkPriorityTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NPDUNetworkPriorityTagged.java
index a647c6f4172..ac16b3313f1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NPDUNetworkPriorityTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NPDUNetworkPriorityTagged.java
@@ -41,17 +41,10 @@ public class NPDUNetworkPriorityTagged implements Message {
   protected final BACnetTagHeader header;
   protected final NPDUNetworkPriority value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public NPDUNetworkPriorityTagged(
-      BACnetTagHeader header, NPDUNetworkPriority value, Short tagNumber, TagClass tagClass) {
+  public NPDUNetworkPriorityTagged(BACnetTagHeader header, NPDUNetworkPriority value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -135,7 +128,7 @@ public static NPDUNetworkPriorityTagged staticParse(
     readBuffer.closeContext("NPDUNetworkPriorityTagged");
     // Create the instance
     NPDUNetworkPriorityTagged _nPDUNetworkPriorityTagged;
-    _nPDUNetworkPriorityTagged = new NPDUNetworkPriorityTagged(header, value, tagNumber, tagClass);
+    _nPDUNetworkPriorityTagged = new NPDUNetworkPriorityTagged(header, value);
     return _nPDUNetworkPriorityTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/SecurityResponseCodeTagged.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/SecurityResponseCodeTagged.java
index 3c85cd26b69..b358af50ed3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/SecurityResponseCodeTagged.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/SecurityResponseCodeTagged.java
@@ -41,17 +41,10 @@ public class SecurityResponseCodeTagged implements Message {
   protected final BACnetTagHeader header;
   protected final SecurityResponseCode value;
 
-  // Arguments.
-  protected final Short tagNumber;
-  protected final TagClass tagClass;
-
-  public SecurityResponseCodeTagged(
-      BACnetTagHeader header, SecurityResponseCode value, Short tagNumber, TagClass tagClass) {
+  public SecurityResponseCodeTagged(BACnetTagHeader header, SecurityResponseCode value) {
     super();
     this.header = header;
     this.value = value;
-    this.tagNumber = tagNumber;
-    this.tagClass = tagClass;
   }
 
   public BACnetTagHeader getHeader() {
@@ -133,8 +126,7 @@ public static SecurityResponseCodeTagged staticParse(
     readBuffer.closeContext("SecurityResponseCodeTagged");
     // Create the instance
     SecurityResponseCodeTagged _securityResponseCodeTagged;
-    _securityResponseCodeTagged =
-        new SecurityResponseCodeTagged(header, value, tagNumber, tagClass);
+    _securityResponseCodeTagged = new SecurityResponseCodeTagged(header, value);
     return _securityResponseCodeTagged;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/SubscribeCOVPropertyMultipleErrorFirstFailedSubscription.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/SubscribeCOVPropertyMultipleErrorFirstFailedSubscription.java
index f298be0e332..3b5f644fd04 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/SubscribeCOVPropertyMultipleErrorFirstFailedSubscription.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/SubscribeCOVPropertyMultipleErrorFirstFailedSubscription.java
@@ -44,23 +44,18 @@ public class SubscribeCOVPropertyMultipleErrorFirstFailedSubscription implements
   protected final ErrorEnclosed errorType;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public SubscribeCOVPropertyMultipleErrorFirstFailedSubscription(
       BACnetOpeningTag openingTag,
       BACnetContextTagObjectIdentifier monitoredObjectIdentifier,
       BACnetPropertyReferenceEnclosed monitoredPropertyReference,
       ErrorEnclosed errorType,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.monitoredObjectIdentifier = monitoredObjectIdentifier;
     this.monitoredPropertyReference = monitoredPropertyReference;
     this.errorType = errorType;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -189,8 +184,7 @@ public static SubscribeCOVPropertyMultipleErrorFirstFailedSubscription staticPar
             monitoredObjectIdentifier,
             monitoredPropertyReference,
             errorType,
-            closingTag,
-            tagNumber);
+            closingTag);
     return _subscribeCOVPropertyMultipleErrorFirstFailedSubscription;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/VTCloseErrorListOfVTSessionIdentifiers.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/VTCloseErrorListOfVTSessionIdentifiers.java
index 9a5eba3a819..11cc999c24f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/VTCloseErrorListOfVTSessionIdentifiers.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/VTCloseErrorListOfVTSessionIdentifiers.java
@@ -42,19 +42,14 @@ public class VTCloseErrorListOfVTSessionIdentifiers implements Message {
   protected final List<BACnetApplicationTagUnsignedInteger> listOfVtSessionIdentifiers;
   protected final BACnetClosingTag closingTag;
 
-  // Arguments.
-  protected final Short tagNumber;
-
   public VTCloseErrorListOfVTSessionIdentifiers(
       BACnetOpeningTag openingTag,
       List<BACnetApplicationTagUnsignedInteger> listOfVtSessionIdentifiers,
-      BACnetClosingTag closingTag,
-      Short tagNumber) {
+      BACnetClosingTag closingTag) {
     super();
     this.openingTag = openingTag;
     this.listOfVtSessionIdentifiers = listOfVtSessionIdentifiers;
     this.closingTag = closingTag;
-    this.tagNumber = tagNumber;
   }
 
   public BACnetOpeningTag getOpeningTag() {
@@ -150,7 +145,7 @@ public static VTCloseErrorListOfVTSessionIdentifiers staticParse(
     VTCloseErrorListOfVTSessionIdentifiers _vTCloseErrorListOfVTSessionIdentifiers;
     _vTCloseErrorListOfVTSessionIdentifiers =
         new VTCloseErrorListOfVTSessionIdentifiers(
-            openingTag, listOfVtSessionIdentifiers, closingTag, tagNumber);
+            openingTag, listOfVtSessionIdentifiers, closingTag);
     return _vTCloseErrorListOfVTSessionIdentifiers;
   }
 
diff --git a/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/configuration/BacNetPcapReplayTransportConfiguration.java b/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/configuration/BacNetPcapReplayTransportConfiguration.java
index 62a65487c61..36bfad13be2 100644
--- a/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/configuration/BacNetPcapReplayTransportConfiguration.java
+++ b/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/configuration/BacNetPcapReplayTransportConfiguration.java
@@ -19,7 +19,7 @@
 
 package org.apache.plc4x.java.bacnetip.configuration;
 
-import org.apache.plc4x.java.bacnetip.readwrite.BacnetConstants;
+import org.apache.plc4x.java.bacnetip.readwrite.Constants;
 import org.apache.plc4x.java.spi.configuration.annotations.ConfigurationParameter;
 import org.apache.plc4x.java.spi.configuration.annotations.Description;
 import org.apache.plc4x.java.spi.configuration.annotations.defaults.BooleanDefaultValue;
@@ -45,7 +45,7 @@ public void setSupportVlans(boolean supportVlans) {
 
     @Override
     public int getDefaultPort() {
-        return BacnetConstants.BACNETUDPDEFAULTPORT;
+        return Constants.BACNETUDPDEFAULTPORT;
     }
 
     /**
diff --git a/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/configuration/BacNetRawSocketTransportConfiguration.java b/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/configuration/BacNetRawSocketTransportConfiguration.java
index 7f342732396..5922ea78455 100644
--- a/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/configuration/BacNetRawSocketTransportConfiguration.java
+++ b/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/configuration/BacNetRawSocketTransportConfiguration.java
@@ -19,7 +19,7 @@
 
 package org.apache.plc4x.java.bacnetip.configuration;
 
-import org.apache.plc4x.java.bacnetip.readwrite.BacnetConstants;
+import org.apache.plc4x.java.bacnetip.readwrite.Constants;
 import org.apache.plc4x.java.spi.configuration.annotations.ConfigurationParameter;
 import org.apache.plc4x.java.spi.configuration.annotations.Description;
 import org.apache.plc4x.java.spi.configuration.annotations.defaults.BooleanDefaultValue;
@@ -45,7 +45,7 @@ public void setResolveMacAddress(boolean resolveMacAddress) {
 
     @Override
     public int getDefaultPort() {
-        return BacnetConstants.BACNETUDPDEFAULTPORT;
+        return Constants.BACNETUDPDEFAULTPORT;
     }
 
     /**
diff --git a/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/configuration/BacNetUdpTransportConfiguration.java b/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/configuration/BacNetUdpTransportConfiguration.java
index e8692e3cfb2..9e059bc0f2e 100644
--- a/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/configuration/BacNetUdpTransportConfiguration.java
+++ b/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/configuration/BacNetUdpTransportConfiguration.java
@@ -19,14 +19,14 @@
 
 package org.apache.plc4x.java.bacnetip.configuration;
 
-import org.apache.plc4x.java.bacnetip.readwrite.BacnetConstants;
+import org.apache.plc4x.java.bacnetip.readwrite.Constants;
 import org.apache.plc4x.java.transport.udp.DefaultUdpTransportConfiguration;
 
 public class BacNetUdpTransportConfiguration extends DefaultUdpTransportConfiguration {
 
     @Override
     public int getDefaultPort() {
-        return BacnetConstants.BACNETUDPDEFAULTPORT;
+        return Constants.BACNETUDPDEFAULTPORT;
     }
 
 }
diff --git a/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java b/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java
index 030093b8158..cdf95265256 100644
--- a/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java
+++ b/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java
@@ -414,7 +414,7 @@ public static BACnetApplicationTagNull createBACnetApplicationTagNull() {
 
     public static BACnetContextTagNull createBACnetContextTagNull(byte tagNumber) {
         BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, 0);
-        return new BACnetContextTagNull(header, (short) tagNumber);
+        return new BACnetContextTagNull(header);
     }
 
     public static BACnetOpeningTag createBACnetOpeningTag(short tagNum) {
@@ -427,7 +427,7 @@ public static BACnetOpeningTag createBACnetOpeningTag(short tagNum) {
             extTagNumber = tagNum;
         }
         BACnetTagHeader header = new BACnetTagHeader(tagNumber, TagClass.CONTEXT_SPECIFIC_TAGS, (byte) 0x6, extTagNumber, null, null, null);
-        return new BACnetOpeningTag(header, tagNum);
+        return new BACnetOpeningTag(header);
     }
 
     public static BACnetClosingTag createBACnetClosingTag(short tagNum) {
@@ -440,7 +440,7 @@ public static BACnetClosingTag createBACnetClosingTag(short tagNum) {
             extTagNumber = tagNum;
         }
         BACnetTagHeader header = new BACnetTagHeader(tagNumber, TagClass.CONTEXT_SPECIFIC_TAGS, (byte) 0x7, extTagNumber, null, null, null);
-        return new BACnetClosingTag(header, tagNum);
+        return new BACnetClosingTag(header);
     }
 
     public static BACnetApplicationTagObjectIdentifier createBACnetApplicationTagObjectIdentifier(short objectType, int instance) {
@@ -464,7 +464,7 @@ public static BACnetContextTagObjectIdentifier createBACnetContextTagObjectIdent
             proprietaryValue = objectType;
         }
         BACnetTagPayloadObjectIdentifier payload = new BACnetTagPayloadObjectIdentifier(objectTypeEnum, proprietaryValue, instance);
-        return new BACnetContextTagObjectIdentifier(header, payload, (short) tagNum);
+        return new BACnetContextTagObjectIdentifier(header, payload);
     }
 
     public static BACnetPropertyIdentifierTagged createBACnetPropertyIdentifierTagged(byte tagNum, int propertyType) {
@@ -475,7 +475,7 @@ public static BACnetPropertyIdentifierTagged createBACnetPropertyIdentifierTagge
             proprietaryValue = propertyType;
         }
         BACnetTagHeader header = new BACnetTagHeader(tagNum, TagClass.CONTEXT_SPECIFIC_TAGS, (byte) requiredLength(propertyType), null, null, null, null);
-        return new BACnetPropertyIdentifierTagged(header, propertyIdentifier, proprietaryValue, (short) tagNum, TagClass.CONTEXT_SPECIFIC_TAGS);
+        return new BACnetPropertyIdentifierTagged(header, propertyIdentifier, proprietaryValue);
     }
 
     public static BACnetVendorIdTagged createBACnetVendorIdApplicationTagged(int vendorId) {
@@ -486,7 +486,7 @@ public static BACnetVendorIdTagged createBACnetVendorIdApplicationTagged(int ven
             unknownVendorId = vendorId;
         }
         BACnetTagHeader header = new BACnetTagHeader((byte) 0x2, TagClass.APPLICATION_TAGS, (byte) requiredLength(vendorId), null, null, null, null);
-        return new BACnetVendorIdTagged(header, baCnetVendorId, unknownVendorId, (short) 0x2, TagClass.APPLICATION_TAGS);
+        return new BACnetVendorIdTagged(header, baCnetVendorId, unknownVendorId);
     }
 
     public static BACnetVendorIdTagged createBACnetVendorIdContextTagged(byte tagNum, int vendorId) {
@@ -497,12 +497,12 @@ public static BACnetVendorIdTagged createBACnetVendorIdContextTagged(byte tagNum
             unknownVendorId = vendorId;
         }
         BACnetTagHeader header = new BACnetTagHeader(tagNum, TagClass.CONTEXT_SPECIFIC_TAGS, (byte) requiredLength(vendorId), null, null, null, null);
-        return new BACnetVendorIdTagged(header, baCnetVendorId, unknownVendorId, (short) tagNum, TagClass.CONTEXT_SPECIFIC_TAGS);
+        return new BACnetVendorIdTagged(header, baCnetVendorId, unknownVendorId);
     }
 
     public static BACnetSegmentationTagged creatBACnetSegmentationTagged(BACnetSegmentation value) {
         BACnetTagHeader header = createBACnetTagHeaderBalanced(false, (byte) 9, 1);
-        return new BACnetSegmentationTagged(header, value, (short) 9, TagClass.APPLICATION_TAGS);
+        return new BACnetSegmentationTagged(header, value);
     }
 
     public static BACnetApplicationTagBoolean createBACnetApplicationTagBoolean(boolean value) {
@@ -512,7 +512,7 @@ public static BACnetApplicationTagBoolean createBACnetApplicationTagBoolean(bool
 
     public static BACnetContextTagBoolean createBACnetContextTagBoolean(byte tagNumber, boolean value) {
         BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, 1);
-        return new BACnetContextTagBoolean(header, (short) (value ? 1 : 0), new BACnetTagPayloadBoolean(value ? 1L : 0L), (short) tagNumber);
+        return new BACnetContextTagBoolean(header, (short) (value ? 1 : 0), new BACnetTagPayloadBoolean(value ? 1L : 0L));
     }
 
     public static BACnetApplicationTagUnsignedInteger createBACnetApplicationTagUnsignedInteger(long value) {
@@ -524,7 +524,7 @@ public static BACnetApplicationTagUnsignedInteger createBACnetApplicationTagUnsi
     public static BACnetContextTagUnsignedInteger createBACnetContextTagUnsignedInteger(byte tagNumber, long value) {
         Pair<Long, BACnetTagPayloadUnsignedInteger> lengthPayload = createUnsignedPayload(value);
         BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, lengthPayload.getLeft());
-        return new BACnetContextTagUnsignedInteger(header, lengthPayload.getRight(), (short) tagNumber);
+        return new BACnetContextTagUnsignedInteger(header, lengthPayload.getRight());
     }
 
     public static Pair<Long, BACnetTagPayloadUnsignedInteger> createUnsignedPayload(long value) {
@@ -550,7 +550,7 @@ public static Pair<Long, BACnetTagPayloadUnsignedInteger> createUnsignedPayload(
             length = 4;
             valueUint32 = value;
         }
-        BACnetTagPayloadUnsignedInteger payload = new BACnetTagPayloadUnsignedInteger(valueUint8, valueUint16, valueUint24, valueUint32, valueUint40, valueUint48, valueUint56, valueUint64, length);
+        BACnetTagPayloadUnsignedInteger payload = new BACnetTagPayloadUnsignedInteger(length, valueUint8, valueUint16, valueUint24, valueUint32, valueUint40, valueUint48, valueUint56, valueUint64);
         return Pair.of(length, payload);
     }
 
@@ -563,7 +563,7 @@ public static BACnetApplicationTagSignedInteger createBACnetApplicationTagSigned
     public static BACnetContextTagSignedInteger createBACnetContextTagSignedInteger(short tagNumber, long value) {
         Pair<Long, BACnetTagPayloadSignedInteger> lengthPayload = createSignedPayload(value);
         BACnetTagHeader header = createBACnetTagHeaderBalanced(false, (byte) tagNumber, lengthPayload.getLeft());
-        return new BACnetContextTagSignedInteger(header, lengthPayload.getRight(), tagNumber);
+        return new BACnetContextTagSignedInteger(header, lengthPayload.getRight());
     }
 
     public static Pair<Long, BACnetTagPayloadSignedInteger> createSignedPayload(long value) {
@@ -585,7 +585,7 @@ public static Pair<Long, BACnetTagPayloadSignedInteger> createSignedPayload(long
             length = 4;
             valueInt32 = (int) value;
         }
-        BACnetTagPayloadSignedInteger payload = new BACnetTagPayloadSignedInteger(valueInt8, valueInt16, valueInt24, valueInt32, null, null, null, null, length);
+        BACnetTagPayloadSignedInteger payload = new BACnetTagPayloadSignedInteger(length, valueInt8, valueInt16, valueInt24, valueInt32, null, null, null, null);
         return Pair.of(length, payload);
     }
 
@@ -596,7 +596,7 @@ public static BACnetApplicationTagReal createBACnetApplicationTagReal(float valu
 
     public static BACnetContextTagReal createBACnetContextTagReal(byte tagNumber, float value) {
         BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, 4);
-        return new BACnetContextTagReal(header, new BACnetTagPayloadReal(value), (short) tagNumber);
+        return new BACnetContextTagReal(header, new BACnetTagPayloadReal(value));
     }
 
     public static BACnetApplicationTagDouble createBACnetApplicationTagDouble(double value) {
@@ -606,27 +606,27 @@ public static BACnetApplicationTagDouble createBACnetApplicationTagDouble(double
 
     public static BACnetContextTagDouble createBACnetContextTagDouble(byte tagNumber, double value) {
         BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, 8);
-        return new BACnetContextTagDouble(header, new BACnetTagPayloadDouble(value), (short) tagNumber);
+        return new BACnetContextTagDouble(header, new BACnetTagPayloadDouble(value));
     }
 
     public static BACnetApplicationTagOctetString createBACnetApplicationTagOctetString(byte[] octets) {
         BACnetTagHeader header = createBACnetTagHeaderBalanced(false, BACnetDataType.OCTET_STRING.getValue(), octets.length + 1);
-        return new BACnetApplicationTagOctetString(header, new BACnetTagPayloadOctetString(octets, (long) octets.length + 1));
+        return new BACnetApplicationTagOctetString(header, new BACnetTagPayloadOctetString(octets));
     }
 
     public static BACnetContextTagOctetString createBACnetContextTagOctetString(byte tagNumber, byte[] octets) {
         BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, octets.length + 1);
-        return new BACnetContextTagOctetString(header, new BACnetTagPayloadOctetString(octets, (long) octets.length + 1), (short) tagNumber);
+        return new BACnetContextTagOctetString(header, new BACnetTagPayloadOctetString(octets));
     }
 
     public static BACnetApplicationTagCharacterString createBACnetApplicationTagCharacterString(BACnetCharacterEncoding baCnetCharacterEncoding, String value) {
         BACnetTagHeader header = createBACnetTagHeaderBalanced(false, BACnetDataType.CHARACTER_STRING.getValue(), value.length() + 1);
-        return new BACnetApplicationTagCharacterString(header, new BACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, (long) value.length() + 1));
+        return new BACnetApplicationTagCharacterString(header, new BACnetTagPayloadCharacterString((long) value.length() + 1, baCnetCharacterEncoding, value));
     }
 
     public static BACnetContextTagCharacterString createBACnetContextTagCharacterString(byte tagNumber, BACnetCharacterEncoding baCnetCharacterEncoding, String value) {
         BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, value.length() + 1);
-        return new BACnetContextTagCharacterString(header, new BACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, (long) value.length() + 1), (short) tagNumber);
+        return new BACnetContextTagCharacterString(header, new BACnetTagPayloadCharacterString((long) (value.length() + 1), baCnetCharacterEncoding, value));
     }
 
     public static BACnetApplicationTagBitString createBACnetApplicationTagBitString(List<Boolean> value) {
@@ -636,7 +636,7 @@ public static BACnetApplicationTagBitString createBACnetApplicationTagBitString(
             unusedBits = 0;
         }
         BACnetTagHeader header = createBACnetTagHeaderBalanced(false, BACnetDataType.BIT_STRING.getValue(), numberOfBytesNeeded + 1);
-        return new BACnetApplicationTagBitString(header, new BACnetTagPayloadBitString(unusedBits, value, new ArrayList<>(unusedBits), numberOfBytesNeeded + 1));
+        return new BACnetApplicationTagBitString(header, new BACnetTagPayloadBitString(unusedBits, value, new ArrayList<>(unusedBits)));
     }
 
     public static BACnetContextTagBitString createBACnetContextTagBitString(byte tagNumber, List<Boolean> value) {
@@ -646,7 +646,7 @@ public static BACnetContextTagBitString createBACnetContextTagBitString(byte tag
             unusedBits = 0;
         }
         BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, numberOfBytesNeeded + 1);
-        return new BACnetContextTagBitString(header, new BACnetTagPayloadBitString(unusedBits, value, new ArrayList<>(unusedBits), numberOfBytesNeeded + 1), (short) tagNumber);
+        return new BACnetContextTagBitString(header, new BACnetTagPayloadBitString(unusedBits, value, new ArrayList<>(unusedBits)));
     }
 
     public static BACnetApplicationTagEnumerated createBACnetApplicationTagEnumerated(long value) {
@@ -658,13 +658,13 @@ public static BACnetApplicationTagEnumerated createBACnetApplicationTagEnumerate
     public static BACnetContextTagEnumerated createBACnetContextTagEnumerated(byte tagNumber, long value) {
         Pair<Long, BACnetTagPayloadEnumerated> lengthPayload = CreateEnumeratedPayload(value);
         BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, lengthPayload.getLeft());
-        return new BACnetContextTagEnumerated(header, lengthPayload.getRight(), (short) tagNumber);
+        return new BACnetContextTagEnumerated(header, lengthPayload.getRight());
     }
 
     public static Pair<Long, BACnetTagPayloadEnumerated> CreateEnumeratedPayload(long value) {
         long length = requiredLength(value);
         byte[] data = writeVarUint(value);
-        BACnetTagPayloadEnumerated payload = new BACnetTagPayloadEnumerated(data, length);
+        BACnetTagPayloadEnumerated payload = new BACnetTagPayloadEnumerated(data);
         return Pair.of(length, payload);
     }
 
@@ -683,7 +683,7 @@ public static BACnetContextTagDate createBACnetContextTagDate(byte tagNumber, in
         if (year == 0xFF) {
             yearMinus1900 = 0xFF;
         }
-        return new BACnetContextTagDate(header, new BACnetTagPayloadDate(yearMinus1900, month, dayOfMonth, dayOfWeek), (short) tagNumber);
+        return new BACnetContextTagDate(header, new BACnetTagPayloadDate(yearMinus1900, month, dayOfMonth, dayOfWeek));
     }
 
     public static BACnetApplicationTagTime createBACnetApplicationTagTime(short hour, short minute, short second, short fractional) {
@@ -693,7 +693,7 @@ public static BACnetApplicationTagTime createBACnetApplicationTagTime(short hour
 
     public static BACnetContextTagTime createBACnetContextTagTime(byte tagNumber, short hour, short minute, short second, short fractional) {
         BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, 4);
-        return new BACnetContextTagTime(header, new BACnetTagPayloadTime(hour, minute, second, fractional), (short) tagNumber);
+        return new BACnetContextTagTime(header, new BACnetTagPayloadTime(hour, minute, second, fractional));
     }
 
     private static long requiredLength(long value) {
diff --git a/plc4j/drivers/c-bus/pom.xml b/plc4j/drivers/c-bus/pom.xml
index 766d3fd8c2f..88a84d8c57b 100644
--- a/plc4j/drivers/c-bus/pom.xml
+++ b/plc4j/drivers/c-bus/pom.xml
@@ -170,7 +170,6 @@
                   <outputFlavor>read-write</outputFlavor>
                   <outputDir>src/main/generated</outputDir>
                   <options>
-                    <generate-properties-for-parser-arguments>true</generate-properties-for-parser-arguments>
                     <!-- We want properties that contain the values of reserved fields, if the value differs from the expected one -->
                     <generate-properties-for-reserved-fields>true</generate-properties-for-reserved-fields>
                   </options>
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataHumidityScheduleEntry.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataHumidityScheduleEntry.java
index 1bdcca4b44e..9f9e861f7c1 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataHumidityScheduleEntry.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataHumidityScheduleEntry.java
@@ -129,12 +129,10 @@ protected void serializeAirConditioningDataChild(WriteBuffer writeBuffer)
     writeSimpleField("startTime", startTime, writeComplex(writeBuffer));
 
     // Optional Field (level) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "level", level, writeComplex(writeBuffer), getHumidityModeAndFlags().getIsLevelHumidity());
+    writeOptionalField("level", level, writeComplex(writeBuffer));
 
     // Optional Field (rawLevel) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "rawLevel", rawLevel, writeComplex(writeBuffer), getHumidityModeAndFlags().getIsLevelRaw());
+    writeOptionalField("rawLevel", rawLevel, writeComplex(writeBuffer));
 
     writeBuffer.popContext("AirConditioningDataHumidityScheduleEntry");
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataHvacScheduleEntry.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataHvacScheduleEntry.java
index 9d8a68b97a2..71190661c7f 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataHvacScheduleEntry.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataHvacScheduleEntry.java
@@ -128,12 +128,10 @@ protected void serializeAirConditioningDataChild(WriteBuffer writeBuffer)
     writeSimpleField("startTime", startTime, writeComplex(writeBuffer));
 
     // Optional Field (level) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "level", level, writeComplex(writeBuffer), getHvacModeAndFlags().getIsLevelTemperature());
+    writeOptionalField("level", level, writeComplex(writeBuffer));
 
     // Optional Field (rawLevel) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "rawLevel", rawLevel, writeComplex(writeBuffer), getHvacModeAndFlags().getIsLevelRaw());
+    writeOptionalField("rawLevel", rawLevel, writeComplex(writeBuffer));
 
     writeBuffer.popContext("AirConditioningDataHvacScheduleEntry");
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetPlantHumidityLevel.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetPlantHumidityLevel.java
index 2ece919bf84..8b0d070d4dd 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetPlantHumidityLevel.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetPlantHumidityLevel.java
@@ -123,19 +123,13 @@ protected void serializeAirConditioningDataChild(WriteBuffer writeBuffer)
             writeUnsignedShort(writeBuffer, 8)));
 
     // Optional Field (level) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "level", level, writeComplex(writeBuffer), getHumidityModeAndFlags().getIsLevelHumidity());
+    writeOptionalField("level", level, writeComplex(writeBuffer));
 
     // Optional Field (rawLevel) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "rawLevel", rawLevel, writeComplex(writeBuffer), getHumidityModeAndFlags().getIsLevelRaw());
+    writeOptionalField("rawLevel", rawLevel, writeComplex(writeBuffer));
 
     // Optional Field (auxLevel) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "auxLevel",
-        auxLevel,
-        writeComplex(writeBuffer),
-        getHumidityModeAndFlags().getIsAuxLevelUsed());
+    writeOptionalField("auxLevel", auxLevel, writeComplex(writeBuffer));
 
     writeBuffer.popContext("AirConditioningDataSetPlantHumidityLevel");
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetPlantHvacLevel.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetPlantHvacLevel.java
index eafa245b217..fe1a7444755 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetPlantHvacLevel.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetPlantHvacLevel.java
@@ -119,16 +119,13 @@ protected void serializeAirConditioningDataChild(WriteBuffer writeBuffer)
         writeEnum(HVACType::getValue, HVACType::name, writeUnsignedShort(writeBuffer, 8)));
 
     // Optional Field (level) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "level", level, writeComplex(writeBuffer), getHvacModeAndFlags().getIsLevelTemperature());
+    writeOptionalField("level", level, writeComplex(writeBuffer));
 
     // Optional Field (rawLevel) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "rawLevel", rawLevel, writeComplex(writeBuffer), getHvacModeAndFlags().getIsLevelRaw());
+    writeOptionalField("rawLevel", rawLevel, writeComplex(writeBuffer));
 
     // Optional Field (auxLevel) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "auxLevel", auxLevel, writeComplex(writeBuffer), getHvacModeAndFlags().getIsAuxLevelUsed());
+    writeOptionalField("auxLevel", auxLevel, writeComplex(writeBuffer));
 
     writeBuffer.popContext("AirConditioningDataSetPlantHvacLevel");
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetZoneHumidityMode.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetZoneHumidityMode.java
index aa8f4d43039..321bce1becf 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetZoneHumidityMode.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetZoneHumidityMode.java
@@ -122,19 +122,13 @@ protected void serializeAirConditioningDataChild(WriteBuffer writeBuffer)
             writeUnsignedShort(writeBuffer, 8)));
 
     // Optional Field (level) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "level", level, writeComplex(writeBuffer), getHumidityModeAndFlags().getIsLevelHumidity());
+    writeOptionalField("level", level, writeComplex(writeBuffer));
 
     // Optional Field (rawLevel) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "rawLevel", rawLevel, writeComplex(writeBuffer), getHumidityModeAndFlags().getIsLevelRaw());
+    writeOptionalField("rawLevel", rawLevel, writeComplex(writeBuffer));
 
     // Optional Field (auxLevel) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "auxLevel",
-        auxLevel,
-        writeComplex(writeBuffer),
-        getHumidityModeAndFlags().getIsAuxLevelUsed());
+    writeOptionalField("auxLevel", auxLevel, writeComplex(writeBuffer));
 
     writeBuffer.popContext("AirConditioningDataSetZoneHumidityMode");
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetZoneHvacMode.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetZoneHvacMode.java
index aaf050c75ea..107c5b9b7fb 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetZoneHvacMode.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningDataSetZoneHvacMode.java
@@ -119,16 +119,13 @@ protected void serializeAirConditioningDataChild(WriteBuffer writeBuffer)
         writeEnum(HVACType::getValue, HVACType::name, writeUnsignedShort(writeBuffer, 8)));
 
     // Optional Field (level) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "level", level, writeComplex(writeBuffer), getHvacModeAndFlags().getIsLevelTemperature());
+    writeOptionalField("level", level, writeComplex(writeBuffer));
 
     // Optional Field (rawLevel) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "rawLevel", rawLevel, writeComplex(writeBuffer), getHvacModeAndFlags().getIsLevelRaw());
+    writeOptionalField("rawLevel", rawLevel, writeComplex(writeBuffer));
 
     // Optional Field (auxLevel) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "auxLevel", auxLevel, writeComplex(writeBuffer), getHvacModeAndFlags().getIsAuxLevelUsed());
+    writeOptionalField("auxLevel", auxLevel, writeComplex(writeBuffer));
 
     writeBuffer.popContext("AirConditioningDataSetZoneHvacMode");
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALData.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALData.java
index cc85316316e..e497ac10325 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALData.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALData.java
@@ -40,20 +40,22 @@ public abstract class CALData implements Message {
   // Abstract accessors for discriminator values.
 
   // Properties.
+  protected final RequestContext requestContext;
   protected final CALCommandTypeContainer commandTypeContainer;
   protected final CALData additionalData;
 
-  // Arguments.
-  protected final RequestContext requestContext;
-
   public CALData(
+      RequestContext requestContext,
       CALCommandTypeContainer commandTypeContainer,
-      CALData additionalData,
-      RequestContext requestContext) {
+      CALData additionalData) {
     super();
+    this.requestContext = requestContext;
     this.commandTypeContainer = commandTypeContainer;
     this.additionalData = additionalData;
-    this.requestContext = requestContext;
+  }
+
+  public RequestContext getRequestContext() {
+    return requestContext;
   }
 
   public CALCommandTypeContainer getCommandTypeContainer() {
@@ -212,15 +214,15 @@ public static CALData staticParse(ReadBuffer readBuffer, RequestContext requestC
 
     readBuffer.closeContext("CALData");
     // Create the instance
-    CALData _cALData = builder.build(commandTypeContainer, additionalData, requestContext);
+    CALData _cALData = builder.build(requestContext, commandTypeContainer, additionalData);
     return _cALData;
   }
 
   public interface CALDataBuilder {
     CALData build(
+        RequestContext requestContext,
         CALCommandTypeContainer commandTypeContainer,
-        CALData additionalData,
-        RequestContext requestContext);
+        CALData additionalData);
   }
 
   @Override
@@ -232,14 +234,15 @@ public boolean equals(Object o) {
       return false;
     }
     CALData that = (CALData) o;
-    return (getCommandTypeContainer() == that.getCommandTypeContainer())
+    return (getRequestContext() == that.getRequestContext())
+        && (getCommandTypeContainer() == that.getCommandTypeContainer())
         && (getAdditionalData() == that.getAdditionalData())
         && true;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(getCommandTypeContainer(), getAdditionalData());
+    return Objects.hash(getRequestContext(), getCommandTypeContainer(), getAdditionalData());
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataAcknowledge.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataAcknowledge.java
index 28f94f2ebb9..e6bf56daa07 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataAcknowledge.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataAcknowledge.java
@@ -43,19 +43,15 @@ public class CALDataAcknowledge extends CALData implements Message {
   protected final Parameter paramNo;
   protected final short code;
 
-  // Arguments.
-  protected final RequestContext requestContext;
-
   public CALDataAcknowledge(
+      RequestContext requestContext,
       CALCommandTypeContainer commandTypeContainer,
       CALData additionalData,
       Parameter paramNo,
-      short code,
-      RequestContext requestContext) {
-    super(commandTypeContainer, additionalData, requestContext);
+      short code) {
+    super(requestContext, commandTypeContainer, additionalData);
     this.paramNo = paramNo;
     this.code = code;
-    this.requestContext = requestContext;
   }
 
   public Parameter getParamNo() {
@@ -121,28 +117,25 @@ public static CALDataBuilder staticParseCALDataBuilder(
 
     readBuffer.closeContext("CALDataAcknowledge");
     // Create the instance
-    return new CALDataAcknowledgeBuilderImpl(paramNo, code, requestContext);
+    return new CALDataAcknowledgeBuilderImpl(paramNo, code);
   }
 
   public static class CALDataAcknowledgeBuilderImpl implements CALData.CALDataBuilder {
     private final Parameter paramNo;
     private final short code;
-    private final RequestContext requestContext;
 
-    public CALDataAcknowledgeBuilderImpl(
-        Parameter paramNo, short code, RequestContext requestContext) {
+    public CALDataAcknowledgeBuilderImpl(Parameter paramNo, short code) {
       this.paramNo = paramNo;
       this.code = code;
-      this.requestContext = requestContext;
     }
 
     public CALDataAcknowledge build(
+        RequestContext requestContext,
         CALCommandTypeContainer commandTypeContainer,
-        CALData additionalData,
-        RequestContext requestContext) {
+        CALData additionalData) {
       CALDataAcknowledge cALDataAcknowledge =
           new CALDataAcknowledge(
-              commandTypeContainer, additionalData, paramNo, code, requestContext);
+              requestContext, commandTypeContainer, additionalData, paramNo, code);
       return cALDataAcknowledge;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataGetStatus.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataGetStatus.java
index f7f7162fcd1..abcb10e3fd5 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataGetStatus.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataGetStatus.java
@@ -43,19 +43,15 @@ public class CALDataGetStatus extends CALData implements Message {
   protected final Parameter paramNo;
   protected final short count;
 
-  // Arguments.
-  protected final RequestContext requestContext;
-
   public CALDataGetStatus(
+      RequestContext requestContext,
       CALCommandTypeContainer commandTypeContainer,
       CALData additionalData,
       Parameter paramNo,
-      short count,
-      RequestContext requestContext) {
-    super(commandTypeContainer, additionalData, requestContext);
+      short count) {
+    super(requestContext, commandTypeContainer, additionalData);
     this.paramNo = paramNo;
     this.count = count;
-    this.requestContext = requestContext;
   }
 
   public Parameter getParamNo() {
@@ -121,28 +117,25 @@ public static CALDataBuilder staticParseCALDataBuilder(
 
     readBuffer.closeContext("CALDataGetStatus");
     // Create the instance
-    return new CALDataGetStatusBuilderImpl(paramNo, count, requestContext);
+    return new CALDataGetStatusBuilderImpl(paramNo, count);
   }
 
   public static class CALDataGetStatusBuilderImpl implements CALData.CALDataBuilder {
     private final Parameter paramNo;
     private final short count;
-    private final RequestContext requestContext;
 
-    public CALDataGetStatusBuilderImpl(
-        Parameter paramNo, short count, RequestContext requestContext) {
+    public CALDataGetStatusBuilderImpl(Parameter paramNo, short count) {
       this.paramNo = paramNo;
       this.count = count;
-      this.requestContext = requestContext;
     }
 
     public CALDataGetStatus build(
+        RequestContext requestContext,
         CALCommandTypeContainer commandTypeContainer,
-        CALData additionalData,
-        RequestContext requestContext) {
+        CALData additionalData) {
       CALDataGetStatus cALDataGetStatus =
           new CALDataGetStatus(
-              commandTypeContainer, additionalData, paramNo, count, requestContext);
+              requestContext, commandTypeContainer, additionalData, paramNo, count);
       return cALDataGetStatus;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataIdentify.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataIdentify.java
index 900a126f7e2..e1fa3b9b238 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataIdentify.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataIdentify.java
@@ -42,17 +42,13 @@ public class CALDataIdentify extends CALData implements Message {
   // Properties.
   protected final Attribute attribute;
 
-  // Arguments.
-  protected final RequestContext requestContext;
-
   public CALDataIdentify(
+      RequestContext requestContext,
       CALCommandTypeContainer commandTypeContainer,
       CALData additionalData,
-      Attribute attribute,
-      RequestContext requestContext) {
-    super(commandTypeContainer, additionalData, requestContext);
+      Attribute attribute) {
+    super(requestContext, commandTypeContainer, additionalData);
     this.attribute = attribute;
-    this.requestContext = requestContext;
   }
 
   public Attribute getAttribute() {
@@ -106,24 +102,22 @@ public static CALDataBuilder staticParseCALDataBuilder(
 
     readBuffer.closeContext("CALDataIdentify");
     // Create the instance
-    return new CALDataIdentifyBuilderImpl(attribute, requestContext);
+    return new CALDataIdentifyBuilderImpl(attribute);
   }
 
   public static class CALDataIdentifyBuilderImpl implements CALData.CALDataBuilder {
     private final Attribute attribute;
-    private final RequestContext requestContext;
 
-    public CALDataIdentifyBuilderImpl(Attribute attribute, RequestContext requestContext) {
+    public CALDataIdentifyBuilderImpl(Attribute attribute) {
       this.attribute = attribute;
-      this.requestContext = requestContext;
     }
 
     public CALDataIdentify build(
+        RequestContext requestContext,
         CALCommandTypeContainer commandTypeContainer,
-        CALData additionalData,
-        RequestContext requestContext) {
+        CALData additionalData) {
       CALDataIdentify cALDataIdentify =
-          new CALDataIdentify(commandTypeContainer, additionalData, attribute, requestContext);
+          new CALDataIdentify(requestContext, commandTypeContainer, additionalData, attribute);
       return cALDataIdentify;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataIdentifyReply.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataIdentifyReply.java
index dad3845fab3..769b32bacf5 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataIdentifyReply.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataIdentifyReply.java
@@ -43,19 +43,15 @@ public class CALDataIdentifyReply extends CALData implements Message {
   protected final Attribute attribute;
   protected final IdentifyReplyCommand identifyReplyCommand;
 
-  // Arguments.
-  protected final RequestContext requestContext;
-
   public CALDataIdentifyReply(
+      RequestContext requestContext,
       CALCommandTypeContainer commandTypeContainer,
       CALData additionalData,
       Attribute attribute,
-      IdentifyReplyCommand identifyReplyCommand,
-      RequestContext requestContext) {
-    super(commandTypeContainer, additionalData, requestContext);
+      IdentifyReplyCommand identifyReplyCommand) {
+    super(requestContext, commandTypeContainer, additionalData);
     this.attribute = attribute;
     this.identifyReplyCommand = identifyReplyCommand;
-    this.requestContext = requestContext;
   }
 
   public Attribute getAttribute() {
@@ -133,34 +129,30 @@ public static CALDataBuilder staticParseCALDataBuilder(
 
     readBuffer.closeContext("CALDataIdentifyReply");
     // Create the instance
-    return new CALDataIdentifyReplyBuilderImpl(attribute, identifyReplyCommand, requestContext);
+    return new CALDataIdentifyReplyBuilderImpl(attribute, identifyReplyCommand);
   }
 
   public static class CALDataIdentifyReplyBuilderImpl implements CALData.CALDataBuilder {
     private final Attribute attribute;
     private final IdentifyReplyCommand identifyReplyCommand;
-    private final RequestContext requestContext;
 
     public CALDataIdentifyReplyBuilderImpl(
-        Attribute attribute,
-        IdentifyReplyCommand identifyReplyCommand,
-        RequestContext requestContext) {
+        Attribute attribute, IdentifyReplyCommand identifyReplyCommand) {
       this.attribute = attribute;
       this.identifyReplyCommand = identifyReplyCommand;
-      this.requestContext = requestContext;
     }
 
     public CALDataIdentifyReply build(
+        RequestContext requestContext,
         CALCommandTypeContainer commandTypeContainer,
-        CALData additionalData,
-        RequestContext requestContext) {
+        CALData additionalData) {
       CALDataIdentifyReply cALDataIdentifyReply =
           new CALDataIdentifyReply(
+              requestContext,
               commandTypeContainer,
               additionalData,
               attribute,
-              identifyReplyCommand,
-              requestContext);
+              identifyReplyCommand);
       return cALDataIdentifyReply;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataRecall.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataRecall.java
index 7db4aeecf03..d572279fa37 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataRecall.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataRecall.java
@@ -43,19 +43,15 @@ public class CALDataRecall extends CALData implements Message {
   protected final Parameter paramNo;
   protected final short count;
 
-  // Arguments.
-  protected final RequestContext requestContext;
-
   public CALDataRecall(
+      RequestContext requestContext,
       CALCommandTypeContainer commandTypeContainer,
       CALData additionalData,
       Parameter paramNo,
-      short count,
-      RequestContext requestContext) {
-    super(commandTypeContainer, additionalData, requestContext);
+      short count) {
+    super(requestContext, commandTypeContainer, additionalData);
     this.paramNo = paramNo;
     this.count = count;
-    this.requestContext = requestContext;
   }
 
   public Parameter getParamNo() {
@@ -121,26 +117,24 @@ public static CALDataBuilder staticParseCALDataBuilder(
 
     readBuffer.closeContext("CALDataRecall");
     // Create the instance
-    return new CALDataRecallBuilderImpl(paramNo, count, requestContext);
+    return new CALDataRecallBuilderImpl(paramNo, count);
   }
 
   public static class CALDataRecallBuilderImpl implements CALData.CALDataBuilder {
     private final Parameter paramNo;
     private final short count;
-    private final RequestContext requestContext;
 
-    public CALDataRecallBuilderImpl(Parameter paramNo, short count, RequestContext requestContext) {
+    public CALDataRecallBuilderImpl(Parameter paramNo, short count) {
       this.paramNo = paramNo;
       this.count = count;
-      this.requestContext = requestContext;
     }
 
     public CALDataRecall build(
+        RequestContext requestContext,
         CALCommandTypeContainer commandTypeContainer,
-        CALData additionalData,
-        RequestContext requestContext) {
+        CALData additionalData) {
       CALDataRecall cALDataRecall =
-          new CALDataRecall(commandTypeContainer, additionalData, paramNo, count, requestContext);
+          new CALDataRecall(requestContext, commandTypeContainer, additionalData, paramNo, count);
       return cALDataRecall;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataReply.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataReply.java
index aece5b7096d..851483c826c 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataReply.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataReply.java
@@ -43,19 +43,15 @@ public class CALDataReply extends CALData implements Message {
   protected final Parameter paramNo;
   protected final ParameterValue parameterValue;
 
-  // Arguments.
-  protected final RequestContext requestContext;
-
   public CALDataReply(
+      RequestContext requestContext,
       CALCommandTypeContainer commandTypeContainer,
       CALData additionalData,
       Parameter paramNo,
-      ParameterValue parameterValue,
-      RequestContext requestContext) {
-    super(commandTypeContainer, additionalData, requestContext);
+      ParameterValue parameterValue) {
+    super(requestContext, commandTypeContainer, additionalData);
     this.paramNo = paramNo;
     this.parameterValue = parameterValue;
-    this.requestContext = requestContext;
   }
 
   public Parameter getParamNo() {
@@ -133,28 +129,25 @@ public static CALDataBuilder staticParseCALDataBuilder(
 
     readBuffer.closeContext("CALDataReply");
     // Create the instance
-    return new CALDataReplyBuilderImpl(paramNo, parameterValue, requestContext);
+    return new CALDataReplyBuilderImpl(paramNo, parameterValue);
   }
 
   public static class CALDataReplyBuilderImpl implements CALData.CALDataBuilder {
     private final Parameter paramNo;
     private final ParameterValue parameterValue;
-    private final RequestContext requestContext;
 
-    public CALDataReplyBuilderImpl(
-        Parameter paramNo, ParameterValue parameterValue, RequestContext requestContext) {
+    public CALDataReplyBuilderImpl(Parameter paramNo, ParameterValue parameterValue) {
       this.paramNo = paramNo;
       this.parameterValue = parameterValue;
-      this.requestContext = requestContext;
     }
 
     public CALDataReply build(
+        RequestContext requestContext,
         CALCommandTypeContainer commandTypeContainer,
-        CALData additionalData,
-        RequestContext requestContext) {
+        CALData additionalData) {
       CALDataReply cALDataReply =
           new CALDataReply(
-              commandTypeContainer, additionalData, paramNo, parameterValue, requestContext);
+              requestContext, commandTypeContainer, additionalData, paramNo, parameterValue);
       return cALDataReply;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataReset.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataReset.java
index 4e0ed62dfd4..529ab15dee5 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataReset.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataReset.java
@@ -39,15 +39,11 @@ public class CALDataReset extends CALData implements Message {
 
   // Accessors for discriminator values.
 
-  // Arguments.
-  protected final RequestContext requestContext;
-
   public CALDataReset(
+      RequestContext requestContext,
       CALCommandTypeContainer commandTypeContainer,
-      CALData additionalData,
-      RequestContext requestContext) {
-    super(commandTypeContainer, additionalData, requestContext);
-    this.requestContext = requestContext;
+      CALData additionalData) {
+    super(requestContext, commandTypeContainer, additionalData);
   }
 
   @Override
@@ -81,22 +77,19 @@ public static CALDataBuilder staticParseCALDataBuilder(
 
     readBuffer.closeContext("CALDataReset");
     // Create the instance
-    return new CALDataResetBuilderImpl(requestContext);
+    return new CALDataResetBuilderImpl();
   }
 
   public static class CALDataResetBuilderImpl implements CALData.CALDataBuilder {
-    private final RequestContext requestContext;
 
-    public CALDataResetBuilderImpl(RequestContext requestContext) {
-      this.requestContext = requestContext;
-    }
+    public CALDataResetBuilderImpl() {}
 
     public CALDataReset build(
+        RequestContext requestContext,
         CALCommandTypeContainer commandTypeContainer,
-        CALData additionalData,
-        RequestContext requestContext) {
+        CALData additionalData) {
       CALDataReset cALDataReset =
-          new CALDataReset(commandTypeContainer, additionalData, requestContext);
+          new CALDataReset(requestContext, commandTypeContainer, additionalData);
       return cALDataReset;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataStatus.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataStatus.java
index feea182770c..fae4c2ffeff 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataStatus.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataStatus.java
@@ -44,21 +44,17 @@ public class CALDataStatus extends CALData implements Message {
   protected final short blockStart;
   protected final List<StatusByte> statusBytes;
 
-  // Arguments.
-  protected final RequestContext requestContext;
-
   public CALDataStatus(
+      RequestContext requestContext,
       CALCommandTypeContainer commandTypeContainer,
       CALData additionalData,
       ApplicationIdContainer application,
       short blockStart,
-      List<StatusByte> statusBytes,
-      RequestContext requestContext) {
-    super(commandTypeContainer, additionalData, requestContext);
+      List<StatusByte> statusBytes) {
+    super(requestContext, commandTypeContainer, additionalData);
     this.application = application;
     this.blockStart = blockStart;
     this.statusBytes = statusBytes;
-    this.requestContext = requestContext;
   }
 
   public ApplicationIdContainer getApplication() {
@@ -152,38 +148,33 @@ public static CALDataBuilder staticParseCALDataBuilder(
 
     readBuffer.closeContext("CALDataStatus");
     // Create the instance
-    return new CALDataStatusBuilderImpl(application, blockStart, statusBytes, requestContext);
+    return new CALDataStatusBuilderImpl(application, blockStart, statusBytes);
   }
 
   public static class CALDataStatusBuilderImpl implements CALData.CALDataBuilder {
     private final ApplicationIdContainer application;
     private final short blockStart;
     private final List<StatusByte> statusBytes;
-    private final RequestContext requestContext;
 
     public CALDataStatusBuilderImpl(
-        ApplicationIdContainer application,
-        short blockStart,
-        List<StatusByte> statusBytes,
-        RequestContext requestContext) {
+        ApplicationIdContainer application, short blockStart, List<StatusByte> statusBytes) {
       this.application = application;
       this.blockStart = blockStart;
       this.statusBytes = statusBytes;
-      this.requestContext = requestContext;
     }
 
     public CALDataStatus build(
+        RequestContext requestContext,
         CALCommandTypeContainer commandTypeContainer,
-        CALData additionalData,
-        RequestContext requestContext) {
+        CALData additionalData) {
       CALDataStatus cALDataStatus =
           new CALDataStatus(
+              requestContext,
               commandTypeContainer,
               additionalData,
               application,
               blockStart,
-              statusBytes,
-              requestContext);
+              statusBytes);
       return cALDataStatus;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataStatusExtended.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataStatusExtended.java
index d14fd277ced..969f8ffb01b 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataStatusExtended.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataStatusExtended.java
@@ -46,25 +46,21 @@ public class CALDataStatusExtended extends CALData implements Message {
   protected final List<StatusByte> statusBytes;
   protected final List<LevelInformation> levelInformation;
 
-  // Arguments.
-  protected final RequestContext requestContext;
-
   public CALDataStatusExtended(
+      RequestContext requestContext,
       CALCommandTypeContainer commandTypeContainer,
       CALData additionalData,
       StatusCoding coding,
       ApplicationIdContainer application,
       short blockStart,
       List<StatusByte> statusBytes,
-      List<LevelInformation> levelInformation,
-      RequestContext requestContext) {
-    super(commandTypeContainer, additionalData, requestContext);
+      List<LevelInformation> levelInformation) {
+    super(requestContext, commandTypeContainer, additionalData);
     this.coding = coding;
     this.application = application;
     this.blockStart = blockStart;
     this.statusBytes = statusBytes;
     this.levelInformation = levelInformation;
-    this.requestContext = requestContext;
   }
 
   public StatusCoding getCoding() {
@@ -245,7 +241,7 @@ public static CALDataBuilder staticParseCALDataBuilder(
     readBuffer.closeContext("CALDataStatusExtended");
     // Create the instance
     return new CALDataStatusExtendedBuilderImpl(
-        coding, application, blockStart, statusBytes, levelInformation, requestContext);
+        coding, application, blockStart, statusBytes, levelInformation);
   }
 
   public static class CALDataStatusExtendedBuilderImpl implements CALData.CALDataBuilder {
@@ -254,37 +250,34 @@ public static class CALDataStatusExtendedBuilderImpl implements CALData.CALDataB
     private final short blockStart;
     private final List<StatusByte> statusBytes;
     private final List<LevelInformation> levelInformation;
-    private final RequestContext requestContext;
 
     public CALDataStatusExtendedBuilderImpl(
         StatusCoding coding,
         ApplicationIdContainer application,
         short blockStart,
         List<StatusByte> statusBytes,
-        List<LevelInformation> levelInformation,
-        RequestContext requestContext) {
+        List<LevelInformation> levelInformation) {
       this.coding = coding;
       this.application = application;
       this.blockStart = blockStart;
       this.statusBytes = statusBytes;
       this.levelInformation = levelInformation;
-      this.requestContext = requestContext;
     }
 
     public CALDataStatusExtended build(
+        RequestContext requestContext,
         CALCommandTypeContainer commandTypeContainer,
-        CALData additionalData,
-        RequestContext requestContext) {
+        CALData additionalData) {
       CALDataStatusExtended cALDataStatusExtended =
           new CALDataStatusExtended(
+              requestContext,
               commandTypeContainer,
               additionalData,
               coding,
               application,
               blockStart,
               statusBytes,
-              levelInformation,
-              requestContext);
+              levelInformation);
       return cALDataStatusExtended;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataWrite.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataWrite.java
index 292c764cc05..0a2a6320ebe 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataWrite.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataWrite.java
@@ -44,21 +44,17 @@ public class CALDataWrite extends CALData implements Message {
   protected final byte code;
   protected final ParameterValue parameterValue;
 
-  // Arguments.
-  protected final RequestContext requestContext;
-
   public CALDataWrite(
+      RequestContext requestContext,
       CALCommandTypeContainer commandTypeContainer,
       CALData additionalData,
       Parameter paramNo,
       byte code,
-      ParameterValue parameterValue,
-      RequestContext requestContext) {
-    super(commandTypeContainer, additionalData, requestContext);
+      ParameterValue parameterValue) {
+    super(requestContext, commandTypeContainer, additionalData);
     this.paramNo = paramNo;
     this.code = code;
     this.parameterValue = parameterValue;
-    this.requestContext = requestContext;
   }
 
   public Parameter getParamNo() {
@@ -148,33 +144,27 @@ public static CALDataBuilder staticParseCALDataBuilder(
 
     readBuffer.closeContext("CALDataWrite");
     // Create the instance
-    return new CALDataWriteBuilderImpl(paramNo, code, parameterValue, requestContext);
+    return new CALDataWriteBuilderImpl(paramNo, code, parameterValue);
   }
 
   public static class CALDataWriteBuilderImpl implements CALData.CALDataBuilder {
     private final Parameter paramNo;
     private final byte code;
     private final ParameterValue parameterValue;
-    private final RequestContext requestContext;
 
-    public CALDataWriteBuilderImpl(
-        Parameter paramNo,
-        byte code,
-        ParameterValue parameterValue,
-        RequestContext requestContext) {
+    public CALDataWriteBuilderImpl(Parameter paramNo, byte code, ParameterValue parameterValue) {
       this.paramNo = paramNo;
       this.code = code;
       this.parameterValue = parameterValue;
-      this.requestContext = requestContext;
     }
 
     public CALDataWrite build(
+        RequestContext requestContext,
         CALCommandTypeContainer commandTypeContainer,
-        CALData additionalData,
-        RequestContext requestContext) {
+        CALData additionalData) {
       CALDataWrite cALDataWrite =
           new CALDataWrite(
-              commandTypeContainer, additionalData, paramNo, code, parameterValue, requestContext);
+              requestContext, commandTypeContainer, additionalData, paramNo, code, parameterValue);
       return cALDataWrite;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReply.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReply.java
index b7d5b19ab9b..a8a5045e7ce 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReply.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReply.java
@@ -43,17 +43,10 @@ public abstract class CALReply implements Message {
   protected final byte calType;
   protected final CALData calData;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-  protected final RequestContext requestContext;
-
-  public CALReply(
-      byte calType, CALData calData, CBusOptions cBusOptions, RequestContext requestContext) {
+  public CALReply(byte calType, CALData calData) {
     super();
     this.calType = calType;
     this.calData = calData;
-    this.cBusOptions = cBusOptions;
-    this.requestContext = requestContext;
   }
 
   public byte getCalType() {
@@ -130,13 +123,12 @@ public static CALReply staticParse(
 
     readBuffer.closeContext("CALReply");
     // Create the instance
-    CALReply _cALReply = builder.build(calType, calData, cBusOptions, requestContext);
+    CALReply _cALReply = builder.build(calType, calData);
     return _cALReply;
   }
 
   public interface CALReplyBuilder {
-    CALReply build(
-        byte calType, CALData calData, CBusOptions cBusOptions, RequestContext requestContext);
+    CALReply build(byte calType, CALData calData);
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReplyLong.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReplyLong.java
index 94195b9f928..6f846fff829 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReplyLong.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReplyLong.java
@@ -46,10 +46,6 @@ public class CALReplyLong extends CALReply implements Message {
   protected final SerialInterfaceAddress serialInterfaceAddress;
   protected final Byte reservedByte;
   protected final ReplyNetwork replyNetwork;
-
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-  protected final RequestContext requestContext;
   // Reserved Fields
   private Byte reservedField0;
 
@@ -61,18 +57,14 @@ public CALReplyLong(
       BridgeAddress bridgeAddress,
       SerialInterfaceAddress serialInterfaceAddress,
       Byte reservedByte,
-      ReplyNetwork replyNetwork,
-      CBusOptions cBusOptions,
-      RequestContext requestContext) {
-    super(calType, calData, cBusOptions, requestContext);
+      ReplyNetwork replyNetwork) {
+    super(calType, calData);
     this.terminatingByte = terminatingByte;
     this.unitAddress = unitAddress;
     this.bridgeAddress = bridgeAddress;
     this.serialInterfaceAddress = serialInterfaceAddress;
     this.reservedByte = reservedByte;
     this.replyNetwork = replyNetwork;
-    this.cBusOptions = cBusOptions;
-    this.requestContext = requestContext;
   }
 
   public int getTerminatingByte() {
@@ -120,21 +112,19 @@ protected void serializeCALReplyChild(WriteBuffer writeBuffer) throws Serializat
     writeBuffer.writeVirtual("isUnitAddress", isUnitAddress);
 
     // Optional Field (unitAddress) (Can be skipped, if the value is null)
-    writeOptionalField("unitAddress", unitAddress, writeComplex(writeBuffer), getIsUnitAddress());
+    writeOptionalField("unitAddress", unitAddress, writeComplex(writeBuffer));
 
     // Optional Field (bridgeAddress) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "bridgeAddress", bridgeAddress, writeComplex(writeBuffer), !(getIsUnitAddress()));
+    writeOptionalField("bridgeAddress", bridgeAddress, writeComplex(writeBuffer));
 
     // Simple Field (serialInterfaceAddress)
     writeSimpleField("serialInterfaceAddress", serialInterfaceAddress, writeComplex(writeBuffer));
 
     // Optional Field (reservedByte) (Can be skipped, if the value is null)
-    writeOptionalField("reservedByte", reservedByte, writeByte(writeBuffer, 8), getIsUnitAddress());
+    writeOptionalField("reservedByte", reservedByte, writeByte(writeBuffer, 8));
 
     // Optional Field (replyNetwork) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "replyNetwork", replyNetwork, writeComplex(writeBuffer), !(getIsUnitAddress()));
+    writeOptionalField("replyNetwork", replyNetwork, writeComplex(writeBuffer));
 
     writeBuffer.popContext("CALReplyLong");
   }
@@ -232,8 +222,6 @@ public static CALReplyBuilder staticParseCALReplyBuilder(
         serialInterfaceAddress,
         reservedByte,
         replyNetwork,
-        cBusOptions,
-        requestContext,
         reservedField0);
   }
 
@@ -244,8 +232,6 @@ public static class CALReplyLongBuilderImpl implements CALReply.CALReplyBuilder
     private final SerialInterfaceAddress serialInterfaceAddress;
     private final Byte reservedByte;
     private final ReplyNetwork replyNetwork;
-    private final CBusOptions cBusOptions;
-    private final RequestContext requestContext;
     private final Byte reservedField0;
 
     public CALReplyLongBuilderImpl(
@@ -255,8 +241,6 @@ public CALReplyLongBuilderImpl(
         SerialInterfaceAddress serialInterfaceAddress,
         Byte reservedByte,
         ReplyNetwork replyNetwork,
-        CBusOptions cBusOptions,
-        RequestContext requestContext,
         Byte reservedField0) {
       this.terminatingByte = terminatingByte;
       this.unitAddress = unitAddress;
@@ -264,13 +248,10 @@ public CALReplyLongBuilderImpl(
       this.serialInterfaceAddress = serialInterfaceAddress;
       this.reservedByte = reservedByte;
       this.replyNetwork = replyNetwork;
-      this.cBusOptions = cBusOptions;
-      this.requestContext = requestContext;
       this.reservedField0 = reservedField0;
     }
 
-    public CALReplyLong build(
-        byte calType, CALData calData, CBusOptions cBusOptions, RequestContext requestContext) {
+    public CALReplyLong build(byte calType, CALData calData) {
       CALReplyLong cALReplyLong =
           new CALReplyLong(
               calType,
@@ -280,9 +261,7 @@ public CALReplyLong build(
               bridgeAddress,
               serialInterfaceAddress,
               reservedByte,
-              replyNetwork,
-              cBusOptions,
-              requestContext);
+              replyNetwork);
       cALReplyLong.reservedField0 = reservedField0;
       return cALReplyLong;
     }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReplyShort.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReplyShort.java
index a47ee21e97a..af6b618ecb4 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReplyShort.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReplyShort.java
@@ -39,15 +39,8 @@ public class CALReplyShort extends CALReply implements Message {
 
   // Accessors for discriminator values.
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-  protected final RequestContext requestContext;
-
-  public CALReplyShort(
-      byte calType, CALData calData, CBusOptions cBusOptions, RequestContext requestContext) {
-    super(calType, calData, cBusOptions, requestContext);
-    this.cBusOptions = cBusOptions;
-    this.requestContext = requestContext;
+  public CALReplyShort(byte calType, CALData calData) {
+    super(calType, calData);
   }
 
   @Override
@@ -82,22 +75,15 @@ public static CALReplyBuilder staticParseCALReplyBuilder(
 
     readBuffer.closeContext("CALReplyShort");
     // Create the instance
-    return new CALReplyShortBuilderImpl(cBusOptions, requestContext);
+    return new CALReplyShortBuilderImpl();
   }
 
   public static class CALReplyShortBuilderImpl implements CALReply.CALReplyBuilder {
-    private final CBusOptions cBusOptions;
-    private final RequestContext requestContext;
 
-    public CALReplyShortBuilderImpl(CBusOptions cBusOptions, RequestContext requestContext) {
-      this.cBusOptions = cBusOptions;
-      this.requestContext = requestContext;
-    }
+    public CALReplyShortBuilderImpl() {}
 
-    public CALReplyShort build(
-        byte calType, CALData calData, CBusOptions cBusOptions, RequestContext requestContext) {
-      CALReplyShort cALReplyShort =
-          new CALReplyShort(calType, calData, cBusOptions, requestContext);
+    public CALReplyShort build(byte calType, CALData calData) {
+      CALReplyShort cALReplyShort = new CALReplyShort(calType, calData);
       return cALReplyShort;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommand.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommand.java
index 8303a66dbb6..abd2f58a55f 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommand.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommand.java
@@ -42,13 +42,9 @@ public abstract class CBusCommand implements Message {
   // Properties.
   protected final CBusHeader header;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
-  public CBusCommand(CBusHeader header, CBusOptions cBusOptions) {
+  public CBusCommand(CBusHeader header) {
     super();
     this.header = header;
-    this.cBusOptions = cBusOptions;
   }
 
   public CBusHeader getHeader() {
@@ -158,12 +154,12 @@ public static CBusCommand staticParse(ReadBuffer readBuffer, CBusOptions cBusOpt
 
     readBuffer.closeContext("CBusCommand");
     // Create the instance
-    CBusCommand _cBusCommand = builder.build(header, cBusOptions);
+    CBusCommand _cBusCommand = builder.build(header);
     return _cBusCommand;
   }
 
   public interface CBusCommandBuilder {
-    CBusCommand build(CBusHeader header, CBusOptions cBusOptions);
+    CBusCommand build(CBusHeader header);
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandDeviceManagement.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandDeviceManagement.java
index 982b3ab1bf3..a274bed2969 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandDeviceManagement.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandDeviceManagement.java
@@ -46,15 +46,10 @@ public class CBusCommandDeviceManagement extends CBusCommand implements Message
   protected final Parameter paramNo;
   protected final byte parameterValue;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
-  public CBusCommandDeviceManagement(
-      CBusHeader header, Parameter paramNo, byte parameterValue, CBusOptions cBusOptions) {
-    super(header, cBusOptions);
+  public CBusCommandDeviceManagement(CBusHeader header, Parameter paramNo, byte parameterValue) {
+    super(header);
     this.paramNo = paramNo;
     this.parameterValue = parameterValue;
-    this.cBusOptions = cBusOptions;
   }
 
   public Parameter getParamNo() {
@@ -133,25 +128,22 @@ public static CBusCommandBuilder staticParseCBusCommandBuilder(
 
     readBuffer.closeContext("CBusCommandDeviceManagement");
     // Create the instance
-    return new CBusCommandDeviceManagementBuilderImpl(paramNo, parameterValue, cBusOptions);
+    return new CBusCommandDeviceManagementBuilderImpl(paramNo, parameterValue);
   }
 
   public static class CBusCommandDeviceManagementBuilderImpl
       implements CBusCommand.CBusCommandBuilder {
     private final Parameter paramNo;
     private final byte parameterValue;
-    private final CBusOptions cBusOptions;
 
-    public CBusCommandDeviceManagementBuilderImpl(
-        Parameter paramNo, byte parameterValue, CBusOptions cBusOptions) {
+    public CBusCommandDeviceManagementBuilderImpl(Parameter paramNo, byte parameterValue) {
       this.paramNo = paramNo;
       this.parameterValue = parameterValue;
-      this.cBusOptions = cBusOptions;
     }
 
-    public CBusCommandDeviceManagement build(CBusHeader header, CBusOptions cBusOptions) {
+    public CBusCommandDeviceManagement build(CBusHeader header) {
       CBusCommandDeviceManagement cBusCommandDeviceManagement =
-          new CBusCommandDeviceManagement(header, paramNo, parameterValue, cBusOptions);
+          new CBusCommandDeviceManagement(header, paramNo, parameterValue);
       return cBusCommandDeviceManagement;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandPointToMultiPoint.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandPointToMultiPoint.java
index 5a9f85d358e..ca5f55e4a48 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandPointToMultiPoint.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandPointToMultiPoint.java
@@ -42,14 +42,9 @@ public class CBusCommandPointToMultiPoint extends CBusCommand implements Message
   // Properties.
   protected final CBusPointToMultiPointCommand command;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
-  public CBusCommandPointToMultiPoint(
-      CBusHeader header, CBusPointToMultiPointCommand command, CBusOptions cBusOptions) {
-    super(header, cBusOptions);
+  public CBusCommandPointToMultiPoint(CBusHeader header, CBusPointToMultiPointCommand command) {
+    super(header);
     this.command = command;
-    this.cBusOptions = cBusOptions;
   }
 
   public CBusPointToMultiPointCommand getCommand() {
@@ -102,23 +97,20 @@ public static CBusCommandBuilder staticParseCBusCommandBuilder(
 
     readBuffer.closeContext("CBusCommandPointToMultiPoint");
     // Create the instance
-    return new CBusCommandPointToMultiPointBuilderImpl(command, cBusOptions);
+    return new CBusCommandPointToMultiPointBuilderImpl(command);
   }
 
   public static class CBusCommandPointToMultiPointBuilderImpl
       implements CBusCommand.CBusCommandBuilder {
     private final CBusPointToMultiPointCommand command;
-    private final CBusOptions cBusOptions;
 
-    public CBusCommandPointToMultiPointBuilderImpl(
-        CBusPointToMultiPointCommand command, CBusOptions cBusOptions) {
+    public CBusCommandPointToMultiPointBuilderImpl(CBusPointToMultiPointCommand command) {
       this.command = command;
-      this.cBusOptions = cBusOptions;
     }
 
-    public CBusCommandPointToMultiPoint build(CBusHeader header, CBusOptions cBusOptions) {
+    public CBusCommandPointToMultiPoint build(CBusHeader header) {
       CBusCommandPointToMultiPoint cBusCommandPointToMultiPoint =
-          new CBusCommandPointToMultiPoint(header, command, cBusOptions);
+          new CBusCommandPointToMultiPoint(header, command);
       return cBusCommandPointToMultiPoint;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandPointToPoint.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandPointToPoint.java
index 415080ed058..4964c951abc 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandPointToPoint.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandPointToPoint.java
@@ -42,14 +42,9 @@ public class CBusCommandPointToPoint extends CBusCommand implements Message {
   // Properties.
   protected final CBusPointToPointCommand command;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
-  public CBusCommandPointToPoint(
-      CBusHeader header, CBusPointToPointCommand command, CBusOptions cBusOptions) {
-    super(header, cBusOptions);
+  public CBusCommandPointToPoint(CBusHeader header, CBusPointToPointCommand command) {
+    super(header);
     this.command = command;
-    this.cBusOptions = cBusOptions;
   }
 
   public CBusPointToPointCommand getCommand() {
@@ -100,22 +95,19 @@ public static CBusCommandBuilder staticParseCBusCommandBuilder(
 
     readBuffer.closeContext("CBusCommandPointToPoint");
     // Create the instance
-    return new CBusCommandPointToPointBuilderImpl(command, cBusOptions);
+    return new CBusCommandPointToPointBuilderImpl(command);
   }
 
   public static class CBusCommandPointToPointBuilderImpl implements CBusCommand.CBusCommandBuilder {
     private final CBusPointToPointCommand command;
-    private final CBusOptions cBusOptions;
 
-    public CBusCommandPointToPointBuilderImpl(
-        CBusPointToPointCommand command, CBusOptions cBusOptions) {
+    public CBusCommandPointToPointBuilderImpl(CBusPointToPointCommand command) {
       this.command = command;
-      this.cBusOptions = cBusOptions;
     }
 
-    public CBusCommandPointToPoint build(CBusHeader header, CBusOptions cBusOptions) {
+    public CBusCommandPointToPoint build(CBusHeader header) {
       CBusCommandPointToPoint cBusCommandPointToPoint =
-          new CBusCommandPointToPoint(header, command, cBusOptions);
+          new CBusCommandPointToPoint(header, command);
       return cBusCommandPointToPoint;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandPointToPointToMultiPoint.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandPointToPointToMultiPoint.java
index ee7fc36dc4b..dd57777ad43 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandPointToPointToMultiPoint.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusCommandPointToPointToMultiPoint.java
@@ -42,14 +42,10 @@ public class CBusCommandPointToPointToMultiPoint extends CBusCommand implements
   // Properties.
   protected final CBusPointToPointToMultiPointCommand command;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
   public CBusCommandPointToPointToMultiPoint(
-      CBusHeader header, CBusPointToPointToMultiPointCommand command, CBusOptions cBusOptions) {
-    super(header, cBusOptions);
+      CBusHeader header, CBusPointToPointToMultiPointCommand command) {
+    super(header);
     this.command = command;
-    this.cBusOptions = cBusOptions;
   }
 
   public CBusPointToPointToMultiPointCommand getCommand() {
@@ -102,23 +98,21 @@ public static CBusCommandBuilder staticParseCBusCommandBuilder(
 
     readBuffer.closeContext("CBusCommandPointToPointToMultiPoint");
     // Create the instance
-    return new CBusCommandPointToPointToMultiPointBuilderImpl(command, cBusOptions);
+    return new CBusCommandPointToPointToMultiPointBuilderImpl(command);
   }
 
   public static class CBusCommandPointToPointToMultiPointBuilderImpl
       implements CBusCommand.CBusCommandBuilder {
     private final CBusPointToPointToMultiPointCommand command;
-    private final CBusOptions cBusOptions;
 
     public CBusCommandPointToPointToMultiPointBuilderImpl(
-        CBusPointToPointToMultiPointCommand command, CBusOptions cBusOptions) {
+        CBusPointToPointToMultiPointCommand command) {
       this.command = command;
-      this.cBusOptions = cBusOptions;
     }
 
-    public CBusCommandPointToPointToMultiPoint build(CBusHeader header, CBusOptions cBusOptions) {
+    public CBusCommandPointToPointToMultiPoint build(CBusHeader header) {
       CBusCommandPointToPointToMultiPoint cBusCommandPointToPointToMultiPoint =
-          new CBusCommandPointToPointToMultiPoint(header, command, cBusOptions);
+          new CBusCommandPointToPointToMultiPoint(header, command);
       return cBusCommandPointToPointToMultiPoint;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusConstants.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusConstants.java
deleted file mode 100644
index 776bbf504de..00000000000
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusConstants.java
+++ /dev/null
@@ -1,124 +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.cbus.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 CBusConstants implements Message {
-
-  // Constant values.
-  public static final Integer CBUSTCPDEFAULTPORT = 10001;
-
-  public CBusConstants() {
-    super();
-  }
-
-  public int getCbusTcpDefaultPort() {
-    return CBUSTCPDEFAULTPORT;
-  }
-
-  public void serialize(WriteBuffer writeBuffer) throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("CBusConstants");
-
-    // Const Field (cbusTcpDefaultPort)
-    writeConstField("cbusTcpDefaultPort", CBUSTCPDEFAULTPORT, writeUnsignedInt(writeBuffer, 16));
-
-    writeBuffer.popContext("CBusConstants");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = 0;
-    CBusConstants _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    // Const Field (cbusTcpDefaultPort)
-    lengthInBits += 16;
-
-    return lengthInBits;
-  }
-
-  public static CBusConstants staticParse(ReadBuffer readBuffer) throws ParseException {
-    readBuffer.pullContext("CBusConstants");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    int cbusTcpDefaultPort =
-        readConstField(
-            "cbusTcpDefaultPort",
-            readUnsignedInt(readBuffer, 16),
-            CBusConstants.CBUSTCPDEFAULTPORT);
-
-    readBuffer.closeContext("CBusConstants");
-    // Create the instance
-    CBusConstants _cBusConstants;
-    _cBusConstants = new CBusConstants();
-    return _cBusConstants;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof CBusConstants)) {
-      return false;
-    }
-    CBusConstants that = (CBusConstants) o;
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash();
-  }
-
-  @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/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusMessage.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusMessage.java
index dccb3b231f4..16b8219a14e 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusMessage.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusMessage.java
@@ -40,14 +40,8 @@ public abstract class CBusMessage implements Message {
   // Abstract accessors for discriminator values.
   public abstract Boolean getIsResponse();
 
-  // Arguments.
-  protected final RequestContext requestContext;
-  protected final CBusOptions cBusOptions;
-
-  public CBusMessage(RequestContext requestContext, CBusOptions cBusOptions) {
+  public CBusMessage() {
     super();
-    this.requestContext = requestContext;
-    this.cBusOptions = cBusOptions;
   }
 
   protected abstract void serializeCBusMessageChild(WriteBuffer writeBuffer)
@@ -120,13 +114,12 @@ public static CBusMessage staticParse(
 
     readBuffer.closeContext("CBusMessage");
     // Create the instance
-    CBusMessage _cBusMessage = builder.build(requestContext, cBusOptions);
-
+    CBusMessage _cBusMessage = builder.build();
     return _cBusMessage;
   }
 
   public interface CBusMessageBuilder {
-    CBusMessage build(RequestContext requestContext, CBusOptions cBusOptions);
+    CBusMessage build();
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusMessageToClient.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusMessageToClient.java
index 34cf5febe05..949cd422c78 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusMessageToClient.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusMessageToClient.java
@@ -45,16 +45,9 @@ public Boolean getIsResponse() {
   // Properties.
   protected final ReplyOrConfirmation reply;
 
-  // Arguments.
-  protected final RequestContext requestContext;
-  protected final CBusOptions cBusOptions;
-
-  public CBusMessageToClient(
-      ReplyOrConfirmation reply, RequestContext requestContext, CBusOptions cBusOptions) {
-    super(requestContext, cBusOptions);
+  public CBusMessageToClient(ReplyOrConfirmation reply) {
+    super();
     this.reply = reply;
-    this.requestContext = requestContext;
-    this.cBusOptions = cBusOptions;
   }
 
   public ReplyOrConfirmation getReply() {
@@ -111,25 +104,18 @@ public static CBusMessageBuilder staticParseCBusMessageBuilder(
 
     readBuffer.closeContext("CBusMessageToClient");
     // Create the instance
-    return new CBusMessageToClientBuilderImpl(reply, requestContext, cBusOptions);
+    return new CBusMessageToClientBuilderImpl(reply);
   }
 
   public static class CBusMessageToClientBuilderImpl implements CBusMessage.CBusMessageBuilder {
     private final ReplyOrConfirmation reply;
-    private final RequestContext requestContext;
-    private final CBusOptions cBusOptions;
 
-    public CBusMessageToClientBuilderImpl(
-        ReplyOrConfirmation reply, RequestContext requestContext, CBusOptions cBusOptions) {
+    public CBusMessageToClientBuilderImpl(ReplyOrConfirmation reply) {
       this.reply = reply;
-      this.requestContext = requestContext;
-      this.cBusOptions = cBusOptions;
     }
 
-    public CBusMessageToClient build(RequestContext requestContext, CBusOptions cBusOptions) {
-
-      CBusMessageToClient cBusMessageToClient =
-          new CBusMessageToClient(reply, requestContext, cBusOptions);
+    public CBusMessageToClient build() {
+      CBusMessageToClient cBusMessageToClient = new CBusMessageToClient(reply);
       return cBusMessageToClient;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusMessageToServer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusMessageToServer.java
index d50e4469f0b..41c6b0adbca 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusMessageToServer.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusMessageToServer.java
@@ -45,16 +45,9 @@ public Boolean getIsResponse() {
   // Properties.
   protected final Request request;
 
-  // Arguments.
-  protected final RequestContext requestContext;
-  protected final CBusOptions cBusOptions;
-
-  public CBusMessageToServer(
-      Request request, RequestContext requestContext, CBusOptions cBusOptions) {
-    super(requestContext, cBusOptions);
+  public CBusMessageToServer(Request request) {
+    super();
     this.request = request;
-    this.requestContext = requestContext;
-    this.cBusOptions = cBusOptions;
   }
 
   public Request getRequest() {
@@ -108,25 +101,18 @@ public static CBusMessageBuilder staticParseCBusMessageBuilder(
 
     readBuffer.closeContext("CBusMessageToServer");
     // Create the instance
-    return new CBusMessageToServerBuilderImpl(request, requestContext, cBusOptions);
+    return new CBusMessageToServerBuilderImpl(request);
   }
 
   public static class CBusMessageToServerBuilderImpl implements CBusMessage.CBusMessageBuilder {
     private final Request request;
-    private final RequestContext requestContext;
-    private final CBusOptions cBusOptions;
 
-    public CBusMessageToServerBuilderImpl(
-        Request request, RequestContext requestContext, CBusOptions cBusOptions) {
+    public CBusMessageToServerBuilderImpl(Request request) {
       this.request = request;
-      this.requestContext = requestContext;
-      this.cBusOptions = cBusOptions;
     }
 
-    public CBusMessageToServer build(RequestContext requestContext, CBusOptions cBusOptions) {
-
-      CBusMessageToServer cBusMessageToServer =
-          new CBusMessageToServer(request, requestContext, cBusOptions);
+    public CBusMessageToServer build() {
+      CBusMessageToServer cBusMessageToServer = new CBusMessageToServer(request);
       return cBusMessageToServer;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToMultiPointCommand.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToMultiPointCommand.java
index fb19f2d3acd..aa23c6890d9 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToMultiPointCommand.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToMultiPointCommand.java
@@ -42,13 +42,9 @@ public abstract class CBusPointToMultiPointCommand implements Message {
   // Properties.
   protected final byte peekedApplication;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
-  public CBusPointToMultiPointCommand(byte peekedApplication, CBusOptions cBusOptions) {
+  public CBusPointToMultiPointCommand(byte peekedApplication) {
     super();
     this.peekedApplication = peekedApplication;
-    this.cBusOptions = cBusOptions;
   }
 
   public byte getPeekedApplication() {
@@ -115,13 +111,12 @@ public static CBusPointToMultiPointCommand staticParse(
 
     readBuffer.closeContext("CBusPointToMultiPointCommand");
     // Create the instance
-    CBusPointToMultiPointCommand _cBusPointToMultiPointCommand =
-        builder.build(peekedApplication, cBusOptions);
+    CBusPointToMultiPointCommand _cBusPointToMultiPointCommand = builder.build(peekedApplication);
     return _cBusPointToMultiPointCommand;
   }
 
   public interface CBusPointToMultiPointCommandBuilder {
-    CBusPointToMultiPointCommand build(byte peekedApplication, CBusOptions cBusOptions);
+    CBusPointToMultiPointCommand build(byte peekedApplication);
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToMultiPointCommandNormal.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToMultiPointCommandNormal.java
index ee2b2568396..9b8004d428d 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToMultiPointCommandNormal.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToMultiPointCommandNormal.java
@@ -43,21 +43,14 @@ public class CBusPointToMultiPointCommandNormal extends CBusPointToMultiPointCom
   // Properties.
   protected final ApplicationIdContainer application;
   protected final SALData salData;
-
-  // Arguments.
-  protected final CBusOptions cBusOptions;
   // Reserved Fields
   private Byte reservedField0;
 
   public CBusPointToMultiPointCommandNormal(
-      byte peekedApplication,
-      ApplicationIdContainer application,
-      SALData salData,
-      CBusOptions cBusOptions) {
-    super(peekedApplication, cBusOptions);
+      byte peekedApplication, ApplicationIdContainer application, SALData salData) {
+    super(peekedApplication);
     this.application = application;
     this.salData = salData;
-    this.cBusOptions = cBusOptions;
   }
 
   public ApplicationIdContainer getApplication() {
@@ -145,33 +138,25 @@ public static CBusPointToMultiPointCommandBuilder staticParseCBusPointToMultiPoi
 
     readBuffer.closeContext("CBusPointToMultiPointCommandNormal");
     // Create the instance
-    return new CBusPointToMultiPointCommandNormalBuilderImpl(
-        application, salData, cBusOptions, reservedField0);
+    return new CBusPointToMultiPointCommandNormalBuilderImpl(application, salData, reservedField0);
   }
 
   public static class CBusPointToMultiPointCommandNormalBuilderImpl
       implements CBusPointToMultiPointCommand.CBusPointToMultiPointCommandBuilder {
     private final ApplicationIdContainer application;
     private final SALData salData;
-    private final CBusOptions cBusOptions;
     private final Byte reservedField0;
 
     public CBusPointToMultiPointCommandNormalBuilderImpl(
-        ApplicationIdContainer application,
-        SALData salData,
-        CBusOptions cBusOptions,
-        Byte reservedField0) {
+        ApplicationIdContainer application, SALData salData, Byte reservedField0) {
       this.application = application;
       this.salData = salData;
-      this.cBusOptions = cBusOptions;
       this.reservedField0 = reservedField0;
     }
 
-    public CBusPointToMultiPointCommandNormal build(
-        byte peekedApplication, CBusOptions cBusOptions) {
+    public CBusPointToMultiPointCommandNormal build(byte peekedApplication) {
       CBusPointToMultiPointCommandNormal cBusPointToMultiPointCommandNormal =
-          new CBusPointToMultiPointCommandNormal(
-              peekedApplication, application, salData, cBusOptions);
+          new CBusPointToMultiPointCommandNormal(peekedApplication, application, salData);
       cBusPointToMultiPointCommandNormal.reservedField0 = reservedField0;
       return cBusPointToMultiPointCommandNormal;
     }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToMultiPointCommandStatus.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToMultiPointCommandStatus.java
index 7deff864b2b..3e5e6663d0b 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToMultiPointCommandStatus.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToMultiPointCommandStatus.java
@@ -42,18 +42,13 @@ public class CBusPointToMultiPointCommandStatus extends CBusPointToMultiPointCom
 
   // Properties.
   protected final StatusRequest statusRequest;
-
-  // Arguments.
-  protected final CBusOptions cBusOptions;
   // Reserved Fields
   private Byte reservedField0;
   private Byte reservedField1;
 
-  public CBusPointToMultiPointCommandStatus(
-      byte peekedApplication, StatusRequest statusRequest, CBusOptions cBusOptions) {
-    super(peekedApplication, cBusOptions);
+  public CBusPointToMultiPointCommandStatus(byte peekedApplication, StatusRequest statusRequest) {
+    super(peekedApplication);
     this.statusRequest = statusRequest;
-    this.cBusOptions = cBusOptions;
   }
 
   public StatusRequest getStatusRequest() {
@@ -125,31 +120,25 @@ public static CBusPointToMultiPointCommandBuilder staticParseCBusPointToMultiPoi
     readBuffer.closeContext("CBusPointToMultiPointCommandStatus");
     // Create the instance
     return new CBusPointToMultiPointCommandStatusBuilderImpl(
-        statusRequest, cBusOptions, reservedField0, reservedField1);
+        statusRequest, reservedField0, reservedField1);
   }
 
   public static class CBusPointToMultiPointCommandStatusBuilderImpl
       implements CBusPointToMultiPointCommand.CBusPointToMultiPointCommandBuilder {
     private final StatusRequest statusRequest;
-    private final CBusOptions cBusOptions;
     private final Byte reservedField0;
     private final Byte reservedField1;
 
     public CBusPointToMultiPointCommandStatusBuilderImpl(
-        StatusRequest statusRequest,
-        CBusOptions cBusOptions,
-        Byte reservedField0,
-        Byte reservedField1) {
+        StatusRequest statusRequest, Byte reservedField0, Byte reservedField1) {
       this.statusRequest = statusRequest;
-      this.cBusOptions = cBusOptions;
       this.reservedField0 = reservedField0;
       this.reservedField1 = reservedField1;
     }
 
-    public CBusPointToMultiPointCommandStatus build(
-        byte peekedApplication, CBusOptions cBusOptions) {
+    public CBusPointToMultiPointCommandStatus build(byte peekedApplication) {
       CBusPointToMultiPointCommandStatus cBusPointToMultiPointCommandStatus =
-          new CBusPointToMultiPointCommandStatus(peekedApplication, statusRequest, cBusOptions);
+          new CBusPointToMultiPointCommandStatus(peekedApplication, statusRequest);
       cBusPointToMultiPointCommandStatus.reservedField0 = reservedField0;
       cBusPointToMultiPointCommandStatus.reservedField1 = reservedField1;
       return cBusPointToMultiPointCommandStatus;
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointCommand.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointCommand.java
index d9ec44fd8a6..0bd65c04d82 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointCommand.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointCommand.java
@@ -43,15 +43,10 @@ public abstract class CBusPointToPointCommand implements Message {
   protected final int bridgeAddressCountPeek;
   protected final CALData calData;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
-  public CBusPointToPointCommand(
-      int bridgeAddressCountPeek, CALData calData, CBusOptions cBusOptions) {
+  public CBusPointToPointCommand(int bridgeAddressCountPeek, CALData calData) {
     super();
     this.bridgeAddressCountPeek = bridgeAddressCountPeek;
     this.calData = calData;
-    this.cBusOptions = cBusOptions;
   }
 
   public int getBridgeAddressCountPeek() {
@@ -149,13 +144,12 @@ public static CBusPointToPointCommand staticParse(ReadBuffer readBuffer, CBusOpt
     readBuffer.closeContext("CBusPointToPointCommand");
     // Create the instance
     CBusPointToPointCommand _cBusPointToPointCommand =
-        builder.build(bridgeAddressCountPeek, calData, cBusOptions);
+        builder.build(bridgeAddressCountPeek, calData);
     return _cBusPointToPointCommand;
   }
 
   public interface CBusPointToPointCommandBuilder {
-    CBusPointToPointCommand build(
-        int bridgeAddressCountPeek, CALData calData, CBusOptions cBusOptions);
+    CBusPointToPointCommand build(int bridgeAddressCountPeek, CALData calData);
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointCommandDirect.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointCommandDirect.java
index b6fd834214c..3c6a8651b33 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointCommandDirect.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointCommandDirect.java
@@ -41,20 +41,13 @@ public class CBusPointToPointCommandDirect extends CBusPointToPointCommand imple
 
   // Properties.
   protected final UnitAddress unitAddress;
-
-  // Arguments.
-  protected final CBusOptions cBusOptions;
   // Reserved Fields
   private Short reservedField0;
 
   public CBusPointToPointCommandDirect(
-      int bridgeAddressCountPeek,
-      CALData calData,
-      UnitAddress unitAddress,
-      CBusOptions cBusOptions) {
-    super(bridgeAddressCountPeek, calData, cBusOptions);
+      int bridgeAddressCountPeek, CALData calData, UnitAddress unitAddress) {
+    super(bridgeAddressCountPeek, calData);
     this.unitAddress = unitAddress;
-    this.cBusOptions = cBusOptions;
   }
 
   public UnitAddress getUnitAddress() {
@@ -115,27 +108,22 @@ public static CBusPointToPointCommandBuilder staticParseCBusPointToPointCommandB
 
     readBuffer.closeContext("CBusPointToPointCommandDirect");
     // Create the instance
-    return new CBusPointToPointCommandDirectBuilderImpl(unitAddress, cBusOptions, reservedField0);
+    return new CBusPointToPointCommandDirectBuilderImpl(unitAddress, reservedField0);
   }
 
   public static class CBusPointToPointCommandDirectBuilderImpl
       implements CBusPointToPointCommand.CBusPointToPointCommandBuilder {
     private final UnitAddress unitAddress;
-    private final CBusOptions cBusOptions;
     private final Short reservedField0;
 
-    public CBusPointToPointCommandDirectBuilderImpl(
-        UnitAddress unitAddress, CBusOptions cBusOptions, Short reservedField0) {
+    public CBusPointToPointCommandDirectBuilderImpl(UnitAddress unitAddress, Short reservedField0) {
       this.unitAddress = unitAddress;
-      this.cBusOptions = cBusOptions;
       this.reservedField0 = reservedField0;
     }
 
-    public CBusPointToPointCommandDirect build(
-        int bridgeAddressCountPeek, CALData calData, CBusOptions cBusOptions) {
+    public CBusPointToPointCommandDirect build(int bridgeAddressCountPeek, CALData calData) {
       CBusPointToPointCommandDirect cBusPointToPointCommandDirect =
-          new CBusPointToPointCommandDirect(
-              bridgeAddressCountPeek, calData, unitAddress, cBusOptions);
+          new CBusPointToPointCommandDirect(bridgeAddressCountPeek, calData, unitAddress);
       cBusPointToPointCommandDirect.reservedField0 = reservedField0;
       return cBusPointToPointCommandDirect;
     }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointCommandIndirect.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointCommandIndirect.java
index ff77a0766c0..0879df6bbf6 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointCommandIndirect.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointCommandIndirect.java
@@ -44,21 +44,16 @@ public class CBusPointToPointCommandIndirect extends CBusPointToPointCommand imp
   protected final NetworkRoute networkRoute;
   protected final UnitAddress unitAddress;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
   public CBusPointToPointCommandIndirect(
       int bridgeAddressCountPeek,
       CALData calData,
       BridgeAddress bridgeAddress,
       NetworkRoute networkRoute,
-      UnitAddress unitAddress,
-      CBusOptions cBusOptions) {
-    super(bridgeAddressCountPeek, calData, cBusOptions);
+      UnitAddress unitAddress) {
+    super(bridgeAddressCountPeek, calData);
     this.bridgeAddress = bridgeAddress;
     this.networkRoute = networkRoute;
     this.unitAddress = unitAddress;
-    this.cBusOptions = cBusOptions;
   }
 
   public BridgeAddress getBridgeAddress() {
@@ -135,8 +130,7 @@ public static CBusPointToPointCommandBuilder staticParseCBusPointToPointCommandB
 
     readBuffer.closeContext("CBusPointToPointCommandIndirect");
     // Create the instance
-    return new CBusPointToPointCommandIndirectBuilderImpl(
-        bridgeAddress, networkRoute, unitAddress, cBusOptions);
+    return new CBusPointToPointCommandIndirectBuilderImpl(bridgeAddress, networkRoute, unitAddress);
   }
 
   public static class CBusPointToPointCommandIndirectBuilderImpl
@@ -144,29 +138,18 @@ public static class CBusPointToPointCommandIndirectBuilderImpl
     private final BridgeAddress bridgeAddress;
     private final NetworkRoute networkRoute;
     private final UnitAddress unitAddress;
-    private final CBusOptions cBusOptions;
 
     public CBusPointToPointCommandIndirectBuilderImpl(
-        BridgeAddress bridgeAddress,
-        NetworkRoute networkRoute,
-        UnitAddress unitAddress,
-        CBusOptions cBusOptions) {
+        BridgeAddress bridgeAddress, NetworkRoute networkRoute, UnitAddress unitAddress) {
       this.bridgeAddress = bridgeAddress;
       this.networkRoute = networkRoute;
       this.unitAddress = unitAddress;
-      this.cBusOptions = cBusOptions;
     }
 
-    public CBusPointToPointCommandIndirect build(
-        int bridgeAddressCountPeek, CALData calData, CBusOptions cBusOptions) {
+    public CBusPointToPointCommandIndirect build(int bridgeAddressCountPeek, CALData calData) {
       CBusPointToPointCommandIndirect cBusPointToPointCommandIndirect =
           new CBusPointToPointCommandIndirect(
-              bridgeAddressCountPeek,
-              calData,
-              bridgeAddress,
-              networkRoute,
-              unitAddress,
-              cBusOptions);
+              bridgeAddressCountPeek, calData, bridgeAddress, networkRoute, unitAddress);
       return cBusPointToPointCommandIndirect;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointToMultiPointCommand.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointToMultiPointCommand.java
index caaf78a0525..5ab0b5c4aee 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointToMultiPointCommand.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointToMultiPointCommand.java
@@ -44,19 +44,12 @@ public abstract class CBusPointToPointToMultiPointCommand implements Message {
   protected final NetworkRoute networkRoute;
   protected final byte peekedApplication;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
   public CBusPointToPointToMultiPointCommand(
-      BridgeAddress bridgeAddress,
-      NetworkRoute networkRoute,
-      byte peekedApplication,
-      CBusOptions cBusOptions) {
+      BridgeAddress bridgeAddress, NetworkRoute networkRoute, byte peekedApplication) {
     super();
     this.bridgeAddress = bridgeAddress;
     this.networkRoute = networkRoute;
     this.peekedApplication = peekedApplication;
-    this.cBusOptions = cBusOptions;
   }
 
   public BridgeAddress getBridgeAddress() {
@@ -152,16 +145,13 @@ public static CBusPointToPointToMultiPointCommand staticParse(
     readBuffer.closeContext("CBusPointToPointToMultiPointCommand");
     // Create the instance
     CBusPointToPointToMultiPointCommand _cBusPointToPointToMultiPointCommand =
-        builder.build(bridgeAddress, networkRoute, peekedApplication, cBusOptions);
+        builder.build(bridgeAddress, networkRoute, peekedApplication);
     return _cBusPointToPointToMultiPointCommand;
   }
 
   public interface CBusPointToPointToMultiPointCommandBuilder {
     CBusPointToPointToMultiPointCommand build(
-        BridgeAddress bridgeAddress,
-        NetworkRoute networkRoute,
-        byte peekedApplication,
-        CBusOptions cBusOptions);
+        BridgeAddress bridgeAddress, NetworkRoute networkRoute, byte peekedApplication);
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointToMultiPointCommandNormal.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointToMultiPointCommandNormal.java
index d6582d1051f..76eb88c93e5 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointToMultiPointCommandNormal.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointToMultiPointCommandNormal.java
@@ -44,20 +44,15 @@ public class CBusPointToPointToMultiPointCommandNormal extends CBusPointToPointT
   protected final ApplicationIdContainer application;
   protected final SALData salData;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
   public CBusPointToPointToMultiPointCommandNormal(
       BridgeAddress bridgeAddress,
       NetworkRoute networkRoute,
       byte peekedApplication,
       ApplicationIdContainer application,
-      SALData salData,
-      CBusOptions cBusOptions) {
-    super(bridgeAddress, networkRoute, peekedApplication, cBusOptions);
+      SALData salData) {
+    super(bridgeAddress, networkRoute, peekedApplication);
     this.application = application;
     this.salData = salData;
-    this.cBusOptions = cBusOptions;
   }
 
   public ApplicationIdContainer getApplication() {
@@ -135,31 +130,25 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("CBusPointToPointToMultiPointCommandNormal");
     // Create the instance
-    return new CBusPointToPointToMultiPointCommandNormalBuilderImpl(
-        application, salData, cBusOptions);
+    return new CBusPointToPointToMultiPointCommandNormalBuilderImpl(application, salData);
   }
 
   public static class CBusPointToPointToMultiPointCommandNormalBuilderImpl
       implements CBusPointToPointToMultiPointCommand.CBusPointToPointToMultiPointCommandBuilder {
     private final ApplicationIdContainer application;
     private final SALData salData;
-    private final CBusOptions cBusOptions;
 
     public CBusPointToPointToMultiPointCommandNormalBuilderImpl(
-        ApplicationIdContainer application, SALData salData, CBusOptions cBusOptions) {
+        ApplicationIdContainer application, SALData salData) {
       this.application = application;
       this.salData = salData;
-      this.cBusOptions = cBusOptions;
     }
 
     public CBusPointToPointToMultiPointCommandNormal build(
-        BridgeAddress bridgeAddress,
-        NetworkRoute networkRoute,
-        byte peekedApplication,
-        CBusOptions cBusOptions) {
+        BridgeAddress bridgeAddress, NetworkRoute networkRoute, byte peekedApplication) {
       CBusPointToPointToMultiPointCommandNormal cBusPointToPointToMultiPointCommandNormal =
           new CBusPointToPointToMultiPointCommandNormal(
-              bridgeAddress, networkRoute, peekedApplication, application, salData, cBusOptions);
+              bridgeAddress, networkRoute, peekedApplication, application, salData);
       return cBusPointToPointToMultiPointCommandNormal;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointToMultiPointCommandStatus.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointToMultiPointCommandStatus.java
index db8e4355462..3f45284dff3 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointToMultiPointCommandStatus.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CBusPointToPointToMultiPointCommandStatus.java
@@ -42,9 +42,6 @@ public class CBusPointToPointToMultiPointCommandStatus extends CBusPointToPointT
 
   // Properties.
   protected final StatusRequest statusRequest;
-
-  // Arguments.
-  protected final CBusOptions cBusOptions;
   // Reserved Fields
   private Byte reservedField0;
 
@@ -52,11 +49,9 @@ public CBusPointToPointToMultiPointCommandStatus(
       BridgeAddress bridgeAddress,
       NetworkRoute networkRoute,
       byte peekedApplication,
-      StatusRequest statusRequest,
-      CBusOptions cBusOptions) {
-    super(bridgeAddress, networkRoute, peekedApplication, cBusOptions);
+      StatusRequest statusRequest) {
+    super(bridgeAddress, networkRoute, peekedApplication);
     this.statusRequest = statusRequest;
-    this.cBusOptions = cBusOptions;
   }
 
   public StatusRequest getStatusRequest() {
@@ -117,31 +112,25 @@ public int getLengthInBits() {
 
     readBuffer.closeContext("CBusPointToPointToMultiPointCommandStatus");
     // Create the instance
-    return new CBusPointToPointToMultiPointCommandStatusBuilderImpl(
-        statusRequest, cBusOptions, reservedField0);
+    return new CBusPointToPointToMultiPointCommandStatusBuilderImpl(statusRequest, reservedField0);
   }
 
   public static class CBusPointToPointToMultiPointCommandStatusBuilderImpl
       implements CBusPointToPointToMultiPointCommand.CBusPointToPointToMultiPointCommandBuilder {
     private final StatusRequest statusRequest;
-    private final CBusOptions cBusOptions;
     private final Byte reservedField0;
 
     public CBusPointToPointToMultiPointCommandStatusBuilderImpl(
-        StatusRequest statusRequest, CBusOptions cBusOptions, Byte reservedField0) {
+        StatusRequest statusRequest, Byte reservedField0) {
       this.statusRequest = statusRequest;
-      this.cBusOptions = cBusOptions;
       this.reservedField0 = reservedField0;
     }
 
     public CBusPointToPointToMultiPointCommandStatus build(
-        BridgeAddress bridgeAddress,
-        NetworkRoute networkRoute,
-        byte peekedApplication,
-        CBusOptions cBusOptions) {
+        BridgeAddress bridgeAddress, NetworkRoute networkRoute, byte peekedApplication) {
       CBusPointToPointToMultiPointCommandStatus cBusPointToPointToMultiPointCommandStatus =
           new CBusPointToPointToMultiPointCommandStatus(
-              bridgeAddress, networkRoute, peekedApplication, statusRequest, cBusOptions);
+              bridgeAddress, networkRoute, peekedApplication, statusRequest);
       cBusPointToPointToMultiPointCommandStatus.reservedField0 = reservedField0;
       return cBusPointToPointToMultiPointCommandStatus;
     }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Constants.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Constants.java
new file mode 100644
index 00000000000..9a52c1706c6
--- /dev/null
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Constants.java
@@ -0,0 +1,42 @@
+/*
+ * 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.cbus.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 Constants {
+
+  // Constant values.
+  public static final Integer CBUSTCPDEFAULTPORT = 10001;
+}
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CustomManufacturer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CustomManufacturer.java
index 2ee6c4e00f8..946cf07ed31 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CustomManufacturer.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CustomManufacturer.java
@@ -38,15 +38,17 @@
 public class CustomManufacturer implements Message {
 
   // Properties.
+  protected final short numBytes;
   protected final String customString;
 
-  // Arguments.
-  protected final Short numBytes;
-
-  public CustomManufacturer(String customString, Short numBytes) {
+  public CustomManufacturer(short numBytes, String customString) {
     super();
-    this.customString = customString;
     this.numBytes = numBytes;
+    this.customString = customString;
+  }
+
+  public short getNumBytes() {
+    return numBytes;
   }
 
   public String getCustomString() {
@@ -92,7 +94,7 @@ public static CustomManufacturer staticParse(ReadBuffer readBuffer, Short numByt
     readBuffer.closeContext("CustomManufacturer");
     // Create the instance
     CustomManufacturer _customManufacturer;
-    _customManufacturer = new CustomManufacturer(customString, numBytes);
+    _customManufacturer = new CustomManufacturer(numBytes, customString);
     return _customManufacturer;
   }
 
@@ -105,12 +107,14 @@ public boolean equals(Object o) {
       return false;
     }
     CustomManufacturer that = (CustomManufacturer) o;
-    return (getCustomString() == that.getCustomString()) && true;
+    return (getNumBytes() == that.getNumBytes())
+        && (getCustomString() == that.getCustomString())
+        && true;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(getCustomString());
+    return Objects.hash(getNumBytes(), getCustomString());
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CustomTypes.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CustomTypes.java
index b95f529a0e8..1f1c3bd46e5 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CustomTypes.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CustomTypes.java
@@ -38,15 +38,17 @@
 public class CustomTypes implements Message {
 
   // Properties.
+  protected final short numBytes;
   protected final String customString;
 
-  // Arguments.
-  protected final Short numBytes;
-
-  public CustomTypes(String customString, Short numBytes) {
+  public CustomTypes(short numBytes, String customString) {
     super();
-    this.customString = customString;
     this.numBytes = numBytes;
+    this.customString = customString;
+  }
+
+  public short getNumBytes() {
+    return numBytes;
   }
 
   public String getCustomString() {
@@ -92,7 +94,7 @@ public static CustomTypes staticParse(ReadBuffer readBuffer, Short numBytes)
     readBuffer.closeContext("CustomTypes");
     // Create the instance
     CustomTypes _customTypes;
-    _customTypes = new CustomTypes(customString, numBytes);
+    _customTypes = new CustomTypes(numBytes, customString);
     return _customTypes;
   }
 
@@ -105,12 +107,14 @@ public boolean equals(Object o) {
       return false;
     }
     CustomTypes that = (CustomTypes) o;
-    return (getCustomString() == that.getCustomString()) && true;
+    return (getNumBytes() == that.getNumBytes())
+        && (getCustomString() == that.getCustomString())
+        && true;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(getCustomString());
+    return Objects.hash(getNumBytes(), getCustomString());
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/EncodedReply.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/EncodedReply.java
index d0aa1aecde3..8c1d7883a44 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/EncodedReply.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/EncodedReply.java
@@ -40,17 +40,17 @@ public abstract class EncodedReply implements Message {
   // Abstract accessors for discriminator values.
 
   // Properties.
-  protected final byte peekedByte;
-
-  // Arguments.
-  protected final CBusOptions cBusOptions;
   protected final RequestContext requestContext;
+  protected final byte peekedByte;
 
-  public EncodedReply(byte peekedByte, CBusOptions cBusOptions, RequestContext requestContext) {
+  public EncodedReply(RequestContext requestContext, byte peekedByte) {
     super();
-    this.peekedByte = peekedByte;
-    this.cBusOptions = cBusOptions;
     this.requestContext = requestContext;
+    this.peekedByte = peekedByte;
+  }
+
+  public RequestContext getRequestContext() {
+    return requestContext;
   }
 
   public byte getPeekedByte() {
@@ -137,12 +137,12 @@ public static EncodedReply staticParse(
 
     readBuffer.closeContext("EncodedReply");
     // Create the instance
-    EncodedReply _encodedReply = builder.build(peekedByte, cBusOptions, requestContext);
+    EncodedReply _encodedReply = builder.build(requestContext, peekedByte);
     return _encodedReply;
   }
 
   public interface EncodedReplyBuilder {
-    EncodedReply build(byte peekedByte, CBusOptions cBusOptions, RequestContext requestContext);
+    EncodedReply build(RequestContext requestContext, byte peekedByte);
   }
 
   @Override
@@ -154,12 +154,14 @@ public boolean equals(Object o) {
       return false;
     }
     EncodedReply that = (EncodedReply) o;
-    return (getPeekedByte() == that.getPeekedByte()) && true;
+    return (getRequestContext() == that.getRequestContext())
+        && (getPeekedByte() == that.getPeekedByte())
+        && true;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(getPeekedByte());
+    return Objects.hash(getRequestContext(), getPeekedByte());
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/EncodedReplyCALReply.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/EncodedReplyCALReply.java
index 134ad4b4df0..9c94c9f4d0e 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/EncodedReplyCALReply.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/EncodedReplyCALReply.java
@@ -42,16 +42,9 @@ public class EncodedReplyCALReply extends EncodedReply implements Message {
   // Properties.
   protected final CALReply calReply;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-  protected final RequestContext requestContext;
-
-  public EncodedReplyCALReply(
-      byte peekedByte, CALReply calReply, CBusOptions cBusOptions, RequestContext requestContext) {
-    super(peekedByte, cBusOptions, requestContext);
+  public EncodedReplyCALReply(RequestContext requestContext, byte peekedByte, CALReply calReply) {
+    super(requestContext, peekedByte);
     this.calReply = calReply;
-    this.cBusOptions = cBusOptions;
-    this.requestContext = requestContext;
   }
 
   public CALReply getCalReply() {
@@ -105,25 +98,19 @@ public static EncodedReplyBuilder staticParseEncodedReplyBuilder(
 
     readBuffer.closeContext("EncodedReplyCALReply");
     // Create the instance
-    return new EncodedReplyCALReplyBuilderImpl(calReply, cBusOptions, requestContext);
+    return new EncodedReplyCALReplyBuilderImpl(calReply);
   }
 
   public static class EncodedReplyCALReplyBuilderImpl implements EncodedReply.EncodedReplyBuilder {
     private final CALReply calReply;
-    private final CBusOptions cBusOptions;
-    private final RequestContext requestContext;
 
-    public EncodedReplyCALReplyBuilderImpl(
-        CALReply calReply, CBusOptions cBusOptions, RequestContext requestContext) {
+    public EncodedReplyCALReplyBuilderImpl(CALReply calReply) {
       this.calReply = calReply;
-      this.cBusOptions = cBusOptions;
-      this.requestContext = requestContext;
     }
 
-    public EncodedReplyCALReply build(
-        byte peekedByte, CBusOptions cBusOptions, RequestContext requestContext) {
+    public EncodedReplyCALReply build(RequestContext requestContext, byte peekedByte) {
       EncodedReplyCALReply encodedReplyCALReply =
-          new EncodedReplyCALReply(peekedByte, calReply, cBusOptions, requestContext);
+          new EncodedReplyCALReply(requestContext, peekedByte, calReply);
       return encodedReplyCALReply;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACAuxiliaryLevel.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACAuxiliaryLevel.java
index 4032650d62f..a277b2c858a 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACAuxiliaryLevel.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACAuxiliaryLevel.java
@@ -40,7 +40,6 @@ public class HVACAuxiliaryLevel implements Message {
   // Properties.
   protected final boolean fanMode;
   protected final byte mode;
-
   // Reserved Fields
   private Boolean reservedField0;
 
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACHumidityModeAndFlags.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACHumidityModeAndFlags.java
index ce12b2e4a81..1f501a0fbdb 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACHumidityModeAndFlags.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACHumidityModeAndFlags.java
@@ -43,7 +43,6 @@ public class HVACHumidityModeAndFlags implements Message {
   protected final boolean setback;
   protected final boolean level;
   protected final HVACHumidityModeAndFlagsMode mode;
-
   // Reserved Fields
   private Boolean reservedField0;
 
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACHumidityStatusFlags.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACHumidityStatusFlags.java
index 2a75e4e8d99..5dc52ceaffa 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACHumidityStatusFlags.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACHumidityStatusFlags.java
@@ -45,7 +45,6 @@ public class HVACHumidityStatusFlags implements Message {
   protected final boolean fanActive;
   protected final boolean dehumidifyingPlant;
   protected final boolean humidifyingPlant;
-
   // Reserved Fields
   private Boolean reservedField0;
 
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACModeAndFlags.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACModeAndFlags.java
index d3b5784b572..8107b2ecc11 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACModeAndFlags.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACModeAndFlags.java
@@ -43,7 +43,6 @@ public class HVACModeAndFlags implements Message {
   protected final boolean setback;
   protected final boolean level;
   protected final HVACModeAndFlagsMode mode;
-
   // Reserved Fields
   private Boolean reservedField0;
 
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACStatusFlags.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACStatusFlags.java
index 69e34bef9d6..18afcdc0658 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACStatusFlags.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACStatusFlags.java
@@ -45,7 +45,6 @@ public class HVACStatusFlags implements Message {
   protected final boolean fanActive;
   protected final boolean heatingPlant;
   protected final boolean coolingPlant;
-
   // Reserved Fields
   private Boolean reservedField0;
 
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommand.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommand.java
index a6f88fd19c6..3f974f8a874 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommand.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommand.java
@@ -40,12 +40,8 @@ public abstract class IdentifyReplyCommand implements Message {
   // Abstract accessors for discriminator values.
   public abstract Attribute getAttribute();
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommand(Byte numBytes) {
+  public IdentifyReplyCommand() {
     super();
-    this.numBytes = numBytes;
   }
 
   protected abstract void serializeIdentifyReplyCommandChild(WriteBuffer writeBuffer)
@@ -170,13 +166,12 @@ public static IdentifyReplyCommand staticParse(
 
     readBuffer.closeContext("IdentifyReplyCommand");
     // Create the instance
-    IdentifyReplyCommand _identifyReplyCommand = builder.build(numBytes);
-
+    IdentifyReplyCommand _identifyReplyCommand = builder.build();
     return _identifyReplyCommand;
   }
 
   public interface IdentifyReplyCommandBuilder {
-    IdentifyReplyCommand build(Byte numBytes);
+    IdentifyReplyCommand build();
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandCurrentSenseLevels.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandCurrentSenseLevels.java
index 2258aa1fc40..c0dadac1b24 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandCurrentSenseLevels.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandCurrentSenseLevels.java
@@ -46,13 +46,9 @@ public Attribute getAttribute() {
   // Properties.
   protected final byte[] currentSenseLevels;
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommandCurrentSenseLevels(byte[] currentSenseLevels, Byte numBytes) {
-    super(numBytes);
+  public IdentifyReplyCommandCurrentSenseLevels(byte[] currentSenseLevels) {
+    super();
     this.currentSenseLevels = currentSenseLevels;
-    this.numBytes = numBytes;
   }
 
   public byte[] getCurrentSenseLevels() {
@@ -102,24 +98,20 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
 
     readBuffer.closeContext("IdentifyReplyCommandCurrentSenseLevels");
     // Create the instance
-    return new IdentifyReplyCommandCurrentSenseLevelsBuilderImpl(currentSenseLevels, numBytes);
+    return new IdentifyReplyCommandCurrentSenseLevelsBuilderImpl(currentSenseLevels);
   }
 
   public static class IdentifyReplyCommandCurrentSenseLevelsBuilderImpl
       implements IdentifyReplyCommand.IdentifyReplyCommandBuilder {
     private final byte[] currentSenseLevels;
-    private final Byte numBytes;
 
-    public IdentifyReplyCommandCurrentSenseLevelsBuilderImpl(
-        byte[] currentSenseLevels, Byte numBytes) {
+    public IdentifyReplyCommandCurrentSenseLevelsBuilderImpl(byte[] currentSenseLevels) {
       this.currentSenseLevels = currentSenseLevels;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandCurrentSenseLevels build(Byte numBytes) {
-
+    public IdentifyReplyCommandCurrentSenseLevels build() {
       IdentifyReplyCommandCurrentSenseLevels identifyReplyCommandCurrentSenseLevels =
-          new IdentifyReplyCommandCurrentSenseLevels(currentSenseLevels, numBytes);
+          new IdentifyReplyCommandCurrentSenseLevels(currentSenseLevels);
       return identifyReplyCommandCurrentSenseLevels;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDSIStatus.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDSIStatus.java
index 64729c39557..a22754e453a 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDSIStatus.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDSIStatus.java
@@ -54,9 +54,6 @@ public Attribute getAttribute() {
   protected final UnitStatus unitStatus;
   protected final byte dimmingUCRevisionNumber;
 
-  // Arguments.
-  protected final Byte numBytes;
-
   public IdentifyReplyCommandDSIStatus(
       ChannelStatus channelStatus1,
       ChannelStatus channelStatus2,
@@ -67,9 +64,8 @@ public IdentifyReplyCommandDSIStatus(
       ChannelStatus channelStatus7,
       ChannelStatus channelStatus8,
       UnitStatus unitStatus,
-      byte dimmingUCRevisionNumber,
-      Byte numBytes) {
-    super(numBytes);
+      byte dimmingUCRevisionNumber) {
+    super();
     this.channelStatus1 = channelStatus1;
     this.channelStatus2 = channelStatus2;
     this.channelStatus3 = channelStatus3;
@@ -80,7 +76,6 @@ public IdentifyReplyCommandDSIStatus(
     this.channelStatus8 = channelStatus8;
     this.unitStatus = unitStatus;
     this.dimmingUCRevisionNumber = dimmingUCRevisionNumber;
-    this.numBytes = numBytes;
   }
 
   public ChannelStatus getChannelStatus1() {
@@ -326,8 +321,7 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
         channelStatus7,
         channelStatus8,
         unitStatus,
-        dimmingUCRevisionNumber,
-        numBytes);
+        dimmingUCRevisionNumber);
   }
 
   public static class IdentifyReplyCommandDSIStatusBuilderImpl
@@ -342,7 +336,6 @@ public static class IdentifyReplyCommandDSIStatusBuilderImpl
     private final ChannelStatus channelStatus8;
     private final UnitStatus unitStatus;
     private final byte dimmingUCRevisionNumber;
-    private final Byte numBytes;
 
     public IdentifyReplyCommandDSIStatusBuilderImpl(
         ChannelStatus channelStatus1,
@@ -354,8 +347,7 @@ public IdentifyReplyCommandDSIStatusBuilderImpl(
         ChannelStatus channelStatus7,
         ChannelStatus channelStatus8,
         UnitStatus unitStatus,
-        byte dimmingUCRevisionNumber,
-        Byte numBytes) {
+        byte dimmingUCRevisionNumber) {
       this.channelStatus1 = channelStatus1;
       this.channelStatus2 = channelStatus2;
       this.channelStatus3 = channelStatus3;
@@ -366,11 +358,9 @@ public IdentifyReplyCommandDSIStatusBuilderImpl(
       this.channelStatus8 = channelStatus8;
       this.unitStatus = unitStatus;
       this.dimmingUCRevisionNumber = dimmingUCRevisionNumber;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandDSIStatus build(Byte numBytes) {
-
+    public IdentifyReplyCommandDSIStatus build() {
       IdentifyReplyCommandDSIStatus identifyReplyCommandDSIStatus =
           new IdentifyReplyCommandDSIStatus(
               channelStatus1,
@@ -382,8 +372,7 @@ public IdentifyReplyCommandDSIStatus build(Byte numBytes) {
               channelStatus7,
               channelStatus8,
               unitStatus,
-              dimmingUCRevisionNumber,
-              numBytes);
+              dimmingUCRevisionNumber);
       return identifyReplyCommandDSIStatus;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDelays.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDelays.java
index cca305ffcde..f19774c7ab7 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDelays.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDelays.java
@@ -46,14 +46,10 @@ public Attribute getAttribute() {
   protected final byte[] terminalLevels;
   protected final byte reStrikeDelay;
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommandDelays(byte[] terminalLevels, byte reStrikeDelay, Byte numBytes) {
-    super(numBytes);
+  public IdentifyReplyCommandDelays(byte[] terminalLevels, byte reStrikeDelay) {
+    super();
     this.terminalLevels = terminalLevels;
     this.reStrikeDelay = reStrikeDelay;
-    this.numBytes = numBytes;
   }
 
   public byte[] getTerminalLevels() {
@@ -115,26 +111,22 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
 
     readBuffer.closeContext("IdentifyReplyCommandDelays");
     // Create the instance
-    return new IdentifyReplyCommandDelaysBuilderImpl(terminalLevels, reStrikeDelay, numBytes);
+    return new IdentifyReplyCommandDelaysBuilderImpl(terminalLevels, reStrikeDelay);
   }
 
   public static class IdentifyReplyCommandDelaysBuilderImpl
       implements IdentifyReplyCommand.IdentifyReplyCommandBuilder {
     private final byte[] terminalLevels;
     private final byte reStrikeDelay;
-    private final Byte numBytes;
 
-    public IdentifyReplyCommandDelaysBuilderImpl(
-        byte[] terminalLevels, byte reStrikeDelay, Byte numBytes) {
+    public IdentifyReplyCommandDelaysBuilderImpl(byte[] terminalLevels, byte reStrikeDelay) {
       this.terminalLevels = terminalLevels;
       this.reStrikeDelay = reStrikeDelay;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandDelays build(Byte numBytes) {
-
+    public IdentifyReplyCommandDelays build() {
       IdentifyReplyCommandDelays identifyReplyCommandDelays =
-          new IdentifyReplyCommandDelays(terminalLevels, reStrikeDelay, numBytes);
+          new IdentifyReplyCommandDelays(terminalLevels, reStrikeDelay);
       return identifyReplyCommandDelays;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandExtendedDiagnosticSummary.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandExtendedDiagnosticSummary.java
index 25c473f3414..8d19a4b1979 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandExtendedDiagnosticSummary.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandExtendedDiagnosticSummary.java
@@ -63,9 +63,6 @@ public Attribute getAttribute() {
   protected final boolean commsTxError;
   protected final boolean internalStackOverflow;
   protected final boolean microPowerReset;
-
-  // Arguments.
-  protected final Byte numBytes;
   // Reserved Fields
   private Byte reservedField0;
   private Byte reservedField1;
@@ -90,9 +87,8 @@ public IdentifyReplyCommandExtendedDiagnosticSummary(
       boolean microReset,
       boolean commsTxError,
       boolean internalStackOverflow,
-      boolean microPowerReset,
-      Byte numBytes) {
-    super(numBytes);
+      boolean microPowerReset) {
+    super();
     this.lowApplication = lowApplication;
     this.highApplication = highApplication;
     this.area = area;
@@ -112,7 +108,6 @@ public IdentifyReplyCommandExtendedDiagnosticSummary(
     this.commsTxError = commsTxError;
     this.internalStackOverflow = internalStackOverflow;
     this.microPowerReset = microPowerReset;
-    this.numBytes = numBytes;
   }
 
   public ApplicationIdContainer getLowApplication() {
@@ -464,7 +459,6 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
         commsTxError,
         internalStackOverflow,
         microPowerReset,
-        numBytes,
         reservedField0,
         reservedField1,
         reservedField2);
@@ -491,7 +485,6 @@ public static class IdentifyReplyCommandExtendedDiagnosticSummaryBuilderImpl
     private final boolean commsTxError;
     private final boolean internalStackOverflow;
     private final boolean microPowerReset;
-    private final Byte numBytes;
     private final Byte reservedField0;
     private final Byte reservedField1;
     private final Byte reservedField2;
@@ -516,7 +509,6 @@ public IdentifyReplyCommandExtendedDiagnosticSummaryBuilderImpl(
         boolean commsTxError,
         boolean internalStackOverflow,
         boolean microPowerReset,
-        Byte numBytes,
         Byte reservedField0,
         Byte reservedField1,
         Byte reservedField2) {
@@ -539,14 +531,12 @@ public IdentifyReplyCommandExtendedDiagnosticSummaryBuilderImpl(
       this.commsTxError = commsTxError;
       this.internalStackOverflow = internalStackOverflow;
       this.microPowerReset = microPowerReset;
-      this.numBytes = numBytes;
       this.reservedField0 = reservedField0;
       this.reservedField1 = reservedField1;
       this.reservedField2 = reservedField2;
     }
 
-    public IdentifyReplyCommandExtendedDiagnosticSummary build(Byte numBytes) {
-
+    public IdentifyReplyCommandExtendedDiagnosticSummary build() {
       IdentifyReplyCommandExtendedDiagnosticSummary identifyReplyCommandExtendedDiagnosticSummary =
           new IdentifyReplyCommandExtendedDiagnosticSummary(
               lowApplication,
@@ -567,8 +557,7 @@ public IdentifyReplyCommandExtendedDiagnosticSummary build(Byte numBytes) {
               microReset,
               commsTxError,
               internalStackOverflow,
-              microPowerReset,
-              numBytes);
+              microPowerReset);
       identifyReplyCommandExtendedDiagnosticSummary.reservedField0 = reservedField0;
       identifyReplyCommandExtendedDiagnosticSummary.reservedField1 = reservedField1;
       identifyReplyCommandExtendedDiagnosticSummary.reservedField2 = reservedField2;
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandFirmwareVersion.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandFirmwareVersion.java
index f0301294820..f79e3038446 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandFirmwareVersion.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandFirmwareVersion.java
@@ -45,13 +45,9 @@ public Attribute getAttribute() {
   // Properties.
   protected final String firmwareVersion;
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommandFirmwareVersion(String firmwareVersion, Byte numBytes) {
-    super(numBytes);
+  public IdentifyReplyCommandFirmwareVersion(String firmwareVersion) {
+    super();
     this.firmwareVersion = firmwareVersion;
-    this.numBytes = numBytes;
   }
 
   public String getFirmwareVersion() {
@@ -98,23 +94,20 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
 
     readBuffer.closeContext("IdentifyReplyCommandFirmwareVersion");
     // Create the instance
-    return new IdentifyReplyCommandFirmwareVersionBuilderImpl(firmwareVersion, numBytes);
+    return new IdentifyReplyCommandFirmwareVersionBuilderImpl(firmwareVersion);
   }
 
   public static class IdentifyReplyCommandFirmwareVersionBuilderImpl
       implements IdentifyReplyCommand.IdentifyReplyCommandBuilder {
     private final String firmwareVersion;
-    private final Byte numBytes;
 
-    public IdentifyReplyCommandFirmwareVersionBuilderImpl(String firmwareVersion, Byte numBytes) {
+    public IdentifyReplyCommandFirmwareVersionBuilderImpl(String firmwareVersion) {
       this.firmwareVersion = firmwareVersion;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandFirmwareVersion build(Byte numBytes) {
-
+    public IdentifyReplyCommandFirmwareVersion build() {
       IdentifyReplyCommandFirmwareVersion identifyReplyCommandFirmwareVersion =
-          new IdentifyReplyCommandFirmwareVersion(firmwareVersion, numBytes);
+          new IdentifyReplyCommandFirmwareVersion(firmwareVersion);
       return identifyReplyCommandFirmwareVersion;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVPhysicalAddresses.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVPhysicalAddresses.java
index 72e5ab869a3..165e4c2739a 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVPhysicalAddresses.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVPhysicalAddresses.java
@@ -46,13 +46,9 @@ public Attribute getAttribute() {
   // Properties.
   protected final byte[] values;
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommandGAVPhysicalAddresses(byte[] values, Byte numBytes) {
-    super(numBytes);
+  public IdentifyReplyCommandGAVPhysicalAddresses(byte[] values) {
+    super();
     this.values = values;
-    this.numBytes = numBytes;
   }
 
   public byte[] getValues() {
@@ -101,23 +97,20 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
 
     readBuffer.closeContext("IdentifyReplyCommandGAVPhysicalAddresses");
     // Create the instance
-    return new IdentifyReplyCommandGAVPhysicalAddressesBuilderImpl(values, numBytes);
+    return new IdentifyReplyCommandGAVPhysicalAddressesBuilderImpl(values);
   }
 
   public static class IdentifyReplyCommandGAVPhysicalAddressesBuilderImpl
       implements IdentifyReplyCommand.IdentifyReplyCommandBuilder {
     private final byte[] values;
-    private final Byte numBytes;
 
-    public IdentifyReplyCommandGAVPhysicalAddressesBuilderImpl(byte[] values, Byte numBytes) {
+    public IdentifyReplyCommandGAVPhysicalAddressesBuilderImpl(byte[] values) {
       this.values = values;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandGAVPhysicalAddresses build(Byte numBytes) {
-
+    public IdentifyReplyCommandGAVPhysicalAddresses build() {
       IdentifyReplyCommandGAVPhysicalAddresses identifyReplyCommandGAVPhysicalAddresses =
-          new IdentifyReplyCommandGAVPhysicalAddresses(values, numBytes);
+          new IdentifyReplyCommandGAVPhysicalAddresses(values);
       return identifyReplyCommandGAVPhysicalAddresses;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesCurrent.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesCurrent.java
index eadafa0385d..a34464c2328 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesCurrent.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesCurrent.java
@@ -45,13 +45,9 @@ public Attribute getAttribute() {
   // Properties.
   protected final byte[] values;
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommandGAVValuesCurrent(byte[] values, Byte numBytes) {
-    super(numBytes);
+  public IdentifyReplyCommandGAVValuesCurrent(byte[] values) {
+    super();
     this.values = values;
-    this.numBytes = numBytes;
   }
 
   public byte[] getValues() {
@@ -100,23 +96,20 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
 
     readBuffer.closeContext("IdentifyReplyCommandGAVValuesCurrent");
     // Create the instance
-    return new IdentifyReplyCommandGAVValuesCurrentBuilderImpl(values, numBytes);
+    return new IdentifyReplyCommandGAVValuesCurrentBuilderImpl(values);
   }
 
   public static class IdentifyReplyCommandGAVValuesCurrentBuilderImpl
       implements IdentifyReplyCommand.IdentifyReplyCommandBuilder {
     private final byte[] values;
-    private final Byte numBytes;
 
-    public IdentifyReplyCommandGAVValuesCurrentBuilderImpl(byte[] values, Byte numBytes) {
+    public IdentifyReplyCommandGAVValuesCurrentBuilderImpl(byte[] values) {
       this.values = values;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandGAVValuesCurrent build(Byte numBytes) {
-
+    public IdentifyReplyCommandGAVValuesCurrent build() {
       IdentifyReplyCommandGAVValuesCurrent identifyReplyCommandGAVValuesCurrent =
-          new IdentifyReplyCommandGAVValuesCurrent(values, numBytes);
+          new IdentifyReplyCommandGAVValuesCurrent(values);
       return identifyReplyCommandGAVValuesCurrent;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesStored.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesStored.java
index 0fe3e201417..a02c9b47c62 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesStored.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesStored.java
@@ -45,13 +45,9 @@ public Attribute getAttribute() {
   // Properties.
   protected final byte[] values;
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommandGAVValuesStored(byte[] values, Byte numBytes) {
-    super(numBytes);
+  public IdentifyReplyCommandGAVValuesStored(byte[] values) {
+    super();
     this.values = values;
-    this.numBytes = numBytes;
   }
 
   public byte[] getValues() {
@@ -100,23 +96,20 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
 
     readBuffer.closeContext("IdentifyReplyCommandGAVValuesStored");
     // Create the instance
-    return new IdentifyReplyCommandGAVValuesStoredBuilderImpl(values, numBytes);
+    return new IdentifyReplyCommandGAVValuesStoredBuilderImpl(values);
   }
 
   public static class IdentifyReplyCommandGAVValuesStoredBuilderImpl
       implements IdentifyReplyCommand.IdentifyReplyCommandBuilder {
     private final byte[] values;
-    private final Byte numBytes;
 
-    public IdentifyReplyCommandGAVValuesStoredBuilderImpl(byte[] values, Byte numBytes) {
+    public IdentifyReplyCommandGAVValuesStoredBuilderImpl(byte[] values) {
       this.values = values;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandGAVValuesStored build(Byte numBytes) {
-
+    public IdentifyReplyCommandGAVValuesStored build() {
       IdentifyReplyCommandGAVValuesStored identifyReplyCommandGAVValuesStored =
-          new IdentifyReplyCommandGAVValuesStored(values, numBytes);
+          new IdentifyReplyCommandGAVValuesStored(values);
       return identifyReplyCommandGAVValuesStored;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandLogicalAssignment.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandLogicalAssignment.java
index ad630a2b31c..0fed2ce6264 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandLogicalAssignment.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandLogicalAssignment.java
@@ -45,14 +45,9 @@ public Attribute getAttribute() {
   // Properties.
   protected final List<LogicAssignment> logicAssigment;
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommandLogicalAssignment(
-      List<LogicAssignment> logicAssigment, Byte numBytes) {
-    super(numBytes);
+  public IdentifyReplyCommandLogicalAssignment(List<LogicAssignment> logicAssigment) {
+    super();
     this.logicAssigment = logicAssigment;
-    this.numBytes = numBytes;
   }
 
   public List<LogicAssignment> getLogicAssigment() {
@@ -109,24 +104,20 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
 
     readBuffer.closeContext("IdentifyReplyCommandLogicalAssignment");
     // Create the instance
-    return new IdentifyReplyCommandLogicalAssignmentBuilderImpl(logicAssigment, numBytes);
+    return new IdentifyReplyCommandLogicalAssignmentBuilderImpl(logicAssigment);
   }
 
   public static class IdentifyReplyCommandLogicalAssignmentBuilderImpl
       implements IdentifyReplyCommand.IdentifyReplyCommandBuilder {
     private final List<LogicAssignment> logicAssigment;
-    private final Byte numBytes;
 
-    public IdentifyReplyCommandLogicalAssignmentBuilderImpl(
-        List<LogicAssignment> logicAssigment, Byte numBytes) {
+    public IdentifyReplyCommandLogicalAssignmentBuilderImpl(List<LogicAssignment> logicAssigment) {
       this.logicAssigment = logicAssigment;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandLogicalAssignment build(Byte numBytes) {
-
+    public IdentifyReplyCommandLogicalAssignment build() {
       IdentifyReplyCommandLogicalAssignment identifyReplyCommandLogicalAssignment =
-          new IdentifyReplyCommandLogicalAssignment(logicAssigment, numBytes);
+          new IdentifyReplyCommandLogicalAssignment(logicAssigment);
       return identifyReplyCommandLogicalAssignment;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandManufacturer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandManufacturer.java
index e3f69e0c61e..df7fad716e8 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandManufacturer.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandManufacturer.java
@@ -45,13 +45,9 @@ public Attribute getAttribute() {
   // Properties.
   protected final String manufacturerName;
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommandManufacturer(String manufacturerName, Byte numBytes) {
-    super(numBytes);
+  public IdentifyReplyCommandManufacturer(String manufacturerName) {
+    super();
     this.manufacturerName = manufacturerName;
-    this.numBytes = numBytes;
   }
 
   public String getManufacturerName() {
@@ -98,23 +94,20 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
 
     readBuffer.closeContext("IdentifyReplyCommandManufacturer");
     // Create the instance
-    return new IdentifyReplyCommandManufacturerBuilderImpl(manufacturerName, numBytes);
+    return new IdentifyReplyCommandManufacturerBuilderImpl(manufacturerName);
   }
 
   public static class IdentifyReplyCommandManufacturerBuilderImpl
       implements IdentifyReplyCommand.IdentifyReplyCommandBuilder {
     private final String manufacturerName;
-    private final Byte numBytes;
 
-    public IdentifyReplyCommandManufacturerBuilderImpl(String manufacturerName, Byte numBytes) {
+    public IdentifyReplyCommandManufacturerBuilderImpl(String manufacturerName) {
       this.manufacturerName = manufacturerName;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandManufacturer build(Byte numBytes) {
-
+    public IdentifyReplyCommandManufacturer build() {
       IdentifyReplyCommandManufacturer identifyReplyCommandManufacturer =
-          new IdentifyReplyCommandManufacturer(manufacturerName, numBytes);
+          new IdentifyReplyCommandManufacturer(manufacturerName);
       return identifyReplyCommandManufacturer;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMaximumLevels.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMaximumLevels.java
index 5fcbb80acf9..fd1b8a8fd4f 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMaximumLevels.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMaximumLevels.java
@@ -45,13 +45,9 @@ public Attribute getAttribute() {
   // Properties.
   protected final byte[] maximumLevels;
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommandMaximumLevels(byte[] maximumLevels, Byte numBytes) {
-    super(numBytes);
+  public IdentifyReplyCommandMaximumLevels(byte[] maximumLevels) {
+    super();
     this.maximumLevels = maximumLevels;
-    this.numBytes = numBytes;
   }
 
   public byte[] getMaximumLevels() {
@@ -100,23 +96,20 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
 
     readBuffer.closeContext("IdentifyReplyCommandMaximumLevels");
     // Create the instance
-    return new IdentifyReplyCommandMaximumLevelsBuilderImpl(maximumLevels, numBytes);
+    return new IdentifyReplyCommandMaximumLevelsBuilderImpl(maximumLevels);
   }
 
   public static class IdentifyReplyCommandMaximumLevelsBuilderImpl
       implements IdentifyReplyCommand.IdentifyReplyCommandBuilder {
     private final byte[] maximumLevels;
-    private final Byte numBytes;
 
-    public IdentifyReplyCommandMaximumLevelsBuilderImpl(byte[] maximumLevels, Byte numBytes) {
+    public IdentifyReplyCommandMaximumLevelsBuilderImpl(byte[] maximumLevels) {
       this.maximumLevels = maximumLevels;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandMaximumLevels build(Byte numBytes) {
-
+    public IdentifyReplyCommandMaximumLevels build() {
       IdentifyReplyCommandMaximumLevels identifyReplyCommandMaximumLevels =
-          new IdentifyReplyCommandMaximumLevels(maximumLevels, numBytes);
+          new IdentifyReplyCommandMaximumLevels(maximumLevels);
       return identifyReplyCommandMaximumLevels;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMinimumLevels.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMinimumLevels.java
index e96ebb3f887..b08e89ae4ae 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMinimumLevels.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMinimumLevels.java
@@ -45,13 +45,9 @@ public Attribute getAttribute() {
   // Properties.
   protected final byte[] minimumLevels;
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommandMinimumLevels(byte[] minimumLevels, Byte numBytes) {
-    super(numBytes);
+  public IdentifyReplyCommandMinimumLevels(byte[] minimumLevels) {
+    super();
     this.minimumLevels = minimumLevels;
-    this.numBytes = numBytes;
   }
 
   public byte[] getMinimumLevels() {
@@ -100,23 +96,20 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
 
     readBuffer.closeContext("IdentifyReplyCommandMinimumLevels");
     // Create the instance
-    return new IdentifyReplyCommandMinimumLevelsBuilderImpl(minimumLevels, numBytes);
+    return new IdentifyReplyCommandMinimumLevelsBuilderImpl(minimumLevels);
   }
 
   public static class IdentifyReplyCommandMinimumLevelsBuilderImpl
       implements IdentifyReplyCommand.IdentifyReplyCommandBuilder {
     private final byte[] minimumLevels;
-    private final Byte numBytes;
 
-    public IdentifyReplyCommandMinimumLevelsBuilderImpl(byte[] minimumLevels, Byte numBytes) {
+    public IdentifyReplyCommandMinimumLevelsBuilderImpl(byte[] minimumLevels) {
       this.minimumLevels = minimumLevels;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandMinimumLevels build(Byte numBytes) {
-
+    public IdentifyReplyCommandMinimumLevels build() {
       IdentifyReplyCommandMinimumLevels identifyReplyCommandMinimumLevels =
-          new IdentifyReplyCommandMinimumLevels(minimumLevels, numBytes);
+          new IdentifyReplyCommandMinimumLevels(minimumLevels);
       return identifyReplyCommandMinimumLevels;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkTerminalLevels.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkTerminalLevels.java
index 49f4b7bd753..acd91f7d1d8 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkTerminalLevels.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkTerminalLevels.java
@@ -46,13 +46,9 @@ public Attribute getAttribute() {
   // Properties.
   protected final byte[] networkTerminalLevels;
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommandNetworkTerminalLevels(byte[] networkTerminalLevels, Byte numBytes) {
-    super(numBytes);
+  public IdentifyReplyCommandNetworkTerminalLevels(byte[] networkTerminalLevels) {
+    super();
     this.networkTerminalLevels = networkTerminalLevels;
-    this.numBytes = numBytes;
   }
 
   public byte[] getNetworkTerminalLevels() {
@@ -103,25 +99,20 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
 
     readBuffer.closeContext("IdentifyReplyCommandNetworkTerminalLevels");
     // Create the instance
-    return new IdentifyReplyCommandNetworkTerminalLevelsBuilderImpl(
-        networkTerminalLevels, numBytes);
+    return new IdentifyReplyCommandNetworkTerminalLevelsBuilderImpl(networkTerminalLevels);
   }
 
   public static class IdentifyReplyCommandNetworkTerminalLevelsBuilderImpl
       implements IdentifyReplyCommand.IdentifyReplyCommandBuilder {
     private final byte[] networkTerminalLevels;
-    private final Byte numBytes;
 
-    public IdentifyReplyCommandNetworkTerminalLevelsBuilderImpl(
-        byte[] networkTerminalLevels, Byte numBytes) {
+    public IdentifyReplyCommandNetworkTerminalLevelsBuilderImpl(byte[] networkTerminalLevels) {
       this.networkTerminalLevels = networkTerminalLevels;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandNetworkTerminalLevels build(Byte numBytes) {
-
+    public IdentifyReplyCommandNetworkTerminalLevels build() {
       IdentifyReplyCommandNetworkTerminalLevels identifyReplyCommandNetworkTerminalLevels =
-          new IdentifyReplyCommandNetworkTerminalLevels(networkTerminalLevels, numBytes);
+          new IdentifyReplyCommandNetworkTerminalLevels(networkTerminalLevels);
       return identifyReplyCommandNetworkTerminalLevels;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkVoltage.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkVoltage.java
index dba4d7052dd..a4a22b34c39 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkVoltage.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkVoltage.java
@@ -50,14 +50,10 @@ public Attribute getAttribute() {
   protected final String volts;
   protected final String voltsDecimalPlace;
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommandNetworkVoltage(String volts, String voltsDecimalPlace, Byte numBytes) {
-    super(numBytes);
+  public IdentifyReplyCommandNetworkVoltage(String volts, String voltsDecimalPlace) {
+    super();
     this.volts = volts;
     this.voltsDecimalPlace = voltsDecimalPlace;
-    this.numBytes = numBytes;
   }
 
   public String getVolts() {
@@ -141,26 +137,22 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
 
     readBuffer.closeContext("IdentifyReplyCommandNetworkVoltage");
     // Create the instance
-    return new IdentifyReplyCommandNetworkVoltageBuilderImpl(volts, voltsDecimalPlace, numBytes);
+    return new IdentifyReplyCommandNetworkVoltageBuilderImpl(volts, voltsDecimalPlace);
   }
 
   public static class IdentifyReplyCommandNetworkVoltageBuilderImpl
       implements IdentifyReplyCommand.IdentifyReplyCommandBuilder {
     private final String volts;
     private final String voltsDecimalPlace;
-    private final Byte numBytes;
 
-    public IdentifyReplyCommandNetworkVoltageBuilderImpl(
-        String volts, String voltsDecimalPlace, Byte numBytes) {
+    public IdentifyReplyCommandNetworkVoltageBuilderImpl(String volts, String voltsDecimalPlace) {
       this.volts = volts;
       this.voltsDecimalPlace = voltsDecimalPlace;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandNetworkVoltage build(Byte numBytes) {
-
+    public IdentifyReplyCommandNetworkVoltage build() {
       IdentifyReplyCommandNetworkVoltage identifyReplyCommandNetworkVoltage =
-          new IdentifyReplyCommandNetworkVoltage(volts, voltsDecimalPlace, numBytes);
+          new IdentifyReplyCommandNetworkVoltage(volts, voltsDecimalPlace);
       return identifyReplyCommandNetworkVoltage;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandOutputUnitSummary.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandOutputUnitSummary.java
index e34d23444a9..d3d311163dc 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandOutputUnitSummary.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandOutputUnitSummary.java
@@ -48,21 +48,16 @@ public Attribute getAttribute() {
   protected final Byte gavStoreEnabledByte2;
   protected final short timeFromLastRecoverOfMainsInSeconds;
 
-  // Arguments.
-  protected final Byte numBytes;
-
   public IdentifyReplyCommandOutputUnitSummary(
       IdentifyReplyCommandUnitSummary unitFlags,
       Byte gavStoreEnabledByte1,
       Byte gavStoreEnabledByte2,
-      short timeFromLastRecoverOfMainsInSeconds,
-      Byte numBytes) {
-    super(numBytes);
+      short timeFromLastRecoverOfMainsInSeconds) {
+    super();
     this.unitFlags = unitFlags;
     this.gavStoreEnabledByte1 = gavStoreEnabledByte1;
     this.gavStoreEnabledByte2 = gavStoreEnabledByte2;
     this.timeFromLastRecoverOfMainsInSeconds = timeFromLastRecoverOfMainsInSeconds;
-    this.numBytes = numBytes;
   }
 
   public IdentifyReplyCommandUnitSummary getUnitFlags() {
@@ -92,12 +87,10 @@ protected void serializeIdentifyReplyCommandChild(WriteBuffer writeBuffer)
     writeSimpleField("unitFlags", unitFlags, writeComplex(writeBuffer));
 
     // Optional Field (gavStoreEnabledByte1) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "gavStoreEnabledByte1", gavStoreEnabledByte1, writeByte(writeBuffer, 8), (numBytes) > (1));
+    writeOptionalField("gavStoreEnabledByte1", gavStoreEnabledByte1, writeByte(writeBuffer, 8));
 
     // Optional Field (gavStoreEnabledByte2) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "gavStoreEnabledByte2", gavStoreEnabledByte2, writeByte(writeBuffer, 8), (numBytes) > (2));
+    writeOptionalField("gavStoreEnabledByte2", gavStoreEnabledByte2, writeByte(writeBuffer, 8));
 
     // Simple Field (timeFromLastRecoverOfMainsInSeconds)
     writeSimpleField(
@@ -161,11 +154,7 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
     readBuffer.closeContext("IdentifyReplyCommandOutputUnitSummary");
     // Create the instance
     return new IdentifyReplyCommandOutputUnitSummaryBuilderImpl(
-        unitFlags,
-        gavStoreEnabledByte1,
-        gavStoreEnabledByte2,
-        timeFromLastRecoverOfMainsInSeconds,
-        numBytes);
+        unitFlags, gavStoreEnabledByte1, gavStoreEnabledByte2, timeFromLastRecoverOfMainsInSeconds);
   }
 
   public static class IdentifyReplyCommandOutputUnitSummaryBuilderImpl
@@ -174,30 +163,25 @@ public static class IdentifyReplyCommandOutputUnitSummaryBuilderImpl
     private final Byte gavStoreEnabledByte1;
     private final Byte gavStoreEnabledByte2;
     private final short timeFromLastRecoverOfMainsInSeconds;
-    private final Byte numBytes;
 
     public IdentifyReplyCommandOutputUnitSummaryBuilderImpl(
         IdentifyReplyCommandUnitSummary unitFlags,
         Byte gavStoreEnabledByte1,
         Byte gavStoreEnabledByte2,
-        short timeFromLastRecoverOfMainsInSeconds,
-        Byte numBytes) {
+        short timeFromLastRecoverOfMainsInSeconds) {
       this.unitFlags = unitFlags;
       this.gavStoreEnabledByte1 = gavStoreEnabledByte1;
       this.gavStoreEnabledByte2 = gavStoreEnabledByte2;
       this.timeFromLastRecoverOfMainsInSeconds = timeFromLastRecoverOfMainsInSeconds;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandOutputUnitSummary build(Byte numBytes) {
-
+    public IdentifyReplyCommandOutputUnitSummary build() {
       IdentifyReplyCommandOutputUnitSummary identifyReplyCommandOutputUnitSummary =
           new IdentifyReplyCommandOutputUnitSummary(
               unitFlags,
               gavStoreEnabledByte1,
               gavStoreEnabledByte2,
-              timeFromLastRecoverOfMainsInSeconds,
-              numBytes);
+              timeFromLastRecoverOfMainsInSeconds);
       return identifyReplyCommandOutputUnitSummary;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandSummary.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandSummary.java
index 7152cd40ce8..2c507bf2eb7 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandSummary.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandSummary.java
@@ -47,16 +47,11 @@ public Attribute getAttribute() {
   protected final byte unitServiceType;
   protected final String version;
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommandSummary(
-      String partName, byte unitServiceType, String version, Byte numBytes) {
-    super(numBytes);
+  public IdentifyReplyCommandSummary(String partName, byte unitServiceType, String version) {
+    super();
     this.partName = partName;
     this.unitServiceType = unitServiceType;
     this.version = version;
-    this.numBytes = numBytes;
   }
 
   public String getPartName() {
@@ -127,7 +122,7 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
 
     readBuffer.closeContext("IdentifyReplyCommandSummary");
     // Create the instance
-    return new IdentifyReplyCommandSummaryBuilderImpl(partName, unitServiceType, version, numBytes);
+    return new IdentifyReplyCommandSummaryBuilderImpl(partName, unitServiceType, version);
   }
 
   public static class IdentifyReplyCommandSummaryBuilderImpl
@@ -135,20 +130,17 @@ public static class IdentifyReplyCommandSummaryBuilderImpl
     private final String partName;
     private final byte unitServiceType;
     private final String version;
-    private final Byte numBytes;
 
     public IdentifyReplyCommandSummaryBuilderImpl(
-        String partName, byte unitServiceType, String version, Byte numBytes) {
+        String partName, byte unitServiceType, String version) {
       this.partName = partName;
       this.unitServiceType = unitServiceType;
       this.version = version;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandSummary build(Byte numBytes) {
-
+    public IdentifyReplyCommandSummary build() {
       IdentifyReplyCommandSummary identifyReplyCommandSummary =
-          new IdentifyReplyCommandSummary(partName, unitServiceType, version, numBytes);
+          new IdentifyReplyCommandSummary(partName, unitServiceType, version);
       return identifyReplyCommandSummary;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandTerminalLevels.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandTerminalLevels.java
index 2cd966110f5..094002fd473 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandTerminalLevels.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandTerminalLevels.java
@@ -45,13 +45,9 @@ public Attribute getAttribute() {
   // Properties.
   protected final byte[] terminalLevels;
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommandTerminalLevels(byte[] terminalLevels, Byte numBytes) {
-    super(numBytes);
+  public IdentifyReplyCommandTerminalLevels(byte[] terminalLevels) {
+    super();
     this.terminalLevels = terminalLevels;
-    this.numBytes = numBytes;
   }
 
   public byte[] getTerminalLevels() {
@@ -100,23 +96,20 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
 
     readBuffer.closeContext("IdentifyReplyCommandTerminalLevels");
     // Create the instance
-    return new IdentifyReplyCommandTerminalLevelsBuilderImpl(terminalLevels, numBytes);
+    return new IdentifyReplyCommandTerminalLevelsBuilderImpl(terminalLevels);
   }
 
   public static class IdentifyReplyCommandTerminalLevelsBuilderImpl
       implements IdentifyReplyCommand.IdentifyReplyCommandBuilder {
     private final byte[] terminalLevels;
-    private final Byte numBytes;
 
-    public IdentifyReplyCommandTerminalLevelsBuilderImpl(byte[] terminalLevels, Byte numBytes) {
+    public IdentifyReplyCommandTerminalLevelsBuilderImpl(byte[] terminalLevels) {
       this.terminalLevels = terminalLevels;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandTerminalLevels build(Byte numBytes) {
-
+    public IdentifyReplyCommandTerminalLevels build() {
       IdentifyReplyCommandTerminalLevels identifyReplyCommandTerminalLevels =
-          new IdentifyReplyCommandTerminalLevels(terminalLevels, numBytes);
+          new IdentifyReplyCommandTerminalLevels(terminalLevels);
       return identifyReplyCommandTerminalLevels;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandType.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandType.java
index 460cf589094..9a32ecd66c3 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandType.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandType.java
@@ -45,13 +45,9 @@ public Attribute getAttribute() {
   // Properties.
   protected final String unitType;
 
-  // Arguments.
-  protected final Byte numBytes;
-
-  public IdentifyReplyCommandType(String unitType, Byte numBytes) {
-    super(numBytes);
+  public IdentifyReplyCommandType(String unitType) {
+    super();
     this.unitType = unitType;
-    this.numBytes = numBytes;
   }
 
   public String getUnitType() {
@@ -98,23 +94,19 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder
 
     readBuffer.closeContext("IdentifyReplyCommandType");
     // Create the instance
-    return new IdentifyReplyCommandTypeBuilderImpl(unitType, numBytes);
+    return new IdentifyReplyCommandTypeBuilderImpl(unitType);
   }
 
   public static class IdentifyReplyCommandTypeBuilderImpl
       implements IdentifyReplyCommand.IdentifyReplyCommandBuilder {
     private final String unitType;
-    private final Byte numBytes;
 
-    public IdentifyReplyCommandTypeBuilderImpl(String unitType, Byte numBytes) {
+    public IdentifyReplyCommandTypeBuilderImpl(String unitType) {
       this.unitType = unitType;
-      this.numBytes = numBytes;
     }
 
-    public IdentifyReplyCommandType build(Byte numBytes) {
-
-      IdentifyReplyCommandType identifyReplyCommandType =
-          new IdentifyReplyCommandType(unitType, numBytes);
+    public IdentifyReplyCommandType build() {
+      IdentifyReplyCommandType identifyReplyCommandType = new IdentifyReplyCommandType(unitType);
       return identifyReplyCommandType;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/InterfaceOptions1.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/InterfaceOptions1.java
index 3b2114e546b..955a3d95b13 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/InterfaceOptions1.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/InterfaceOptions1.java
@@ -44,7 +44,6 @@ public class InterfaceOptions1 implements Message {
   protected final boolean srchk;
   protected final boolean xonXoff;
   protected final boolean connect;
-
   // Reserved Fields
   private Boolean reservedField0;
   private Boolean reservedField1;
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/InterfaceOptions2.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/InterfaceOptions2.java
index 95938e3271c..36292d36ce0 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/InterfaceOptions2.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/InterfaceOptions2.java
@@ -40,7 +40,6 @@ public class InterfaceOptions2 implements Message {
   // Properties.
   protected final boolean burden;
   protected final boolean clockGen;
-
   // Reserved Fields
   private Boolean reservedField0;
   private Boolean reservedField1;
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/InterfaceOptions3.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/InterfaceOptions3.java
index 52ee61c9264..d9d37e60dd2 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/InterfaceOptions3.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/InterfaceOptions3.java
@@ -42,7 +42,6 @@ public class InterfaceOptions3 implements Message {
   protected final boolean pun;
   protected final boolean localSal;
   protected final boolean pcn;
-
   // Reserved Fields
   private Boolean reservedField0;
   private Boolean reservedField1;
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LevelInformationAbsent.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LevelInformationAbsent.java
index 215b0feda03..4b067b3f73b 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LevelInformationAbsent.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LevelInformationAbsent.java
@@ -38,7 +38,6 @@
 public class LevelInformationAbsent extends LevelInformation implements Message {
 
   // Accessors for discriminator values.
-
   // Reserved Fields
   private Integer reservedField0;
 
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LightingLabelOptions.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LightingLabelOptions.java
index 4aa55410e74..3069018988e 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LightingLabelOptions.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LightingLabelOptions.java
@@ -40,7 +40,6 @@ public class LightingLabelOptions implements Message {
   // Properties.
   protected final LightingLabelFlavour labelFlavour;
   protected final LightingLabelType labelType;
-
   // Reserved Fields
   private Boolean reservedField0;
   private Boolean reservedField1;
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LogicAssignment.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LogicAssignment.java
index e42fd514a96..7942457ff40 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LogicAssignment.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LogicAssignment.java
@@ -44,7 +44,6 @@ public class LogicAssignment implements Message {
   protected final boolean assignedToGav15;
   protected final boolean assignedToGav14;
   protected final boolean assignedToGav13;
-
   // Reserved Fields
   private Boolean reservedField0;
   private Boolean reservedField1;
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSAL.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSAL.java
index 57350f41531..493f993ee66 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSAL.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSAL.java
@@ -42,13 +42,9 @@ public abstract class MonitoredSAL implements Message {
   // Properties.
   protected final byte salType;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
-  public MonitoredSAL(byte salType, CBusOptions cBusOptions) {
+  public MonitoredSAL(byte salType) {
     super();
     this.salType = salType;
-    this.cBusOptions = cBusOptions;
   }
 
   public byte getSalType() {
@@ -109,12 +105,12 @@ public static MonitoredSAL staticParse(ReadBuffer readBuffer, CBusOptions cBusOp
 
     readBuffer.closeContext("MonitoredSAL");
     // Create the instance
-    MonitoredSAL _monitoredSAL = builder.build(salType, cBusOptions);
+    MonitoredSAL _monitoredSAL = builder.build(salType);
     return _monitoredSAL;
   }
 
   public interface MonitoredSALBuilder {
-    MonitoredSAL build(byte salType, CBusOptions cBusOptions);
+    MonitoredSAL build(byte salType);
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALLongFormSmartMode.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALLongFormSmartMode.java
index b40c32b0879..8b593f77d62 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALLongFormSmartMode.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALLongFormSmartMode.java
@@ -47,9 +47,6 @@ public class MonitoredSALLongFormSmartMode extends MonitoredSAL implements Messa
   protected final Byte reservedByte;
   protected final ReplyNetwork replyNetwork;
   protected final SALData salData;
-
-  // Arguments.
-  protected final CBusOptions cBusOptions;
   // Reserved Fields
   private Byte reservedField0;
 
@@ -61,9 +58,8 @@ public MonitoredSALLongFormSmartMode(
       ApplicationIdContainer application,
       Byte reservedByte,
       ReplyNetwork replyNetwork,
-      SALData salData,
-      CBusOptions cBusOptions) {
-    super(salType, cBusOptions);
+      SALData salData) {
+    super(salType);
     this.terminatingByte = terminatingByte;
     this.unitAddress = unitAddress;
     this.bridgeAddress = bridgeAddress;
@@ -71,7 +67,6 @@ public MonitoredSALLongFormSmartMode(
     this.reservedByte = reservedByte;
     this.replyNetwork = replyNetwork;
     this.salData = salData;
-    this.cBusOptions = cBusOptions;
   }
 
   public int getTerminatingByte() {
@@ -123,11 +118,10 @@ protected void serializeMonitoredSALChild(WriteBuffer writeBuffer) throws Serial
     writeBuffer.writeVirtual("isUnitAddress", isUnitAddress);
 
     // Optional Field (unitAddress) (Can be skipped, if the value is null)
-    writeOptionalField("unitAddress", unitAddress, writeComplex(writeBuffer), getIsUnitAddress());
+    writeOptionalField("unitAddress", unitAddress, writeComplex(writeBuffer));
 
     // Optional Field (bridgeAddress) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "bridgeAddress", bridgeAddress, writeComplex(writeBuffer), !(getIsUnitAddress()));
+    writeOptionalField("bridgeAddress", bridgeAddress, writeComplex(writeBuffer));
 
     // Simple Field (application)
     writeSimpleEnumField(
@@ -140,11 +134,10 @@ protected void serializeMonitoredSALChild(WriteBuffer writeBuffer) throws Serial
             writeUnsignedShort(writeBuffer, 8)));
 
     // Optional Field (reservedByte) (Can be skipped, if the value is null)
-    writeOptionalField("reservedByte", reservedByte, writeByte(writeBuffer, 8), getIsUnitAddress());
+    writeOptionalField("reservedByte", reservedByte, writeByte(writeBuffer, 8));
 
     // Optional Field (replyNetwork) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "replyNetwork", replyNetwork, writeComplex(writeBuffer), !(getIsUnitAddress()));
+    writeOptionalField("replyNetwork", replyNetwork, writeComplex(writeBuffer));
 
     // Optional Field (salData) (Can be skipped, if the value is null)
     writeOptionalField("salData", salData, writeComplex(writeBuffer));
@@ -260,7 +253,6 @@ public static MonitoredSALBuilder staticParseMonitoredSALBuilder(
         reservedByte,
         replyNetwork,
         salData,
-        cBusOptions,
         reservedField0);
   }
 
@@ -273,7 +265,6 @@ public static class MonitoredSALLongFormSmartModeBuilderImpl
     private final Byte reservedByte;
     private final ReplyNetwork replyNetwork;
     private final SALData salData;
-    private final CBusOptions cBusOptions;
     private final Byte reservedField0;
 
     public MonitoredSALLongFormSmartModeBuilderImpl(
@@ -284,7 +275,6 @@ public MonitoredSALLongFormSmartModeBuilderImpl(
         Byte reservedByte,
         ReplyNetwork replyNetwork,
         SALData salData,
-        CBusOptions cBusOptions,
         Byte reservedField0) {
       this.terminatingByte = terminatingByte;
       this.unitAddress = unitAddress;
@@ -293,11 +283,10 @@ public MonitoredSALLongFormSmartModeBuilderImpl(
       this.reservedByte = reservedByte;
       this.replyNetwork = replyNetwork;
       this.salData = salData;
-      this.cBusOptions = cBusOptions;
       this.reservedField0 = reservedField0;
     }
 
-    public MonitoredSALLongFormSmartMode build(byte salType, CBusOptions cBusOptions) {
+    public MonitoredSALLongFormSmartMode build(byte salType) {
       MonitoredSALLongFormSmartMode monitoredSALLongFormSmartMode =
           new MonitoredSALLongFormSmartMode(
               salType,
@@ -307,8 +296,7 @@ public MonitoredSALLongFormSmartMode build(byte salType, CBusOptions cBusOptions
               application,
               reservedByte,
               replyNetwork,
-              salData,
-              cBusOptions);
+              salData);
       monitoredSALLongFormSmartMode.reservedField0 = reservedField0;
       return monitoredSALLongFormSmartMode;
     }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALReply.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALReply.java
index 64869d351ee..f9f969b1286 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALReply.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALReply.java
@@ -42,19 +42,10 @@ public class MonitoredSALReply extends EncodedReply implements Message {
   // Properties.
   protected final MonitoredSAL monitoredSAL;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-  protected final RequestContext requestContext;
-
   public MonitoredSALReply(
-      byte peekedByte,
-      MonitoredSAL monitoredSAL,
-      CBusOptions cBusOptions,
-      RequestContext requestContext) {
-    super(peekedByte, cBusOptions, requestContext);
+      RequestContext requestContext, byte peekedByte, MonitoredSAL monitoredSAL) {
+    super(requestContext, peekedByte);
     this.monitoredSAL = monitoredSAL;
-    this.cBusOptions = cBusOptions;
-    this.requestContext = requestContext;
   }
 
   public MonitoredSAL getMonitoredSAL() {
@@ -106,25 +97,19 @@ public static EncodedReplyBuilder staticParseEncodedReplyBuilder(
 
     readBuffer.closeContext("MonitoredSALReply");
     // Create the instance
-    return new MonitoredSALReplyBuilderImpl(monitoredSAL, cBusOptions, requestContext);
+    return new MonitoredSALReplyBuilderImpl(monitoredSAL);
   }
 
   public static class MonitoredSALReplyBuilderImpl implements EncodedReply.EncodedReplyBuilder {
     private final MonitoredSAL monitoredSAL;
-    private final CBusOptions cBusOptions;
-    private final RequestContext requestContext;
 
-    public MonitoredSALReplyBuilderImpl(
-        MonitoredSAL monitoredSAL, CBusOptions cBusOptions, RequestContext requestContext) {
+    public MonitoredSALReplyBuilderImpl(MonitoredSAL monitoredSAL) {
       this.monitoredSAL = monitoredSAL;
-      this.cBusOptions = cBusOptions;
-      this.requestContext = requestContext;
     }
 
-    public MonitoredSALReply build(
-        byte peekedByte, CBusOptions cBusOptions, RequestContext requestContext) {
+    public MonitoredSALReply build(RequestContext requestContext, byte peekedByte) {
       MonitoredSALReply monitoredSALReply =
-          new MonitoredSALReply(peekedByte, monitoredSAL, cBusOptions, requestContext);
+          new MonitoredSALReply(requestContext, peekedByte, monitoredSAL);
       return monitoredSALReply;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALShortFormBasicMode.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALShortFormBasicMode.java
index 451a412daac..cdec163703c 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALShortFormBasicMode.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALShortFormBasicMode.java
@@ -47,9 +47,6 @@ public class MonitoredSALShortFormBasicMode extends MonitoredSAL implements Mess
   protected final ApplicationIdContainer application;
   protected final SALData salData;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
   public MonitoredSALShortFormBasicMode(
       byte salType,
       byte counts,
@@ -57,16 +54,14 @@ public MonitoredSALShortFormBasicMode(
       Short networkNumber,
       Byte noCounts,
       ApplicationIdContainer application,
-      SALData salData,
-      CBusOptions cBusOptions) {
-    super(salType, cBusOptions);
+      SALData salData) {
+    super(salType);
     this.counts = counts;
     this.bridgeCount = bridgeCount;
     this.networkNumber = networkNumber;
     this.noCounts = noCounts;
     this.application = application;
     this.salData = salData;
-    this.cBusOptions = cBusOptions;
   }
 
   public byte getCounts() {
@@ -100,18 +95,13 @@ protected void serializeMonitoredSALChild(WriteBuffer writeBuffer) throws Serial
     writeBuffer.pushContext("MonitoredSALShortFormBasicMode");
 
     // Optional Field (bridgeCount) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "bridgeCount", bridgeCount, writeUnsignedShort(writeBuffer, 8), (getCounts()) != (0x00));
+    writeOptionalField("bridgeCount", bridgeCount, writeUnsignedShort(writeBuffer, 8));
 
     // Optional Field (networkNumber) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "networkNumber",
-        networkNumber,
-        writeUnsignedShort(writeBuffer, 8),
-        (getCounts()) != (0x00));
+    writeOptionalField("networkNumber", networkNumber, writeUnsignedShort(writeBuffer, 8));
 
     // Optional Field (noCounts) (Can be skipped, if the value is null)
-    writeOptionalField("noCounts", noCounts, writeByte(writeBuffer, 8), (getCounts()) == (0x00));
+    writeOptionalField("noCounts", noCounts, writeByte(writeBuffer, 8));
 
     // Simple Field (application)
     writeSimpleEnumField(
@@ -200,7 +190,7 @@ public static MonitoredSALBuilder staticParseMonitoredSALBuilder(
     readBuffer.closeContext("MonitoredSALShortFormBasicMode");
     // Create the instance
     return new MonitoredSALShortFormBasicModeBuilderImpl(
-        counts, bridgeCount, networkNumber, noCounts, application, salData, cBusOptions);
+        counts, bridgeCount, networkNumber, noCounts, application, salData);
   }
 
   public static class MonitoredSALShortFormBasicModeBuilderImpl
@@ -211,7 +201,6 @@ public static class MonitoredSALShortFormBasicModeBuilderImpl
     private final Byte noCounts;
     private final ApplicationIdContainer application;
     private final SALData salData;
-    private final CBusOptions cBusOptions;
 
     public MonitoredSALShortFormBasicModeBuilderImpl(
         byte counts,
@@ -219,28 +208,19 @@ public MonitoredSALShortFormBasicModeBuilderImpl(
         Short networkNumber,
         Byte noCounts,
         ApplicationIdContainer application,
-        SALData salData,
-        CBusOptions cBusOptions) {
+        SALData salData) {
       this.counts = counts;
       this.bridgeCount = bridgeCount;
       this.networkNumber = networkNumber;
       this.noCounts = noCounts;
       this.application = application;
       this.salData = salData;
-      this.cBusOptions = cBusOptions;
     }
 
-    public MonitoredSALShortFormBasicMode build(byte salType, CBusOptions cBusOptions) {
+    public MonitoredSALShortFormBasicMode build(byte salType) {
       MonitoredSALShortFormBasicMode monitoredSALShortFormBasicMode =
           new MonitoredSALShortFormBasicMode(
-              salType,
-              counts,
-              bridgeCount,
-              networkNumber,
-              noCounts,
-              application,
-              salData,
-              cBusOptions);
+              salType, counts, bridgeCount, networkNumber, noCounts, application, salData);
       return monitoredSALShortFormBasicMode;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/NetworkProtocolControlInformation.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/NetworkProtocolControlInformation.java
index 52cfde711be..3776bb4690f 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/NetworkProtocolControlInformation.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/NetworkProtocolControlInformation.java
@@ -40,7 +40,6 @@ public class NetworkProtocolControlInformation implements Message {
   // Properties.
   protected final byte stackCounter;
   protected final byte stackDepth;
-
   // Reserved Fields
   private Byte reservedField0;
 
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterChangeReply.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterChangeReply.java
index ff625dda41b..139bcfaafdb 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterChangeReply.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterChangeReply.java
@@ -42,19 +42,9 @@ public class ParameterChangeReply extends Reply implements Message {
   // Properties.
   protected final ParameterChange parameterChange;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-  protected final RequestContext requestContext;
-
-  public ParameterChangeReply(
-      byte peekedByte,
-      ParameterChange parameterChange,
-      CBusOptions cBusOptions,
-      RequestContext requestContext) {
-    super(peekedByte, cBusOptions, requestContext);
+  public ParameterChangeReply(byte peekedByte, ParameterChange parameterChange) {
+    super(peekedByte);
     this.parameterChange = parameterChange;
-    this.cBusOptions = cBusOptions;
-    this.requestContext = requestContext;
   }
 
   public ParameterChange getParameterChange() {
@@ -104,25 +94,19 @@ public static ReplyBuilder staticParseReplyBuilder(
 
     readBuffer.closeContext("ParameterChangeReply");
     // Create the instance
-    return new ParameterChangeReplyBuilderImpl(parameterChange, cBusOptions, requestContext);
+    return new ParameterChangeReplyBuilderImpl(parameterChange);
   }
 
   public static class ParameterChangeReplyBuilderImpl implements Reply.ReplyBuilder {
     private final ParameterChange parameterChange;
-    private final CBusOptions cBusOptions;
-    private final RequestContext requestContext;
 
-    public ParameterChangeReplyBuilderImpl(
-        ParameterChange parameterChange, CBusOptions cBusOptions, RequestContext requestContext) {
+    public ParameterChangeReplyBuilderImpl(ParameterChange parameterChange) {
       this.parameterChange = parameterChange;
-      this.cBusOptions = cBusOptions;
-      this.requestContext = requestContext;
     }
 
-    public ParameterChangeReply build(
-        byte peekedByte, CBusOptions cBusOptions, RequestContext requestContext) {
+    public ParameterChangeReply build(byte peekedByte) {
       ParameterChangeReply parameterChangeReply =
-          new ParameterChangeReply(peekedByte, parameterChange, cBusOptions, requestContext);
+          new ParameterChangeReply(peekedByte, parameterChange);
       return parameterChangeReply;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValue.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValue.java
index 8d7094af65d..a623e0e3147 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValue.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValue.java
@@ -40,12 +40,8 @@ public abstract class ParameterValue implements Message {
   // Abstract accessors for discriminator values.
   public abstract ParameterType getParameterType();
 
-  // Arguments.
-  protected final Short numBytes;
-
-  public ParameterValue(Short numBytes) {
+  public ParameterValue() {
     super();
-    this.numBytes = numBytes;
   }
 
   protected abstract void serializeParameterValueChild(WriteBuffer writeBuffer)
@@ -142,13 +138,12 @@ public static ParameterValue staticParse(
 
     readBuffer.closeContext("ParameterValue");
     // Create the instance
-    ParameterValue _parameterValue = builder.build(numBytes);
-
+    ParameterValue _parameterValue = builder.build();
     return _parameterValue;
   }
 
   public interface ParameterValueBuilder {
-    ParameterValue build(Short numBytes);
+    ParameterValue build();
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueApplicationAddress1.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueApplicationAddress1.java
index 848383b689e..6fe1ecbdc4a 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueApplicationAddress1.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueApplicationAddress1.java
@@ -46,14 +46,10 @@ public ParameterType getParameterType() {
   protected final ApplicationAddress1 value;
   protected final byte[] data;
 
-  // Arguments.
-  protected final Short numBytes;
-
-  public ParameterValueApplicationAddress1(ApplicationAddress1 value, byte[] data, Short numBytes) {
-    super(numBytes);
+  public ParameterValueApplicationAddress1(ApplicationAddress1 value, byte[] data) {
+    super();
     this.value = value;
     this.data = data;
-    this.numBytes = numBytes;
   }
 
   public ApplicationAddress1 getValue() {
@@ -120,26 +116,22 @@ public static ParameterValueBuilder staticParseParameterValueBuilder(
 
     readBuffer.closeContext("ParameterValueApplicationAddress1");
     // Create the instance
-    return new ParameterValueApplicationAddress1BuilderImpl(value, data, numBytes);
+    return new ParameterValueApplicationAddress1BuilderImpl(value, data);
   }
 
   public static class ParameterValueApplicationAddress1BuilderImpl
       implements ParameterValue.ParameterValueBuilder {
     private final ApplicationAddress1 value;
     private final byte[] data;
-    private final Short numBytes;
 
-    public ParameterValueApplicationAddress1BuilderImpl(
-        ApplicationAddress1 value, byte[] data, Short numBytes) {
+    public ParameterValueApplicationAddress1BuilderImpl(ApplicationAddress1 value, byte[] data) {
       this.value = value;
       this.data = data;
-      this.numBytes = numBytes;
     }
 
-    public ParameterValueApplicationAddress1 build(Short numBytes) {
-
+    public ParameterValueApplicationAddress1 build() {
       ParameterValueApplicationAddress1 parameterValueApplicationAddress1 =
-          new ParameterValueApplicationAddress1(value, data, numBytes);
+          new ParameterValueApplicationAddress1(value, data);
       return parameterValueApplicationAddress1;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueApplicationAddress2.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueApplicationAddress2.java
index f3efe2f1a08..4773fd8c137 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueApplicationAddress2.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueApplicationAddress2.java
@@ -46,14 +46,10 @@ public ParameterType getParameterType() {
   protected final ApplicationAddress2 value;
   protected final byte[] data;
 
-  // Arguments.
-  protected final Short numBytes;
-
-  public ParameterValueApplicationAddress2(ApplicationAddress2 value, byte[] data, Short numBytes) {
-    super(numBytes);
+  public ParameterValueApplicationAddress2(ApplicationAddress2 value, byte[] data) {
+    super();
     this.value = value;
     this.data = data;
-    this.numBytes = numBytes;
   }
 
   public ApplicationAddress2 getValue() {
@@ -120,26 +116,22 @@ public static ParameterValueBuilder staticParseParameterValueBuilder(
 
     readBuffer.closeContext("ParameterValueApplicationAddress2");
     // Create the instance
-    return new ParameterValueApplicationAddress2BuilderImpl(value, data, numBytes);
+    return new ParameterValueApplicationAddress2BuilderImpl(value, data);
   }
 
   public static class ParameterValueApplicationAddress2BuilderImpl
       implements ParameterValue.ParameterValueBuilder {
     private final ApplicationAddress2 value;
     private final byte[] data;
-    private final Short numBytes;
 
-    public ParameterValueApplicationAddress2BuilderImpl(
-        ApplicationAddress2 value, byte[] data, Short numBytes) {
+    public ParameterValueApplicationAddress2BuilderImpl(ApplicationAddress2 value, byte[] data) {
       this.value = value;
       this.data = data;
-      this.numBytes = numBytes;
     }
 
-    public ParameterValueApplicationAddress2 build(Short numBytes) {
-
+    public ParameterValueApplicationAddress2 build() {
       ParameterValueApplicationAddress2 parameterValueApplicationAddress2 =
-          new ParameterValueApplicationAddress2(value, data, numBytes);
+          new ParameterValueApplicationAddress2(value, data);
       return parameterValueApplicationAddress2;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueBaudRateSelector.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueBaudRateSelector.java
index 267fed93ae8..e3553d81ad2 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueBaudRateSelector.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueBaudRateSelector.java
@@ -46,14 +46,10 @@ public ParameterType getParameterType() {
   protected final BaudRateSelector value;
   protected final byte[] data;
 
-  // Arguments.
-  protected final Short numBytes;
-
-  public ParameterValueBaudRateSelector(BaudRateSelector value, byte[] data, Short numBytes) {
-    super(numBytes);
+  public ParameterValueBaudRateSelector(BaudRateSelector value, byte[] data) {
+    super();
     this.value = value;
     this.data = data;
-    this.numBytes = numBytes;
   }
 
   public BaudRateSelector getValue() {
@@ -129,26 +125,22 @@ public static ParameterValueBuilder staticParseParameterValueBuilder(
 
     readBuffer.closeContext("ParameterValueBaudRateSelector");
     // Create the instance
-    return new ParameterValueBaudRateSelectorBuilderImpl(value, data, numBytes);
+    return new ParameterValueBaudRateSelectorBuilderImpl(value, data);
   }
 
   public static class ParameterValueBaudRateSelectorBuilderImpl
       implements ParameterValue.ParameterValueBuilder {
     private final BaudRateSelector value;
     private final byte[] data;
-    private final Short numBytes;
 
-    public ParameterValueBaudRateSelectorBuilderImpl(
-        BaudRateSelector value, byte[] data, Short numBytes) {
+    public ParameterValueBaudRateSelectorBuilderImpl(BaudRateSelector value, byte[] data) {
       this.value = value;
       this.data = data;
-      this.numBytes = numBytes;
     }
 
-    public ParameterValueBaudRateSelector build(Short numBytes) {
-
+    public ParameterValueBaudRateSelector build() {
       ParameterValueBaudRateSelector parameterValueBaudRateSelector =
-          new ParameterValueBaudRateSelector(value, data, numBytes);
+          new ParameterValueBaudRateSelector(value, data);
       return parameterValueBaudRateSelector;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueCustomManufacturer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueCustomManufacturer.java
index 462ef15433d..84388d3460d 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueCustomManufacturer.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueCustomManufacturer.java
@@ -45,13 +45,9 @@ public ParameterType getParameterType() {
   // Properties.
   protected final CustomManufacturer value;
 
-  // Arguments.
-  protected final Short numBytes;
-
-  public ParameterValueCustomManufacturer(CustomManufacturer value, Short numBytes) {
-    super(numBytes);
+  public ParameterValueCustomManufacturer(CustomManufacturer value) {
+    super();
     this.value = value;
-    this.numBytes = numBytes;
   }
 
   public CustomManufacturer getValue() {
@@ -102,23 +98,20 @@ public static ParameterValueBuilder staticParseParameterValueBuilder(
 
     readBuffer.closeContext("ParameterValueCustomManufacturer");
     // Create the instance
-    return new ParameterValueCustomManufacturerBuilderImpl(value, numBytes);
+    return new ParameterValueCustomManufacturerBuilderImpl(value);
   }
 
   public static class ParameterValueCustomManufacturerBuilderImpl
       implements ParameterValue.ParameterValueBuilder {
     private final CustomManufacturer value;
-    private final Short numBytes;
 
-    public ParameterValueCustomManufacturerBuilderImpl(CustomManufacturer value, Short numBytes) {
+    public ParameterValueCustomManufacturerBuilderImpl(CustomManufacturer value) {
       this.value = value;
-      this.numBytes = numBytes;
     }
 
-    public ParameterValueCustomManufacturer build(Short numBytes) {
-
+    public ParameterValueCustomManufacturer build() {
       ParameterValueCustomManufacturer parameterValueCustomManufacturer =
-          new ParameterValueCustomManufacturer(value, numBytes);
+          new ParameterValueCustomManufacturer(value);
       return parameterValueCustomManufacturer;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueCustomTypes.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueCustomTypes.java
index 5cc8574d060..3e0e87766a1 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueCustomTypes.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueCustomTypes.java
@@ -45,13 +45,9 @@ public ParameterType getParameterType() {
   // Properties.
   protected final CustomTypes value;
 
-  // Arguments.
-  protected final Short numBytes;
-
-  public ParameterValueCustomTypes(CustomTypes value, Short numBytes) {
-    super(numBytes);
+  public ParameterValueCustomTypes(CustomTypes value) {
+    super();
     this.value = value;
-    this.numBytes = numBytes;
   }
 
   public CustomTypes getValue() {
@@ -101,23 +97,19 @@ public static ParameterValueBuilder staticParseParameterValueBuilder(
 
     readBuffer.closeContext("ParameterValueCustomTypes");
     // Create the instance
-    return new ParameterValueCustomTypesBuilderImpl(value, numBytes);
+    return new ParameterValueCustomTypesBuilderImpl(value);
   }
 
   public static class ParameterValueCustomTypesBuilderImpl
       implements ParameterValue.ParameterValueBuilder {
     private final CustomTypes value;
-    private final Short numBytes;
 
-    public ParameterValueCustomTypesBuilderImpl(CustomTypes value, Short numBytes) {
+    public ParameterValueCustomTypesBuilderImpl(CustomTypes value) {
       this.value = value;
-      this.numBytes = numBytes;
     }
 
-    public ParameterValueCustomTypes build(Short numBytes) {
-
-      ParameterValueCustomTypes parameterValueCustomTypes =
-          new ParameterValueCustomTypes(value, numBytes);
+    public ParameterValueCustomTypes build() {
+      ParameterValueCustomTypes parameterValueCustomTypes = new ParameterValueCustomTypes(value);
       return parameterValueCustomTypes;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions1.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions1.java
index f0aa934577c..4083af9ac47 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions1.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions1.java
@@ -46,14 +46,10 @@ public ParameterType getParameterType() {
   protected final InterfaceOptions1 value;
   protected final byte[] data;
 
-  // Arguments.
-  protected final Short numBytes;
-
-  public ParameterValueInterfaceOptions1(InterfaceOptions1 value, byte[] data, Short numBytes) {
-    super(numBytes);
+  public ParameterValueInterfaceOptions1(InterfaceOptions1 value, byte[] data) {
+    super();
     this.value = value;
     this.data = data;
-    this.numBytes = numBytes;
   }
 
   public InterfaceOptions1 getValue() {
@@ -120,26 +116,22 @@ public static ParameterValueBuilder staticParseParameterValueBuilder(
 
     readBuffer.closeContext("ParameterValueInterfaceOptions1");
     // Create the instance
-    return new ParameterValueInterfaceOptions1BuilderImpl(value, data, numBytes);
+    return new ParameterValueInterfaceOptions1BuilderImpl(value, data);
   }
 
   public static class ParameterValueInterfaceOptions1BuilderImpl
       implements ParameterValue.ParameterValueBuilder {
     private final InterfaceOptions1 value;
     private final byte[] data;
-    private final Short numBytes;
 
-    public ParameterValueInterfaceOptions1BuilderImpl(
-        InterfaceOptions1 value, byte[] data, Short numBytes) {
+    public ParameterValueInterfaceOptions1BuilderImpl(InterfaceOptions1 value, byte[] data) {
       this.value = value;
       this.data = data;
-      this.numBytes = numBytes;
     }
 
-    public ParameterValueInterfaceOptions1 build(Short numBytes) {
-
+    public ParameterValueInterfaceOptions1 build() {
       ParameterValueInterfaceOptions1 parameterValueInterfaceOptions1 =
-          new ParameterValueInterfaceOptions1(value, data, numBytes);
+          new ParameterValueInterfaceOptions1(value, data);
       return parameterValueInterfaceOptions1;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions1PowerUpSettings.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions1PowerUpSettings.java
index 9fcdf4b0569..0ea658f3bb4 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions1PowerUpSettings.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions1PowerUpSettings.java
@@ -46,14 +46,9 @@ public ParameterType getParameterType() {
   // Properties.
   protected final InterfaceOptions1PowerUpSettings value;
 
-  // Arguments.
-  protected final Short numBytes;
-
-  public ParameterValueInterfaceOptions1PowerUpSettings(
-      InterfaceOptions1PowerUpSettings value, Short numBytes) {
-    super(numBytes);
+  public ParameterValueInterfaceOptions1PowerUpSettings(InterfaceOptions1PowerUpSettings value) {
+    super();
     this.value = value;
-    this.numBytes = numBytes;
   }
 
   public InterfaceOptions1PowerUpSettings getValue() {
@@ -108,25 +103,22 @@ public static ParameterValueBuilder staticParseParameterValueBuilder(
 
     readBuffer.closeContext("ParameterValueInterfaceOptions1PowerUpSettings");
     // Create the instance
-    return new ParameterValueInterfaceOptions1PowerUpSettingsBuilderImpl(value, numBytes);
+    return new ParameterValueInterfaceOptions1PowerUpSettingsBuilderImpl(value);
   }
 
   public static class ParameterValueInterfaceOptions1PowerUpSettingsBuilderImpl
       implements ParameterValue.ParameterValueBuilder {
     private final InterfaceOptions1PowerUpSettings value;
-    private final Short numBytes;
 
     public ParameterValueInterfaceOptions1PowerUpSettingsBuilderImpl(
-        InterfaceOptions1PowerUpSettings value, Short numBytes) {
+        InterfaceOptions1PowerUpSettings value) {
       this.value = value;
-      this.numBytes = numBytes;
     }
 
-    public ParameterValueInterfaceOptions1PowerUpSettings build(Short numBytes) {
-
+    public ParameterValueInterfaceOptions1PowerUpSettings build() {
       ParameterValueInterfaceOptions1PowerUpSettings
           parameterValueInterfaceOptions1PowerUpSettings =
-              new ParameterValueInterfaceOptions1PowerUpSettings(value, numBytes);
+              new ParameterValueInterfaceOptions1PowerUpSettings(value);
       return parameterValueInterfaceOptions1PowerUpSettings;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions2.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions2.java
index 0dfdf34447f..a54e518374d 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions2.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions2.java
@@ -46,14 +46,10 @@ public ParameterType getParameterType() {
   protected final InterfaceOptions2 value;
   protected final byte[] data;
 
-  // Arguments.
-  protected final Short numBytes;
-
-  public ParameterValueInterfaceOptions2(InterfaceOptions2 value, byte[] data, Short numBytes) {
-    super(numBytes);
+  public ParameterValueInterfaceOptions2(InterfaceOptions2 value, byte[] data) {
+    super();
     this.value = value;
     this.data = data;
-    this.numBytes = numBytes;
   }
 
   public InterfaceOptions2 getValue() {
@@ -120,26 +116,22 @@ public static ParameterValueBuilder staticParseParameterValueBuilder(
 
     readBuffer.closeContext("ParameterValueInterfaceOptions2");
     // Create the instance
-    return new ParameterValueInterfaceOptions2BuilderImpl(value, data, numBytes);
+    return new ParameterValueInterfaceOptions2BuilderImpl(value, data);
   }
 
   public static class ParameterValueInterfaceOptions2BuilderImpl
       implements ParameterValue.ParameterValueBuilder {
     private final InterfaceOptions2 value;
     private final byte[] data;
-    private final Short numBytes;
 
-    public ParameterValueInterfaceOptions2BuilderImpl(
-        InterfaceOptions2 value, byte[] data, Short numBytes) {
+    public ParameterValueInterfaceOptions2BuilderImpl(InterfaceOptions2 value, byte[] data) {
       this.value = value;
       this.data = data;
-      this.numBytes = numBytes;
     }
 
-    public ParameterValueInterfaceOptions2 build(Short numBytes) {
-
+    public ParameterValueInterfaceOptions2 build() {
       ParameterValueInterfaceOptions2 parameterValueInterfaceOptions2 =
-          new ParameterValueInterfaceOptions2(value, data, numBytes);
+          new ParameterValueInterfaceOptions2(value, data);
       return parameterValueInterfaceOptions2;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions3.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions3.java
index 8c97877a88a..9ce17f079a7 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions3.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueInterfaceOptions3.java
@@ -46,14 +46,10 @@ public ParameterType getParameterType() {
   protected final InterfaceOptions3 value;
   protected final byte[] data;
 
-  // Arguments.
-  protected final Short numBytes;
-
-  public ParameterValueInterfaceOptions3(InterfaceOptions3 value, byte[] data, Short numBytes) {
-    super(numBytes);
+  public ParameterValueInterfaceOptions3(InterfaceOptions3 value, byte[] data) {
+    super();
     this.value = value;
     this.data = data;
-    this.numBytes = numBytes;
   }
 
   public InterfaceOptions3 getValue() {
@@ -120,26 +116,22 @@ public static ParameterValueBuilder staticParseParameterValueBuilder(
 
     readBuffer.closeContext("ParameterValueInterfaceOptions3");
     // Create the instance
-    return new ParameterValueInterfaceOptions3BuilderImpl(value, data, numBytes);
+    return new ParameterValueInterfaceOptions3BuilderImpl(value, data);
   }
 
   public static class ParameterValueInterfaceOptions3BuilderImpl
       implements ParameterValue.ParameterValueBuilder {
     private final InterfaceOptions3 value;
     private final byte[] data;
-    private final Short numBytes;
 
-    public ParameterValueInterfaceOptions3BuilderImpl(
-        InterfaceOptions3 value, byte[] data, Short numBytes) {
+    public ParameterValueInterfaceOptions3BuilderImpl(InterfaceOptions3 value, byte[] data) {
       this.value = value;
       this.data = data;
-      this.numBytes = numBytes;
     }
 
-    public ParameterValueInterfaceOptions3 build(Short numBytes) {
-
+    public ParameterValueInterfaceOptions3 build() {
       ParameterValueInterfaceOptions3 parameterValueInterfaceOptions3 =
-          new ParameterValueInterfaceOptions3(value, data, numBytes);
+          new ParameterValueInterfaceOptions3(value, data);
       return parameterValueInterfaceOptions3;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueRaw.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueRaw.java
index e4731ad4b1a..fbd71291a41 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueRaw.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueRaw.java
@@ -45,13 +45,9 @@ public ParameterType getParameterType() {
   // Properties.
   protected final byte[] data;
 
-  // Arguments.
-  protected final Short numBytes;
-
-  public ParameterValueRaw(byte[] data, Short numBytes) {
-    super(numBytes);
+  public ParameterValueRaw(byte[] data) {
+    super();
     this.data = data;
-    this.numBytes = numBytes;
   }
 
   public byte[] getData() {
@@ -100,21 +96,18 @@ public static ParameterValueBuilder staticParseParameterValueBuilder(
 
     readBuffer.closeContext("ParameterValueRaw");
     // Create the instance
-    return new ParameterValueRawBuilderImpl(data, numBytes);
+    return new ParameterValueRawBuilderImpl(data);
   }
 
   public static class ParameterValueRawBuilderImpl implements ParameterValue.ParameterValueBuilder {
     private final byte[] data;
-    private final Short numBytes;
 
-    public ParameterValueRawBuilderImpl(byte[] data, Short numBytes) {
+    public ParameterValueRawBuilderImpl(byte[] data) {
       this.data = data;
-      this.numBytes = numBytes;
     }
 
-    public ParameterValueRaw build(Short numBytes) {
-
-      ParameterValueRaw parameterValueRaw = new ParameterValueRaw(data, numBytes);
+    public ParameterValueRaw build() {
+      ParameterValueRaw parameterValueRaw = new ParameterValueRaw(data);
       return parameterValueRaw;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueSerialNumber.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueSerialNumber.java
index 356033245a8..10442a22265 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueSerialNumber.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ParameterValueSerialNumber.java
@@ -46,14 +46,10 @@ public ParameterType getParameterType() {
   protected final SerialNumber value;
   protected final byte[] data;
 
-  // Arguments.
-  protected final Short numBytes;
-
-  public ParameterValueSerialNumber(SerialNumber value, byte[] data, Short numBytes) {
-    super(numBytes);
+  public ParameterValueSerialNumber(SerialNumber value, byte[] data) {
+    super();
     this.value = value;
     this.data = data;
-    this.numBytes = numBytes;
   }
 
   public SerialNumber getValue() {
@@ -120,25 +116,22 @@ public static ParameterValueBuilder staticParseParameterValueBuilder(
 
     readBuffer.closeContext("ParameterValueSerialNumber");
     // Create the instance
-    return new ParameterValueSerialNumberBuilderImpl(value, data, numBytes);
+    return new ParameterValueSerialNumberBuilderImpl(value, data);
   }
 
   public static class ParameterValueSerialNumberBuilderImpl
       implements ParameterValue.ParameterValueBuilder {
     private final SerialNumber value;
     private final byte[] data;
-    private final Short numBytes;
 
-    public ParameterValueSerialNumberBuilderImpl(SerialNumber value, byte[] data, Short numBytes) {
+    public ParameterValueSerialNumberBuilderImpl(SerialNumber value, byte[] data) {
       this.value = value;
       this.data = data;
-      this.numBytes = numBytes;
     }
 
-    public ParameterValueSerialNumber build(Short numBytes) {
-
+    public ParameterValueSerialNumber build() {
       ParameterValueSerialNumber parameterValueSerialNumber =
-          new ParameterValueSerialNumber(value, data, numBytes);
+          new ParameterValueSerialNumber(value, data);
       return parameterValueSerialNumber;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/PowerUpReply.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/PowerUpReply.java
index 152db07cdf5..774ee608d40 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/PowerUpReply.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/PowerUpReply.java
@@ -42,19 +42,9 @@ public class PowerUpReply extends Reply implements Message {
   // Properties.
   protected final PowerUp powerUpIndicator;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-  protected final RequestContext requestContext;
-
-  public PowerUpReply(
-      byte peekedByte,
-      PowerUp powerUpIndicator,
-      CBusOptions cBusOptions,
-      RequestContext requestContext) {
-    super(peekedByte, cBusOptions, requestContext);
+  public PowerUpReply(byte peekedByte, PowerUp powerUpIndicator) {
+    super(peekedByte);
     this.powerUpIndicator = powerUpIndicator;
-    this.cBusOptions = cBusOptions;
-    this.requestContext = requestContext;
   }
 
   public PowerUp getPowerUpIndicator() {
@@ -103,25 +93,18 @@ public static ReplyBuilder staticParseReplyBuilder(
 
     readBuffer.closeContext("PowerUpReply");
     // Create the instance
-    return new PowerUpReplyBuilderImpl(powerUpIndicator, cBusOptions, requestContext);
+    return new PowerUpReplyBuilderImpl(powerUpIndicator);
   }
 
   public static class PowerUpReplyBuilderImpl implements Reply.ReplyBuilder {
     private final PowerUp powerUpIndicator;
-    private final CBusOptions cBusOptions;
-    private final RequestContext requestContext;
 
-    public PowerUpReplyBuilderImpl(
-        PowerUp powerUpIndicator, CBusOptions cBusOptions, RequestContext requestContext) {
+    public PowerUpReplyBuilderImpl(PowerUp powerUpIndicator) {
       this.powerUpIndicator = powerUpIndicator;
-      this.cBusOptions = cBusOptions;
-      this.requestContext = requestContext;
     }
 
-    public PowerUpReply build(
-        byte peekedByte, CBusOptions cBusOptions, RequestContext requestContext) {
-      PowerUpReply powerUpReply =
-          new PowerUpReply(peekedByte, powerUpIndicator, cBusOptions, requestContext);
+    public PowerUpReply build(byte peekedByte) {
+      PowerUpReply powerUpReply = new PowerUpReply(peekedByte, powerUpIndicator);
       return powerUpReply;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Reply.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Reply.java
index cde32f0296a..60464f2209c 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Reply.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Reply.java
@@ -42,15 +42,9 @@ public abstract class Reply implements Message {
   // Properties.
   protected final byte peekedByte;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-  protected final RequestContext requestContext;
-
-  public Reply(byte peekedByte, CBusOptions cBusOptions, RequestContext requestContext) {
+  public Reply(byte peekedByte) {
     super();
     this.peekedByte = peekedByte;
-    this.cBusOptions = cBusOptions;
-    this.requestContext = requestContext;
   }
 
   public byte getPeekedByte() {
@@ -117,12 +111,12 @@ public static Reply staticParse(
 
     readBuffer.closeContext("Reply");
     // Create the instance
-    Reply _reply = builder.build(peekedByte, cBusOptions, requestContext);
+    Reply _reply = builder.build(peekedByte);
     return _reply;
   }
 
   public interface ReplyBuilder {
-    Reply build(byte peekedByte, CBusOptions cBusOptions, RequestContext requestContext);
+    Reply build(byte peekedByte);
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyEncodedReply.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyEncodedReply.java
index 888982aad3c..16df17e85cf 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyEncodedReply.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyEncodedReply.java
@@ -40,24 +40,20 @@ public class ReplyEncodedReply extends Reply implements Message {
   // Accessors for discriminator values.
 
   // Properties.
+  protected final CBusOptions cBusOptions;
   protected final EncodedReply encodedReply;
   protected final Checksum chksum;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-  protected final RequestContext requestContext;
-
   public ReplyEncodedReply(
-      byte peekedByte,
-      EncodedReply encodedReply,
-      Checksum chksum,
-      CBusOptions cBusOptions,
-      RequestContext requestContext) {
-    super(peekedByte, cBusOptions, requestContext);
+      byte peekedByte, CBusOptions cBusOptions, EncodedReply encodedReply, Checksum chksum) {
+    super(peekedByte);
+    this.cBusOptions = cBusOptions;
     this.encodedReply = encodedReply;
     this.chksum = chksum;
-    this.cBusOptions = cBusOptions;
-    this.requestContext = requestContext;
+  }
+
+  public CBusOptions getCBusOptions() {
+    return cBusOptions;
   }
 
   public EncodedReply getEncodedReply() {
@@ -164,30 +160,24 @@ public static ReplyBuilder staticParseReplyBuilder(
 
     readBuffer.closeContext("ReplyEncodedReply");
     // Create the instance
-    return new ReplyEncodedReplyBuilderImpl(encodedReply, chksum, cBusOptions, requestContext);
+    return new ReplyEncodedReplyBuilderImpl(cBusOptions, encodedReply, chksum);
   }
 
   public static class ReplyEncodedReplyBuilderImpl implements Reply.ReplyBuilder {
+    private final CBusOptions cBusOptions;
     private final EncodedReply encodedReply;
     private final Checksum chksum;
-    private final CBusOptions cBusOptions;
-    private final RequestContext requestContext;
 
     public ReplyEncodedReplyBuilderImpl(
-        EncodedReply encodedReply,
-        Checksum chksum,
-        CBusOptions cBusOptions,
-        RequestContext requestContext) {
+        CBusOptions cBusOptions, EncodedReply encodedReply, Checksum chksum) {
+      this.cBusOptions = cBusOptions;
       this.encodedReply = encodedReply;
       this.chksum = chksum;
-      this.cBusOptions = cBusOptions;
-      this.requestContext = requestContext;
     }
 
-    public ReplyEncodedReply build(
-        byte peekedByte, CBusOptions cBusOptions, RequestContext requestContext) {
+    public ReplyEncodedReply build(byte peekedByte) {
       ReplyEncodedReply replyEncodedReply =
-          new ReplyEncodedReply(peekedByte, encodedReply, chksum, cBusOptions, requestContext);
+          new ReplyEncodedReply(peekedByte, cBusOptions, encodedReply, chksum);
       return replyEncodedReply;
     }
   }
@@ -201,7 +191,8 @@ public boolean equals(Object o) {
       return false;
     }
     ReplyEncodedReply that = (ReplyEncodedReply) o;
-    return (getEncodedReply() == that.getEncodedReply())
+    return (getCBusOptions() == that.getCBusOptions())
+        && (getEncodedReply() == that.getEncodedReply())
         && (getChksum() == that.getChksum())
         && super.equals(that)
         && true;
@@ -209,7 +200,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), getEncodedReply(), getChksum());
+    return Objects.hash(super.hashCode(), getCBusOptions(), getEncodedReply(), getChksum());
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyOrConfirmation.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyOrConfirmation.java
index 6324cef0590..7eb1d2f48b2 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyOrConfirmation.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyOrConfirmation.java
@@ -42,16 +42,9 @@ public abstract class ReplyOrConfirmation implements Message {
   // Properties.
   protected final byte peekedByte;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-  protected final RequestContext requestContext;
-
-  public ReplyOrConfirmation(
-      byte peekedByte, CBusOptions cBusOptions, RequestContext requestContext) {
+  public ReplyOrConfirmation(byte peekedByte) {
     super();
     this.peekedByte = peekedByte;
-    this.cBusOptions = cBusOptions;
-    this.requestContext = requestContext;
   }
 
   public byte getPeekedByte() {
@@ -140,14 +133,12 @@ public static ReplyOrConfirmation staticParse(
 
     readBuffer.closeContext("ReplyOrConfirmation");
     // Create the instance
-    ReplyOrConfirmation _replyOrConfirmation =
-        builder.build(peekedByte, cBusOptions, requestContext);
+    ReplyOrConfirmation _replyOrConfirmation = builder.build(peekedByte);
     return _replyOrConfirmation;
   }
 
   public interface ReplyOrConfirmationBuilder {
-    ReplyOrConfirmation build(
-        byte peekedByte, CBusOptions cBusOptions, RequestContext requestContext);
+    ReplyOrConfirmation build(byte peekedByte);
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyOrConfirmationConfirmation.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyOrConfirmationConfirmation.java
index 123f08ebbeb..0621835a3f2 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyOrConfirmationConfirmation.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyOrConfirmationConfirmation.java
@@ -43,21 +43,11 @@ public class ReplyOrConfirmationConfirmation extends ReplyOrConfirmation impleme
   protected final Confirmation confirmation;
   protected final ReplyOrConfirmation embeddedReply;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-  protected final RequestContext requestContext;
-
   public ReplyOrConfirmationConfirmation(
-      byte peekedByte,
-      Confirmation confirmation,
-      ReplyOrConfirmation embeddedReply,
-      CBusOptions cBusOptions,
-      RequestContext requestContext) {
-    super(peekedByte, cBusOptions, requestContext);
+      byte peekedByte, Confirmation confirmation, ReplyOrConfirmation embeddedReply) {
+    super(peekedByte);
     this.confirmation = confirmation;
     this.embeddedReply = embeddedReply;
-    this.cBusOptions = cBusOptions;
-    this.requestContext = requestContext;
   }
 
   public Confirmation getConfirmation() {
@@ -128,33 +118,23 @@ public static ReplyOrConfirmationBuilder staticParseReplyOrConfirmationBuilder(
 
     readBuffer.closeContext("ReplyOrConfirmationConfirmation");
     // Create the instance
-    return new ReplyOrConfirmationConfirmationBuilderImpl(
-        confirmation, embeddedReply, cBusOptions, requestContext);
+    return new ReplyOrConfirmationConfirmationBuilderImpl(confirmation, embeddedReply);
   }
 
   public static class ReplyOrConfirmationConfirmationBuilderImpl
       implements ReplyOrConfirmation.ReplyOrConfirmationBuilder {
     private final Confirmation confirmation;
     private final ReplyOrConfirmation embeddedReply;
-    private final CBusOptions cBusOptions;
-    private final RequestContext requestContext;
 
     public ReplyOrConfirmationConfirmationBuilderImpl(
-        Confirmation confirmation,
-        ReplyOrConfirmation embeddedReply,
-        CBusOptions cBusOptions,
-        RequestContext requestContext) {
+        Confirmation confirmation, ReplyOrConfirmation embeddedReply) {
       this.confirmation = confirmation;
       this.embeddedReply = embeddedReply;
-      this.cBusOptions = cBusOptions;
-      this.requestContext = requestContext;
     }
 
-    public ReplyOrConfirmationConfirmation build(
-        byte peekedByte, CBusOptions cBusOptions, RequestContext requestContext) {
+    public ReplyOrConfirmationConfirmation build(byte peekedByte) {
       ReplyOrConfirmationConfirmation replyOrConfirmationConfirmation =
-          new ReplyOrConfirmationConfirmation(
-              peekedByte, confirmation, embeddedReply, cBusOptions, requestContext);
+          new ReplyOrConfirmationConfirmation(peekedByte, confirmation, embeddedReply);
       return replyOrConfirmationConfirmation;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyOrConfirmationReply.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyOrConfirmationReply.java
index daab9b64751..4910a4273b4 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyOrConfirmationReply.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ReplyOrConfirmationReply.java
@@ -43,21 +43,10 @@ public class ReplyOrConfirmationReply extends ReplyOrConfirmation implements Mes
   protected final Reply reply;
   protected final ResponseTermination termination;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-  protected final RequestContext requestContext;
-
-  public ReplyOrConfirmationReply(
-      byte peekedByte,
-      Reply reply,
-      ResponseTermination termination,
-      CBusOptions cBusOptions,
-      RequestContext requestContext) {
-    super(peekedByte, cBusOptions, requestContext);
+  public ReplyOrConfirmationReply(byte peekedByte, Reply reply, ResponseTermination termination) {
+    super(peekedByte);
     this.reply = reply;
     this.termination = termination;
-    this.cBusOptions = cBusOptions;
-    this.requestContext = requestContext;
   }
 
   public Reply getReply() {
@@ -127,31 +116,22 @@ public static ReplyOrConfirmationBuilder staticParseReplyOrConfirmationBuilder(
 
     readBuffer.closeContext("ReplyOrConfirmationReply");
     // Create the instance
-    return new ReplyOrConfirmationReplyBuilderImpl(reply, termination, cBusOptions, requestContext);
+    return new ReplyOrConfirmationReplyBuilderImpl(reply, termination);
   }
 
   public static class ReplyOrConfirmationReplyBuilderImpl
       implements ReplyOrConfirmation.ReplyOrConfirmationBuilder {
     private final Reply reply;
     private final ResponseTermination termination;
-    private final CBusOptions cBusOptions;
-    private final RequestContext requestContext;
-
-    public ReplyOrConfirmationReplyBuilderImpl(
-        Reply reply,
-        ResponseTermination termination,
-        CBusOptions cBusOptions,
-        RequestContext requestContext) {
+
+    public ReplyOrConfirmationReplyBuilderImpl(Reply reply, ResponseTermination termination) {
       this.reply = reply;
       this.termination = termination;
-      this.cBusOptions = cBusOptions;
-      this.requestContext = requestContext;
     }
 
-    public ReplyOrConfirmationReply build(
-        byte peekedByte, CBusOptions cBusOptions, RequestContext requestContext) {
+    public ReplyOrConfirmationReply build(byte peekedByte) {
       ReplyOrConfirmationReply replyOrConfirmationReply =
-          new ReplyOrConfirmationReply(peekedByte, reply, termination, cBusOptions, requestContext);
+          new ReplyOrConfirmationReply(peekedByte, reply, termination);
       return replyOrConfirmationReply;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Request.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Request.java
index 9cac0cd5b1b..d8bf5651318 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Request.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Request.java
@@ -46,23 +46,18 @@ public abstract class Request implements Message {
   protected final RequestType secondPeek;
   protected final RequestTermination termination;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
   public Request(
       RequestType peekedByte,
       RequestType startingCR,
       RequestType resetMode,
       RequestType secondPeek,
-      RequestTermination termination,
-      CBusOptions cBusOptions) {
+      RequestTermination termination) {
     super();
     this.peekedByte = peekedByte;
     this.startingCR = startingCR;
     this.resetMode = resetMode;
     this.secondPeek = secondPeek;
     this.termination = termination;
-    this.cBusOptions = cBusOptions;
   }
 
   public RequestType getPeekedByte() {
@@ -230,8 +225,7 @@ public static Request staticParse(ReadBuffer readBuffer, CBusOptions cBusOptions
 
     readBuffer.closeContext("Request");
     // Create the instance
-    Request _request =
-        builder.build(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions);
+    Request _request = builder.build(peekedByte, startingCR, resetMode, secondPeek, termination);
     return _request;
   }
 
@@ -241,8 +235,7 @@ Request build(
         RequestType startingCR,
         RequestType resetMode,
         RequestType secondPeek,
-        RequestTermination termination,
-        CBusOptions cBusOptions);
+        RequestTermination termination);
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestCommand.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestCommand.java
index 0f3ae59a752..78141af6d62 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestCommand.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestCommand.java
@@ -43,28 +43,30 @@ public class RequestCommand extends Request implements Message {
   public static final Byte INITIATOR = 0x5C;
 
   // Properties.
+  protected final CBusOptions cBusOptions;
   protected final CBusCommand cbusCommand;
   protected final Checksum chksum;
   protected final Alpha alpha;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
   public RequestCommand(
       RequestType peekedByte,
       RequestType startingCR,
       RequestType resetMode,
       RequestType secondPeek,
       RequestTermination termination,
+      CBusOptions cBusOptions,
       CBusCommand cbusCommand,
       Checksum chksum,
-      Alpha alpha,
-      CBusOptions cBusOptions) {
-    super(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions);
+      Alpha alpha) {
+    super(peekedByte, startingCR, resetMode, secondPeek, termination);
+    this.cBusOptions = cBusOptions;
     this.cbusCommand = cbusCommand;
     this.chksum = chksum;
     this.alpha = alpha;
-    this.cBusOptions = cBusOptions;
+  }
+
+  public CBusOptions getCBusOptions() {
+    return cBusOptions;
   }
 
   public CBusCommand getCbusCommand() {
@@ -196,21 +198,21 @@ public static RequestBuilder staticParseRequestBuilder(
 
     readBuffer.closeContext("RequestCommand");
     // Create the instance
-    return new RequestCommandBuilderImpl(cbusCommand, chksum, alpha, cBusOptions);
+    return new RequestCommandBuilderImpl(cBusOptions, cbusCommand, chksum, alpha);
   }
 
   public static class RequestCommandBuilderImpl implements Request.RequestBuilder {
+    private final CBusOptions cBusOptions;
     private final CBusCommand cbusCommand;
     private final Checksum chksum;
     private final Alpha alpha;
-    private final CBusOptions cBusOptions;
 
     public RequestCommandBuilderImpl(
-        CBusCommand cbusCommand, Checksum chksum, Alpha alpha, CBusOptions cBusOptions) {
+        CBusOptions cBusOptions, CBusCommand cbusCommand, Checksum chksum, Alpha alpha) {
+      this.cBusOptions = cBusOptions;
       this.cbusCommand = cbusCommand;
       this.chksum = chksum;
       this.alpha = alpha;
-      this.cBusOptions = cBusOptions;
     }
 
     public RequestCommand build(
@@ -218,8 +220,7 @@ public RequestCommand build(
         RequestType startingCR,
         RequestType resetMode,
         RequestType secondPeek,
-        RequestTermination termination,
-        CBusOptions cBusOptions) {
+        RequestTermination termination) {
       RequestCommand requestCommand =
           new RequestCommand(
               peekedByte,
@@ -227,10 +228,10 @@ public RequestCommand build(
               resetMode,
               secondPeek,
               termination,
+              cBusOptions,
               cbusCommand,
               chksum,
-              alpha,
-              cBusOptions);
+              alpha);
       return requestCommand;
     }
   }
@@ -244,7 +245,8 @@ public boolean equals(Object o) {
       return false;
     }
     RequestCommand that = (RequestCommand) o;
-    return (getCbusCommand() == that.getCbusCommand())
+    return (getCBusOptions() == that.getCBusOptions())
+        && (getCbusCommand() == that.getCbusCommand())
         && (getChksum() == that.getChksum())
         && (getAlpha() == that.getAlpha())
         && super.equals(that)
@@ -253,7 +255,8 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), getCbusCommand(), getChksum(), getAlpha());
+    return Objects.hash(
+        super.hashCode(), getCBusOptions(), getCbusCommand(), getChksum(), getAlpha());
   }
 
   @Override
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestDirectCommandAccess.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestDirectCommandAccess.java
index 31eccfac530..6b6d2dd8a47 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestDirectCommandAccess.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestDirectCommandAccess.java
@@ -46,9 +46,6 @@ public class RequestDirectCommandAccess extends Request implements Message {
   protected final CALData calData;
   protected final Alpha alpha;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
   public RequestDirectCommandAccess(
       RequestType peekedByte,
       RequestType startingCR,
@@ -56,12 +53,10 @@ public RequestDirectCommandAccess(
       RequestType secondPeek,
       RequestTermination termination,
       CALData calData,
-      Alpha alpha,
-      CBusOptions cBusOptions) {
-    super(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions);
+      Alpha alpha) {
+    super(peekedByte, startingCR, resetMode, secondPeek, termination);
     this.calData = calData;
     this.alpha = alpha;
-    this.cBusOptions = cBusOptions;
   }
 
   public CALData getCalData() {
@@ -157,19 +152,16 @@ public static RequestBuilder staticParseRequestBuilder(
 
     readBuffer.closeContext("RequestDirectCommandAccess");
     // Create the instance
-    return new RequestDirectCommandAccessBuilderImpl(calData, alpha, cBusOptions);
+    return new RequestDirectCommandAccessBuilderImpl(calData, alpha);
   }
 
   public static class RequestDirectCommandAccessBuilderImpl implements Request.RequestBuilder {
     private final CALData calData;
     private final Alpha alpha;
-    private final CBusOptions cBusOptions;
 
-    public RequestDirectCommandAccessBuilderImpl(
-        CALData calData, Alpha alpha, CBusOptions cBusOptions) {
+    public RequestDirectCommandAccessBuilderImpl(CALData calData, Alpha alpha) {
       this.calData = calData;
       this.alpha = alpha;
-      this.cBusOptions = cBusOptions;
     }
 
     public RequestDirectCommandAccess build(
@@ -177,18 +169,10 @@ public RequestDirectCommandAccess build(
         RequestType startingCR,
         RequestType resetMode,
         RequestType secondPeek,
-        RequestTermination termination,
-        CBusOptions cBusOptions) {
+        RequestTermination termination) {
       RequestDirectCommandAccess requestDirectCommandAccess =
           new RequestDirectCommandAccess(
-              peekedByte,
-              startingCR,
-              resetMode,
-              secondPeek,
-              termination,
-              calData,
-              alpha,
-              cBusOptions);
+              peekedByte, startingCR, resetMode, secondPeek, termination, calData, alpha);
       return requestDirectCommandAccess;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestEmpty.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestEmpty.java
index b97623f9da1..436e63e63a1 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestEmpty.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestEmpty.java
@@ -39,18 +39,13 @@ public class RequestEmpty extends Request implements Message {
 
   // Accessors for discriminator values.
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
   public RequestEmpty(
       RequestType peekedByte,
       RequestType startingCR,
       RequestType resetMode,
       RequestType secondPeek,
-      RequestTermination termination,
-      CBusOptions cBusOptions) {
-    super(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions);
-    this.cBusOptions = cBusOptions;
+      RequestTermination termination) {
+    super(peekedByte, startingCR, resetMode, secondPeek, termination);
   }
 
   @Override
@@ -84,25 +79,21 @@ public static RequestBuilder staticParseRequestBuilder(
 
     readBuffer.closeContext("RequestEmpty");
     // Create the instance
-    return new RequestEmptyBuilderImpl(cBusOptions);
+    return new RequestEmptyBuilderImpl();
   }
 
   public static class RequestEmptyBuilderImpl implements Request.RequestBuilder {
-    private final CBusOptions cBusOptions;
 
-    public RequestEmptyBuilderImpl(CBusOptions cBusOptions) {
-      this.cBusOptions = cBusOptions;
-    }
+    public RequestEmptyBuilderImpl() {}
 
     public RequestEmpty build(
         RequestType peekedByte,
         RequestType startingCR,
         RequestType resetMode,
         RequestType secondPeek,
-        RequestTermination termination,
-        CBusOptions cBusOptions) {
+        RequestTermination termination) {
       RequestEmpty requestEmpty =
-          new RequestEmpty(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions);
+          new RequestEmpty(peekedByte, startingCR, resetMode, secondPeek, termination);
       return requestEmpty;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestNull.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestNull.java
index eb075bdb824..b794acc515c 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestNull.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestNull.java
@@ -42,18 +42,13 @@ public class RequestNull extends Request implements Message {
   // Constant values.
   public static final Long NULLINDICATOR = 0x6E756C6CL;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
   public RequestNull(
       RequestType peekedByte,
       RequestType startingCR,
       RequestType resetMode,
       RequestType secondPeek,
-      RequestTermination termination,
-      CBusOptions cBusOptions) {
-    super(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions);
-    this.cBusOptions = cBusOptions;
+      RequestTermination termination) {
+    super(peekedByte, startingCR, resetMode, secondPeek, termination);
   }
 
   public long getNullIndicator() {
@@ -101,25 +96,21 @@ public static RequestBuilder staticParseRequestBuilder(
 
     readBuffer.closeContext("RequestNull");
     // Create the instance
-    return new RequestNullBuilderImpl(cBusOptions);
+    return new RequestNullBuilderImpl();
   }
 
   public static class RequestNullBuilderImpl implements Request.RequestBuilder {
-    private final CBusOptions cBusOptions;
 
-    public RequestNullBuilderImpl(CBusOptions cBusOptions) {
-      this.cBusOptions = cBusOptions;
-    }
+    public RequestNullBuilderImpl() {}
 
     public RequestNull build(
         RequestType peekedByte,
         RequestType startingCR,
         RequestType resetMode,
         RequestType secondPeek,
-        RequestTermination termination,
-        CBusOptions cBusOptions) {
+        RequestTermination termination) {
       RequestNull requestNull =
-          new RequestNull(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions);
+          new RequestNull(peekedByte, startingCR, resetMode, secondPeek, termination);
       return requestNull;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestObsolete.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestObsolete.java
index 73924f4d345..27d0656f955 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestObsolete.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestObsolete.java
@@ -43,9 +43,6 @@ public class RequestObsolete extends Request implements Message {
   protected final CALData calData;
   protected final Alpha alpha;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
   public RequestObsolete(
       RequestType peekedByte,
       RequestType startingCR,
@@ -53,12 +50,10 @@ public RequestObsolete(
       RequestType secondPeek,
       RequestTermination termination,
       CALData calData,
-      Alpha alpha,
-      CBusOptions cBusOptions) {
-    super(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions);
+      Alpha alpha) {
+    super(peekedByte, startingCR, resetMode, secondPeek, termination);
     this.calData = calData;
     this.alpha = alpha;
-    this.cBusOptions = cBusOptions;
   }
 
   public CALData getCalData() {
@@ -142,18 +137,16 @@ public static RequestBuilder staticParseRequestBuilder(
 
     readBuffer.closeContext("RequestObsolete");
     // Create the instance
-    return new RequestObsoleteBuilderImpl(calData, alpha, cBusOptions);
+    return new RequestObsoleteBuilderImpl(calData, alpha);
   }
 
   public static class RequestObsoleteBuilderImpl implements Request.RequestBuilder {
     private final CALData calData;
     private final Alpha alpha;
-    private final CBusOptions cBusOptions;
 
-    public RequestObsoleteBuilderImpl(CALData calData, Alpha alpha, CBusOptions cBusOptions) {
+    public RequestObsoleteBuilderImpl(CALData calData, Alpha alpha) {
       this.calData = calData;
       this.alpha = alpha;
-      this.cBusOptions = cBusOptions;
     }
 
     public RequestObsolete build(
@@ -161,18 +154,10 @@ public RequestObsolete build(
         RequestType startingCR,
         RequestType resetMode,
         RequestType secondPeek,
-        RequestTermination termination,
-        CBusOptions cBusOptions) {
+        RequestTermination termination) {
       RequestObsolete requestObsolete =
           new RequestObsolete(
-              peekedByte,
-              startingCR,
-              resetMode,
-              secondPeek,
-              termination,
-              calData,
-              alpha,
-              cBusOptions);
+              peekedByte, startingCR, resetMode, secondPeek, termination, calData, alpha);
       return requestObsolete;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestReset.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestReset.java
index 3775f0de9ee..5f99765b77e 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestReset.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestReset.java
@@ -45,9 +45,6 @@ public class RequestReset extends Request implements Message {
   protected final RequestType tildePeek2;
   protected final RequestType thirdTilde;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
   public RequestReset(
       RequestType peekedByte,
       RequestType startingCR,
@@ -57,14 +54,12 @@ public RequestReset(
       RequestType tildePeek,
       RequestType secondTilde,
       RequestType tildePeek2,
-      RequestType thirdTilde,
-      CBusOptions cBusOptions) {
-    super(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions);
+      RequestType thirdTilde) {
+    super(peekedByte, startingCR, resetMode, secondPeek, termination);
     this.tildePeek = tildePeek;
     this.secondTilde = secondTilde;
     this.tildePeek2 = tildePeek2;
     this.thirdTilde = thirdTilde;
-    this.cBusOptions = cBusOptions;
   }
 
   public RequestType getTildePeek() {
@@ -160,7 +155,7 @@ public static RequestBuilder staticParseRequestBuilder(
 
     readBuffer.closeContext("RequestReset");
     // Create the instance
-    return new RequestResetBuilderImpl(tildePeek, secondTilde, tildePeek2, thirdTilde, cBusOptions);
+    return new RequestResetBuilderImpl(tildePeek, secondTilde, tildePeek2, thirdTilde);
   }
 
   public static class RequestResetBuilderImpl implements Request.RequestBuilder {
@@ -168,19 +163,16 @@ public static class RequestResetBuilderImpl implements Request.RequestBuilder {
     private final RequestType secondTilde;
     private final RequestType tildePeek2;
     private final RequestType thirdTilde;
-    private final CBusOptions cBusOptions;
 
     public RequestResetBuilderImpl(
         RequestType tildePeek,
         RequestType secondTilde,
         RequestType tildePeek2,
-        RequestType thirdTilde,
-        CBusOptions cBusOptions) {
+        RequestType thirdTilde) {
       this.tildePeek = tildePeek;
       this.secondTilde = secondTilde;
       this.tildePeek2 = tildePeek2;
       this.thirdTilde = thirdTilde;
-      this.cBusOptions = cBusOptions;
     }
 
     public RequestReset build(
@@ -188,8 +180,7 @@ public RequestReset build(
         RequestType startingCR,
         RequestType resetMode,
         RequestType secondPeek,
-        RequestTermination termination,
-        CBusOptions cBusOptions) {
+        RequestTermination termination) {
       RequestReset requestReset =
           new RequestReset(
               peekedByte,
@@ -200,8 +191,7 @@ public RequestReset build(
               tildePeek,
               secondTilde,
               tildePeek2,
-              thirdTilde,
-              cBusOptions);
+              thirdTilde);
       return requestReset;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestSmartConnectShortcut.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestSmartConnectShortcut.java
index 67cad2c88f2..0df146cca16 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestSmartConnectShortcut.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/RequestSmartConnectShortcut.java
@@ -46,9 +46,6 @@ public class RequestSmartConnectShortcut extends Request implements Message {
   protected final RequestType pipePeek;
   protected final Byte secondPipe;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-
   public RequestSmartConnectShortcut(
       RequestType peekedByte,
       RequestType startingCR,
@@ -56,12 +53,10 @@ public RequestSmartConnectShortcut(
       RequestType secondPeek,
       RequestTermination termination,
       RequestType pipePeek,
-      Byte secondPipe,
-      CBusOptions cBusOptions) {
-    super(peekedByte, startingCR, resetMode, secondPeek, termination, cBusOptions);
+      Byte secondPipe) {
+    super(peekedByte, startingCR, resetMode, secondPeek, termination);
     this.pipePeek = pipePeek;
     this.secondPipe = secondPipe;
-    this.cBusOptions = cBusOptions;
   }
 
   public RequestType getPipePeek() {
@@ -86,11 +81,7 @@ protected void serializeRequestChild(WriteBuffer writeBuffer) throws Serializati
     writeConstField("pipe", PIPE, writeByte(writeBuffer, 8));
 
     // Optional Field (secondPipe) (Can be skipped, if the value is null)
-    writeOptionalField(
-        "secondPipe",
-        secondPipe,
-        writeByte(writeBuffer, 8),
-        (getPipePeek()) == (RequestType.SMART_CONNECT_SHORTCUT));
+    writeOptionalField("secondPipe", secondPipe, writeByte(writeBuffer, 8));
 
     writeBuffer.popContext("RequestSmartConnectShortcut");
   }
@@ -137,19 +128,16 @@ public static RequestBuilder staticParseRequestBuilder(
 
     readBuffer.closeContext("RequestSmartConnectShortcut");
     // Create the instance
-    return new RequestSmartConnectShortcutBuilderImpl(pipePeek, secondPipe, cBusOptions);
+    return new RequestSmartConnectShortcutBuilderImpl(pipePeek, secondPipe);
   }
 
   public static class RequestSmartConnectShortcutBuilderImpl implements Request.RequestBuilder {
     private final RequestType pipePeek;
     private final Byte secondPipe;
-    private final CBusOptions cBusOptions;
 
-    public RequestSmartConnectShortcutBuilderImpl(
-        RequestType pipePeek, Byte secondPipe, CBusOptions cBusOptions) {
+    public RequestSmartConnectShortcutBuilderImpl(RequestType pipePeek, Byte secondPipe) {
       this.pipePeek = pipePeek;
       this.secondPipe = secondPipe;
-      this.cBusOptions = cBusOptions;
     }
 
     public RequestSmartConnectShortcut build(
@@ -157,18 +145,10 @@ public RequestSmartConnectShortcut build(
         RequestType startingCR,
         RequestType resetMode,
         RequestType secondPeek,
-        RequestTermination termination,
-        CBusOptions cBusOptions) {
+        RequestTermination termination) {
       RequestSmartConnectShortcut requestSmartConnectShortcut =
           new RequestSmartConnectShortcut(
-              peekedByte,
-              startingCR,
-              resetMode,
-              secondPeek,
-              termination,
-              pipePeek,
-              secondPipe,
-              cBusOptions);
+              peekedByte, startingCR, resetMode, secondPeek, termination, pipePeek, secondPipe);
       return requestSmartConnectShortcut;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ServerErrorReply.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ServerErrorReply.java
index 44405ddbb81..7ca6f2d9a78 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ServerErrorReply.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ServerErrorReply.java
@@ -42,14 +42,8 @@ public class ServerErrorReply extends ReplyOrConfirmation implements Message {
   // Constant values.
   public static final Byte ERRORMARKER = 0x21;
 
-  // Arguments.
-  protected final CBusOptions cBusOptions;
-  protected final RequestContext requestContext;
-
-  public ServerErrorReply(byte peekedByte, CBusOptions cBusOptions, RequestContext requestContext) {
-    super(peekedByte, cBusOptions, requestContext);
-    this.cBusOptions = cBusOptions;
-    this.requestContext = requestContext;
+  public ServerErrorReply(byte peekedByte) {
+    super(peekedByte);
   }
 
   public byte getErrorMarker() {
@@ -98,23 +92,16 @@ public static ReplyOrConfirmationBuilder staticParseReplyOrConfirmationBuilder(
 
     readBuffer.closeContext("ServerErrorReply");
     // Create the instance
-    return new ServerErrorReplyBuilderImpl(cBusOptions, requestContext);
+    return new ServerErrorReplyBuilderImpl();
   }
 
   public static class ServerErrorReplyBuilderImpl
       implements ReplyOrConfirmation.ReplyOrConfirmationBuilder {
-    private final CBusOptions cBusOptions;
-    private final RequestContext requestContext;
 
-    public ServerErrorReplyBuilderImpl(CBusOptions cBusOptions, RequestContext requestContext) {
-      this.cBusOptions = cBusOptions;
-      this.requestContext = requestContext;
-    }
+    public ServerErrorReplyBuilderImpl() {}
 
-    public ServerErrorReply build(
-        byte peekedByte, CBusOptions cBusOptions, RequestContext requestContext) {
-      ServerErrorReply serverErrorReply =
-          new ServerErrorReply(peekedByte, cBusOptions, requestContext);
+    public ServerErrorReply build(byte peekedByte) {
+      ServerErrorReply serverErrorReply = new ServerErrorReply(peekedByte);
       return serverErrorReply;
     }
   }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/StatusRequestBinaryState.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/StatusRequestBinaryState.java
index 7f02272e295..cec7d647ab5 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/StatusRequestBinaryState.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/StatusRequestBinaryState.java
@@ -41,7 +41,6 @@ public class StatusRequestBinaryState extends StatusRequest implements Message {
 
   // Properties.
   protected final ApplicationIdContainer application;
-
   // Reserved Fields
   private Byte reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/StatusRequestBinaryStateDeprecated.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/StatusRequestBinaryStateDeprecated.java
index 21d8e9ccf85..bb39cb682e4 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/StatusRequestBinaryStateDeprecated.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/StatusRequestBinaryStateDeprecated.java
@@ -41,7 +41,6 @@ public class StatusRequestBinaryStateDeprecated extends StatusRequest implements
 
   // Properties.
   protected final ApplicationIdContainer application;
-
   // Reserved Fields
   private Byte reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/StatusRequestLevel.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/StatusRequestLevel.java
index 8f616f36afd..6e03f62d59e 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/StatusRequestLevel.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/StatusRequestLevel.java
@@ -42,7 +42,6 @@ public class StatusRequestLevel extends StatusRequest implements Message {
   // Properties.
   protected final ApplicationIdContainer application;
   protected final byte startingGroupAddressLabel;
-
   // Reserved Fields
   private Byte reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TelephonyDataRinging.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TelephonyDataRinging.java
index c7265591c0f..6e084628eb6 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TelephonyDataRinging.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TelephonyDataRinging.java
@@ -41,7 +41,6 @@ public class TelephonyDataRinging extends TelephonyData implements Message {
 
   // Properties.
   protected final String number;
-
   // Reserved Fields
   private Byte reservedField0;
 
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TriggerControlLabelOptions.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TriggerControlLabelOptions.java
index 617b149ed34..0bb2b447788 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TriggerControlLabelOptions.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TriggerControlLabelOptions.java
@@ -40,7 +40,6 @@ public class TriggerControlLabelOptions implements Message {
   // Properties.
   protected final TriggerControlLabelFlavour labelFlavour;
   protected final TriggerControlLabelType labelType;
-
   // Reserved Fields
   private Boolean reservedField0;
   private Boolean reservedField1;
diff --git a/plc4j/drivers/c-bus/src/main/java/org/apache/plc4x/java/cbus/configuration/CBusTcpTransportConfiguration.java b/plc4j/drivers/c-bus/src/main/java/org/apache/plc4x/java/cbus/configuration/CBusTcpTransportConfiguration.java
index b7af0632137..125eb28da68 100644
--- a/plc4j/drivers/c-bus/src/main/java/org/apache/plc4x/java/cbus/configuration/CBusTcpTransportConfiguration.java
+++ b/plc4j/drivers/c-bus/src/main/java/org/apache/plc4x/java/cbus/configuration/CBusTcpTransportConfiguration.java
@@ -19,14 +19,14 @@
 
 package org.apache.plc4x.java.cbus.configuration;
 
-import org.apache.plc4x.java.cbus.readwrite.CBusConstants;
+import org.apache.plc4x.java.cbus.readwrite.Constants;
 import org.apache.plc4x.java.transport.tcp.DefaultTcpTransportConfiguration;
 
 public class CBusTcpTransportConfiguration extends DefaultTcpTransportConfiguration {
 
     @Override
     public int getDefaultPort() {
-        return CBusConstants.CBUSTCPDEFAULTPORT;
+        return Constants.CBUSTCPDEFAULTPORT;
     }
 
 }
diff --git a/plc4j/drivers/c-bus/src/test/java/org/apache/plc4x/java/cbus/RandomPackagesTest.java b/plc4j/drivers/c-bus/src/test/java/org/apache/plc4x/java/cbus/RandomPackagesTest.java
index e2c437464ad..18e5522591c 100644
--- a/plc4j/drivers/c-bus/src/test/java/org/apache/plc4x/java/cbus/RandomPackagesTest.java
+++ b/plc4j/drivers/c-bus/src/test/java/org/apache/plc4x/java/cbus/RandomPackagesTest.java
@@ -460,12 +460,12 @@ class BridgeTest {
         @Test
         void BridgedIdentify() throws Exception {
             cBusOptions = C_BUS_OPTIONS_WITH_SRCHK;
-            CALDataIdentify calDataIdentify = new CALDataIdentify(CALCommandTypeContainer.CALCommandIdentify, null, Attribute.Type, requestContext);
+            CALDataIdentify calDataIdentify = new CALDataIdentify(requestContext, CALCommandTypeContainer.CALCommandIdentify, null, Attribute.Type);
             NetworkRoute networkRoute = new NetworkRoute(new NetworkProtocolControlInformation((byte) 1, (byte) 1), new ArrayList<>());
-            CBusPointToPointCommandIndirect cBusPointToPointCommandIndirect = new CBusPointToPointCommandIndirect(1, calDataIdentify, new BridgeAddress((byte) 253), networkRoute, new UnitAddress((byte) 10), cBusOptions);
-            CBusCommandPointToPoint cbusCommand = new CBusCommandPointToPoint(new CBusHeader(PriorityClass.Class4, false, (byte) 0, DestinationAddressType.PointToPoint), cBusPointToPointCommandIndirect, cBusOptions);
-            RequestCommand request = new RequestCommand(RequestType.REQUEST_COMMAND, null, null, null, new RequestTermination(), cbusCommand, null, null, cBusOptions);
-            CBusMessageToServer cBusMessageToServer = new CBusMessageToServer(request, requestContext, cBusOptions);
+            CBusPointToPointCommandIndirect cBusPointToPointCommandIndirect = new CBusPointToPointCommandIndirect(1, calDataIdentify, new BridgeAddress((byte) 253), networkRoute, new UnitAddress((byte) 10));
+            CBusCommandPointToPoint cbusCommand = new CBusCommandPointToPoint(new CBusHeader(PriorityClass.Class4, false, (byte) 0, DestinationAddressType.PointToPoint), cBusPointToPointCommandIndirect);
+            RequestCommand request = new RequestCommand(RequestType.REQUEST_COMMAND, null, null, null, new RequestTermination(), cBusOptions, cbusCommand, null, null);
+            CBusMessageToServer cBusMessageToServer = new CBusMessageToServer(request);
 
             WriteBufferByteBased writeBuffer = new WriteBufferByteBased(cBusMessageToServer.getLengthInBytes());
             cBusMessageToServer.serialize(writeBuffer);
diff --git a/plc4j/drivers/eip/pom.xml b/plc4j/drivers/eip/pom.xml
index 1d5f1ae8cf1..e5fc1b94c18 100644
--- a/plc4j/drivers/eip/pom.xml
+++ b/plc4j/drivers/eip/pom.xml
@@ -167,9 +167,6 @@
                   <languageName>java</languageName>
                   <outputFlavor>read-write</outputFlavor>
                   <outputDir>src/main/generated</outputDir>
-                  <!--options>
-                    <generate-properties-for-parser-arguments>true</generate-properties-for-parser-arguments>
-                  </options-->
                 </configuration>
               </execution>
             </executions>
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/Constants.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/Constants.java
new file mode 100644
index 00000000000..d75719b001a
--- /dev/null
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/Constants.java
@@ -0,0 +1,43 @@
+/*
+ * 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.eip.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 Constants {
+
+  // Constant values.
+  public static final Integer EIPUDPDISCOVERYDEFAULTPORT = 44818;
+  public static final Integer EIPTCPDEFAULTPORT = 44818;
+}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipConstants.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipConstants.java
deleted file mode 100644
index 1f4ee4f1ff4..00000000000
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipConstants.java
+++ /dev/null
@@ -1,142 +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.eip.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 EipConstants implements Message {
-
-  // Constant values.
-  public static final Integer EIPUDPDISCOVERYDEFAULTPORT = 44818;
-  public static final Integer EIPTCPDEFAULTPORT = 44818;
-
-  public EipConstants() {
-    super();
-  }
-
-  public int getEipUdpDiscoveryDefaultPort() {
-    return EIPUDPDISCOVERYDEFAULTPORT;
-  }
-
-  public int getEipTcpDefaultPort() {
-    return EIPTCPDEFAULTPORT;
-  }
-
-  public void serialize(WriteBuffer writeBuffer) throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("EipConstants");
-
-    // Const Field (eipUdpDiscoveryDefaultPort)
-    writeConstField(
-        "eipUdpDiscoveryDefaultPort",
-        EIPUDPDISCOVERYDEFAULTPORT,
-        writeUnsignedInt(writeBuffer, 16));
-
-    // Const Field (eipTcpDefaultPort)
-    writeConstField("eipTcpDefaultPort", EIPTCPDEFAULTPORT, writeUnsignedInt(writeBuffer, 16));
-
-    writeBuffer.popContext("EipConstants");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = 0;
-    EipConstants _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    // Const Field (eipUdpDiscoveryDefaultPort)
-    lengthInBits += 16;
-
-    // Const Field (eipTcpDefaultPort)
-    lengthInBits += 16;
-
-    return lengthInBits;
-  }
-
-  public static EipConstants staticParse(ReadBuffer readBuffer) throws ParseException {
-    readBuffer.pullContext("EipConstants");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    int eipUdpDiscoveryDefaultPort =
-        readConstField(
-            "eipUdpDiscoveryDefaultPort",
-            readUnsignedInt(readBuffer, 16),
-            EipConstants.EIPUDPDISCOVERYDEFAULTPORT);
-
-    int eipTcpDefaultPort =
-        readConstField(
-            "eipTcpDefaultPort", readUnsignedInt(readBuffer, 16), EipConstants.EIPTCPDEFAULTPORT);
-
-    readBuffer.closeContext("EipConstants");
-    // Create the instance
-    EipConstants _eipConstants;
-    _eipConstants = new EipConstants();
-    return _eipConstants;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof EipConstants)) {
-      return false;
-    }
-    EipConstants that = (EipConstants) o;
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash();
-  }
-
-  @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/eip/src/main/java/org/apache/plc4x/java/eip/base/discovery/EipPlcDiscoverer.java b/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/base/discovery/EipPlcDiscoverer.java
index a4a0f20d157..e08ccee43d7 100644
--- a/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/base/discovery/EipPlcDiscoverer.java
+++ b/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/base/discovery/EipPlcDiscoverer.java
@@ -60,7 +60,7 @@ public CompletableFuture<PlcDiscoveryResponse> discoverWithHandler(PlcDiscoveryR
                         if ((interfaceAddress.getBroadcast() != null) && (interfaceAddress.getAddress() instanceof Inet4Address)) {
                             Inet4Address inet4Address = (Inet4Address) interfaceAddress.getAddress();
                             // Open a listening socket on the AMS discovery default port for taking in responses.
-                            DatagramSocket discoverySocket = new DatagramSocket(EipConstants.EIPUDPDISCOVERYDEFAULTPORT, inet4Address);
+                            DatagramSocket discoverySocket = new DatagramSocket(Constants.EIPUDPDISCOVERYDEFAULTPORT, inet4Address);
                             discoverySocket.setBroadcast(true);
 
                             openSockets.add(discoverySocket);
@@ -89,7 +89,7 @@ public CompletableFuture<PlcDiscoveryResponse> discoverWithHandler(PlcDiscoveryR
                                                         // Add an entry to the results.
                                                         PlcDiscoveryItem plcDiscoveryItem = new DefaultPlcDiscoveryItem(
                                                             "eip", "tcp",
-                                                            plcAddress.getHostAddress() + ":" + EipConstants.EIPTCPDEFAULTPORT,
+                                                            plcAddress.getHostAddress() + ":" + Constants.EIPTCPDEFAULTPORT,
                                                             Collections.emptyMap(), identityItem.getProductName(), Collections.emptyMap());
 
                                                         // If we've got an explicit handler, pass the new item to that.
@@ -131,7 +131,7 @@ public CompletableFuture<PlcDiscoveryResponse> discoverWithHandler(PlcDiscoveryR
                                 InetAddress broadcastAddress = interfaceAddress.getBroadcast();
 
                                 // Create the UDP packet to the broadcast address.
-                                DatagramPacket discoveryRequestPacket = new DatagramPacket(writeBuffer.getBytes(), writeBuffer.getBytes().length, broadcastAddress, EipConstants.EIPUDPDISCOVERYDEFAULTPORT);
+                                DatagramPacket discoveryRequestPacket = new DatagramPacket(writeBuffer.getBytes(), writeBuffer.getBytes().length, broadcastAddress, Constants.EIPUDPDISCOVERYDEFAULTPORT);
                                 discoverySocket.send(discoveryRequestPacket);
                             } catch (SerializationException e) {
                                 logger.error("Error serializing EIP discovery request", e);
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/Constants.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/Constants.java
new file mode 100644
index 00000000000..7b5d5ff43de
--- /dev/null
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/Constants.java
@@ -0,0 +1,42 @@
+/*
+ * 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 Constants {
+
+  // Constant values.
+  public static final Integer DEFAULTPORT = 2404;
+}
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/IEC608705104Constants.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/IEC608705104Constants.java
deleted file mode 100644
index c69fdace61a..00000000000
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/IEC608705104Constants.java
+++ /dev/null
@@ -1,122 +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 IEC608705104Constants implements Message {
-
-  // Constant values.
-  public static final Integer DEFAULTPORT = 2404;
-
-  public IEC608705104Constants() {
-    super();
-  }
-
-  public int getDefaultPort() {
-    return DEFAULTPORT;
-  }
-
-  public void serialize(WriteBuffer writeBuffer) throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("IEC608705104Constants");
-
-    // Const Field (defaultPort)
-    writeConstField("defaultPort", DEFAULTPORT, writeUnsignedInt(writeBuffer, 16));
-
-    writeBuffer.popContext("IEC608705104Constants");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = 0;
-    IEC608705104Constants _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    // Const Field (defaultPort)
-    lengthInBits += 16;
-
-    return lengthInBits;
-  }
-
-  public static IEC608705104Constants staticParse(ReadBuffer readBuffer) throws ParseException {
-    readBuffer.pullContext("IEC608705104Constants");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    int defaultPort =
-        readConstField(
-            "defaultPort", readUnsignedInt(readBuffer, 16), IEC608705104Constants.DEFAULTPORT);
-
-    readBuffer.closeContext("IEC608705104Constants");
-    // Create the instance
-    IEC608705104Constants _iEC608705104Constants;
-    _iEC608705104Constants = new IEC608705104Constants();
-    return _iEC608705104Constants;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof IEC608705104Constants)) {
-      return false;
-    }
-    IEC608705104Constants that = (IEC608705104Constants) o;
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash();
-  }
-
-  @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/java/org/apache/plc4x/java/iec608705104/readwrite/configuration/Iec608705014TcpTransportConfiguration.java b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/configuration/Iec608705014TcpTransportConfiguration.java
index 1dc4bcd39cd..14015f73890 100644
--- a/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/configuration/Iec608705014TcpTransportConfiguration.java
+++ b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/configuration/Iec608705014TcpTransportConfiguration.java
@@ -19,14 +19,14 @@
 
 package org.apache.plc4x.java.iec608705104.readwrite.configuration;
 
-import org.apache.plc4x.java.iec608705104.readwrite.IEC608705104Constants;
+import org.apache.plc4x.java.iec608705104.readwrite.Constants;
 import org.apache.plc4x.java.transport.tcp.DefaultTcpTransportConfiguration;
 
 public class Iec608705014TcpTransportConfiguration extends DefaultTcpTransportConfiguration {
 
     @Override
     public int getDefaultPort() {
-        return IEC608705104Constants.DEFAULTPORT;
+        return Constants.DEFAULTPORT;
     }
 
 }
diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
index 9dfd4a00492..d92379b9d09 100644
--- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
+++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
@@ -867,7 +867,7 @@ public enum KnxManufacturer {
       (int) 739, (int) 800, (String) "Hangzhou Konke Information Technology Co., Ltd."),
   M_SHANGHAI_FANTE_DIGITAL_TECHNOLOGY_CO___LTD(
       (int) 740, (int) 801, (String) "Shanghai Fante Digital Technology Co., Ltd"),
-  M_CONFIO((int) 741, (int) 802, (String) "CONFIO"),
+  M_CONFIO_TECHNOLOGIES_PVT__LTD((int) 741, (int) 802, (String) "Confio Technologies Pvt. Ltd"),
   M_SONIC_TECHNOLOGIES((int) 742, (int) 803, (String) "Sonic Technologies"),
   M_SHANGHAI_INNOVATECH_INFORMATION_TECHNOLOGY_CO___LT(
       (int) 743, (int) 804, (String) "Shanghai Innovatech Information Technology Co., Lt"),
@@ -882,9 +882,13 @@ public enum KnxManufacturer {
   M_SHANGHAI_YUKON_AUTOMATION_TECHNOLOGIES_CO___LTD_(
       (int) 750, (int) 811, (String) "Shanghai YUKON Automation Technologies Co., Ltd."),
   M_TECCO_PTY_LTD((int) 751, (int) 812, (String) "Tecco Pty Ltd"),
-  M_ABB___RESERVED((int) 752, (int) 43954, (String) "ABB - reserved"),
+  M_A_LAN_TECHNOLOGIE((int) 752, (int) 813, (String) "A-LAN Technologie"),
+  M_VOLTAN_TECHNOLOGY((int) 753, (int) 814, (String) "Voltan Technology"),
+  M_BAERWINKEL_AND_STRASSER_GMBH((int) 754, (int) 815, (String) "Baerwinkel & Strasser GmbH"),
+  M_CATERLUX((int) 755, (int) 816, (String) "Caterlux"),
+  M_ABB___RESERVED((int) 756, (int) 43954, (String) "ABB - reserved"),
   M_BUSCH_JAEGER_ELEKTRO___RESERVED(
-      (int) 753, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
+      (int) 757, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
   private static final Map<Integer, KnxManufacturer> map;
 
   static {
diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/Constants.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/Constants.java
new file mode 100644
index 00000000000..24cd5b50123
--- /dev/null
+++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/Constants.java
@@ -0,0 +1,42 @@
+/*
+ * 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.modbus.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 Constants {
+
+  // Constant values.
+  public static final Integer MODBUSTCPDEFAULTPORT = 502;
+}
diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusConstants.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusConstants.java
deleted file mode 100644
index 0deb0866cd9..00000000000
--- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusConstants.java
+++ /dev/null
@@ -1,125 +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.modbus.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 ModbusConstants implements Message {
-
-  // Constant values.
-  public static final Integer MODBUSTCPDEFAULTPORT = 502;
-
-  public ModbusConstants() {
-    super();
-  }
-
-  public int getModbusTcpDefaultPort() {
-    return MODBUSTCPDEFAULTPORT;
-  }
-
-  public void serialize(WriteBuffer writeBuffer) throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("ModbusConstants");
-
-    // Const Field (modbusTcpDefaultPort)
-    writeConstField(
-        "modbusTcpDefaultPort", MODBUSTCPDEFAULTPORT, writeUnsignedInt(writeBuffer, 16));
-
-    writeBuffer.popContext("ModbusConstants");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = 0;
-    ModbusConstants _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    // Const Field (modbusTcpDefaultPort)
-    lengthInBits += 16;
-
-    return lengthInBits;
-  }
-
-  public static ModbusConstants staticParse(ReadBuffer readBuffer) throws ParseException {
-    readBuffer.pullContext("ModbusConstants");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    int modbusTcpDefaultPort =
-        readConstField(
-            "modbusTcpDefaultPort",
-            readUnsignedInt(readBuffer, 16),
-            ModbusConstants.MODBUSTCPDEFAULTPORT);
-
-    readBuffer.closeContext("ModbusConstants");
-    // Create the instance
-    ModbusConstants _modbusConstants;
-    _modbusConstants = new ModbusConstants();
-    return _modbusConstants;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof ModbusConstants)) {
-      return false;
-    }
-    ModbusConstants that = (ModbusConstants) o;
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash();
-  }
-
-  @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/modbus/src/main/java/org/apache/plc4x/java/modbus/tcp/config/ModbusTcpTransportConfiguration.java b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/tcp/config/ModbusTcpTransportConfiguration.java
index 506680e9bcc..cb49696b1fe 100644
--- a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/tcp/config/ModbusTcpTransportConfiguration.java
+++ b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/tcp/config/ModbusTcpTransportConfiguration.java
@@ -19,14 +19,14 @@
 
 package org.apache.plc4x.java.modbus.tcp.config;
 
-import org.apache.plc4x.java.modbus.readwrite.ModbusConstants;
+import org.apache.plc4x.java.modbus.readwrite.Constants;
 import org.apache.plc4x.java.transport.tcp.DefaultTcpTransportConfiguration;
 
 public class ModbusTcpTransportConfiguration extends DefaultTcpTransportConfiguration {
 
     @Override
     public int getDefaultPort() {
-        return ModbusConstants.MODBUSTCPDEFAULTPORT;
+        return Constants.MODBUSTCPDEFAULTPORT;
     }
 
 }
diff --git a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/tcp/discovery/ModbusPlcDiscoverer.java b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/tcp/discovery/ModbusPlcDiscoverer.java
index 2527acdb4d9..2d12659f054 100644
--- a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/tcp/discovery/ModbusPlcDiscoverer.java
+++ b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/tcp/discovery/ModbusPlcDiscoverer.java
@@ -104,7 +104,7 @@ private void executeDiscovery(CompletableFuture<PlcDiscoveryResponse> future, Pl
             try {
                 logger.info("Trying address: {}", possibleAddress);
                 // Try to get a connection to the given host and port.
-                Socket socket = new Socket(possibleAddress.getHostAddress(), ModbusConstants.MODBUSTCPDEFAULTPORT);
+                Socket socket = new Socket(possibleAddress.getHostAddress(), Constants.MODBUSTCPDEFAULTPORT);
 
                 logger.info("Connected: {}", possibleAddress);
 
diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/Constants.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/Constants.java
index 1a0b1083e70..65a7e7b972a 100644
--- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/Constants.java
+++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/Constants.java
@@ -35,87 +35,8 @@
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class Constants implements Message {
+public class Constants {
 
   // Constant values.
   public static final Integer TCPDEFAULTPORT = 4545;
-
-  public Constants() {
-    super();
-  }
-
-  public int getTcpDefaultPort() {
-    return TCPDEFAULTPORT;
-  }
-
-  public void serialize(WriteBuffer writeBuffer) throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("Constants");
-
-    // Const Field (tcpDefaultPort)
-    writeConstField("tcpDefaultPort", TCPDEFAULTPORT, writeUnsignedInt(writeBuffer, 16));
-
-    writeBuffer.popContext("Constants");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = 0;
-    Constants _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    // Const Field (tcpDefaultPort)
-    lengthInBits += 16;
-
-    return lengthInBits;
-  }
-
-  public static Constants staticParse(ReadBuffer readBuffer) throws ParseException {
-    readBuffer.pullContext("Constants");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    int tcpDefaultPort =
-        readConstField("tcpDefaultPort", readUnsignedInt(readBuffer, 16), Constants.TCPDEFAULTPORT);
-
-    readBuffer.closeContext("Constants");
-    // Create the instance
-    Constants _constants;
-    _constants = new Constants();
-    return _constants;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof Constants)) {
-      return false;
-    }
-    Constants that = (Constants) o;
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash();
-  }
-
-  @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/plc4x/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Constants.java b/plc4j/drivers/plc4x/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Constants.java
new file mode 100644
index 00000000000..5d34f46aa44
--- /dev/null
+++ b/plc4j/drivers/plc4x/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Constants.java
@@ -0,0 +1,42 @@
+/*
+ * 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.plc4x.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 Constants {
+
+  // Constant values.
+  public static final Integer PLC4XTCPDEFAULTPORT = 59837;
+}
diff --git a/plc4j/drivers/plc4x/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xConstants.java b/plc4j/drivers/plc4x/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xConstants.java
deleted file mode 100644
index 08bba8fc8a2..00000000000
--- a/plc4j/drivers/plc4x/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xConstants.java
+++ /dev/null
@@ -1,124 +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.plc4x.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 Plc4xConstants implements Message {
-
-  // Constant values.
-  public static final Integer PLC4XTCPDEFAULTPORT = 59837;
-
-  public Plc4xConstants() {
-    super();
-  }
-
-  public int getPlc4xTcpDefaultPort() {
-    return PLC4XTCPDEFAULTPORT;
-  }
-
-  public void serialize(WriteBuffer writeBuffer) throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("Plc4xConstants");
-
-    // Const Field (plc4xTcpDefaultPort)
-    writeConstField("plc4xTcpDefaultPort", PLC4XTCPDEFAULTPORT, writeUnsignedInt(writeBuffer, 16));
-
-    writeBuffer.popContext("Plc4xConstants");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = 0;
-    Plc4xConstants _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    // Const Field (plc4xTcpDefaultPort)
-    lengthInBits += 16;
-
-    return lengthInBits;
-  }
-
-  public static Plc4xConstants staticParse(ReadBuffer readBuffer) throws ParseException {
-    readBuffer.pullContext("Plc4xConstants");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    int plc4xTcpDefaultPort =
-        readConstField(
-            "plc4xTcpDefaultPort",
-            readUnsignedInt(readBuffer, 16),
-            Plc4xConstants.PLC4XTCPDEFAULTPORT);
-
-    readBuffer.closeContext("Plc4xConstants");
-    // Create the instance
-    Plc4xConstants _plc4xConstants;
-    _plc4xConstants = new Plc4xConstants();
-    return _plc4xConstants;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof Plc4xConstants)) {
-      return false;
-    }
-    Plc4xConstants that = (Plc4xConstants) o;
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash();
-  }
-
-  @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/plc4x/src/main/java/org/apache/plc4x/java/plc4x/config/Plc4xTcpTransportConfiguration.java b/plc4j/drivers/plc4x/src/main/java/org/apache/plc4x/java/plc4x/config/Plc4xTcpTransportConfiguration.java
index fcfce6f01eb..cb51004fab1 100644
--- a/plc4j/drivers/plc4x/src/main/java/org/apache/plc4x/java/plc4x/config/Plc4xTcpTransportConfiguration.java
+++ b/plc4j/drivers/plc4x/src/main/java/org/apache/plc4x/java/plc4x/config/Plc4xTcpTransportConfiguration.java
@@ -19,14 +19,14 @@
 
 package org.apache.plc4x.java.plc4x.config;
 
-import org.apache.plc4x.java.plc4x.readwrite.Plc4xConstants;
+import org.apache.plc4x.java.plc4x.readwrite.Constants;
 import org.apache.plc4x.java.transport.tcp.DefaultTcpTransportConfiguration;
 
 public class Plc4xTcpTransportConfiguration extends DefaultTcpTransportConfiguration {
 
     @Override
     public int getDefaultPort() {
-        return Plc4xConstants.PLC4XTCPDEFAULTPORT;
+        return Constants.PLC4XTCPDEFAULTPORT;
     }
 
 }
diff --git a/plc4j/drivers/profinet-ng/pom.xml b/plc4j/drivers/profinet-ng/pom.xml
index eec6c43c057..d1b7aab3d24 100644
--- a/plc4j/drivers/profinet-ng/pom.xml
+++ b/plc4j/drivers/profinet-ng/pom.xml
@@ -198,8 +198,7 @@
                   <outputFlavor>read-write</outputFlavor>
                   <outputDir>src/main/generated</outputDir>
                   <options>
-                    <generate-properties-for-parser-arguments>true</generate-properties-for-parser-arguments>
-                    <!-- We want properties that contain the values of reserved fields, if the value differs from the expected one -->
+                    <!-- We want properties that contain the values of reserved fields if the value differs from the expected one -->
                     <generate-properties-for-reserved-fields>true</generate-properties-for-reserved-fields>
                   </options>
                 </configuration>
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/DceRpc_Packet.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/DceRpc_Packet.java
index dd8e949fc7a..b6473c5dadf 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/DceRpc_Packet.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/DceRpc_Packet.java
@@ -66,7 +66,6 @@ public class DceRpc_Packet implements Message {
   protected final DceRpc_Operation operation;
   protected final short serialLow;
   protected final PnIoCm_Packet payload;
-
   // Reserved Fields
   private Boolean reservedField0;
   private Boolean reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/Ethernet_FramePayload_IPv4.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/Ethernet_FramePayload_IPv4.java
index 4c188ca3117..1ed61cbf8a3 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/Ethernet_FramePayload_IPv4.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/Ethernet_FramePayload_IPv4.java
@@ -60,7 +60,6 @@ public Integer getPacketType() {
   protected final int sourcePort;
   protected final int destinationPort;
   protected final DceRpc_Packet payload;
-
   // Reserved Fields
   private Boolean reservedField0;
 
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODReadRequestHeader.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODReadRequestHeader.java
index 9e2f205f2ac..f789e83c56f 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODReadRequestHeader.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODReadRequestHeader.java
@@ -219,7 +219,6 @@ protected void serializePnIoCm_BlockChild(WriteBuffer writeBuffer) throws Serial
         "targetArUuid",
         targetArUuid,
         writeComplex(writeBuffer),
-        org.apache.plc4x.java.profinet.readwrite.utils.StaticHelper.isNullUuid(getArUuid()),
         WithOption.WithByteOrder(ByteOrder.BIG_ENDIAN));
 
     // Padding Field (padding)
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODWriteRequestHeader.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODWriteRequestHeader.java
index 8ef93705c26..18470097515 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODWriteRequestHeader.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODWriteRequestHeader.java
@@ -227,7 +227,6 @@ protected void serializePnIoCm_BlockChild(WriteBuffer writeBuffer) throws Serial
         "userData",
         userData,
         writeComplex(writeBuffer),
-        (getIndex()) < (0x8000),
         WithOption.WithByteOrder(ByteOrder.BIG_ENDIAN));
 
     writeBuffer.popContext("IODWriteRequestHeader");
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_GetSet_Pdu.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_GetSet_Pdu.java
index cadd4260b9c..f79f6c82356 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_GetSet_Pdu.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_GetSet_Pdu.java
@@ -47,7 +47,6 @@ public class PcDcp_GetSet_Pdu extends PnDcp_Pdu implements Message {
   protected final boolean response;
   protected final long xid;
   protected final List<PnDcp_Block> blocks;
-
   // Reserved Fields
   private Byte reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_Pdu_DelayReq.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_Pdu_DelayReq.java
index b126b22be53..6319fae87ff 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_Pdu_DelayReq.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_Pdu_DelayReq.java
@@ -49,7 +49,6 @@ public class PcDcp_Pdu_DelayReq extends PnDcp_Pdu implements Message {
   protected final int sequenceId;
   protected final long delayInNs;
   protected final MacAddress portMacAddress;
-
   // Reserved Fields
   private Long reservedField0;
   private Long reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesAliasName.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesAliasName.java
index 3256b241c47..47d610008bf 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesAliasName.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesAliasName.java
@@ -48,16 +48,12 @@ public Short getSuboption() {
 
   // Properties.
   protected final byte[] aliasNameValue;
-
-  // Arguments.
-  protected final Integer blockLength;
   // Reserved Fields
   private Integer reservedField0;
 
-  public PnDcp_Block_DevicePropertiesAliasName(byte[] aliasNameValue, Integer blockLength) {
+  public PnDcp_Block_DevicePropertiesAliasName(byte[] aliasNameValue) {
     super();
     this.aliasNameValue = aliasNameValue;
-    this.blockLength = blockLength;
   }
 
   public byte[] getAliasNameValue() {
@@ -159,26 +155,23 @@ public static PnDcp_BlockBuilder staticParsePnDcp_BlockBuilder(
 
     readBuffer.closeContext("PnDcp_Block_DevicePropertiesAliasName");
     // Create the instance
-    return new PnDcp_Block_DevicePropertiesAliasNameBuilderImpl(
-        aliasNameValue, blockLength, reservedField0);
+    return new PnDcp_Block_DevicePropertiesAliasNameBuilderImpl(aliasNameValue, reservedField0);
   }
 
   public static class PnDcp_Block_DevicePropertiesAliasNameBuilderImpl
       implements PnDcp_Block.PnDcp_BlockBuilder {
     private final byte[] aliasNameValue;
-    private final Integer blockLength;
     private final Integer reservedField0;
 
     public PnDcp_Block_DevicePropertiesAliasNameBuilderImpl(
-        byte[] aliasNameValue, Integer blockLength, Integer reservedField0) {
+        byte[] aliasNameValue, Integer reservedField0) {
       this.aliasNameValue = aliasNameValue;
-      this.blockLength = blockLength;
       this.reservedField0 = reservedField0;
     }
 
     public PnDcp_Block_DevicePropertiesAliasName build() {
       PnDcp_Block_DevicePropertiesAliasName pnDcp_Block_DevicePropertiesAliasName =
-          new PnDcp_Block_DevicePropertiesAliasName(aliasNameValue, blockLength);
+          new PnDcp_Block_DevicePropertiesAliasName(aliasNameValue);
       pnDcp_Block_DevicePropertiesAliasName.reservedField0 = reservedField0;
       return pnDcp_Block_DevicePropertiesAliasName;
     }
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceId.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceId.java
index 01b772e1d55..d6c4b8ed156 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceId.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceId.java
@@ -49,7 +49,6 @@ public Short getSuboption() {
   // Properties.
   protected final int vendorId;
   protected final int deviceId;
-
   // Reserved Fields
   private Integer reservedField0;
 
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceInstance.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceInstance.java
index ed18654b739..a5450bbed6d 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceInstance.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceInstance.java
@@ -49,7 +49,6 @@ public Short getSuboption() {
   // Properties.
   protected final short deviceInstanceHigh;
   protected final short deviceInstanceLow;
-
   // Reserved Fields
   private Integer reservedField0;
 
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceOptions.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceOptions.java
index 41cf18fca0a..c44c05e698e 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceOptions.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceOptions.java
@@ -48,17 +48,13 @@ public Short getSuboption() {
 
   // Properties.
   protected final List<PnDcp_SupportedDeviceOption> supportedOptions;
-
-  // Arguments.
-  protected final Integer blockLength;
   // Reserved Fields
   private Integer reservedField0;
 
   public PnDcp_Block_DevicePropertiesDeviceOptions(
-      List<PnDcp_SupportedDeviceOption> supportedOptions, Integer blockLength) {
+      List<PnDcp_SupportedDeviceOption> supportedOptions) {
     super();
     this.supportedOptions = supportedOptions;
-    this.blockLength = blockLength;
   }
 
   public List<PnDcp_SupportedDeviceOption> getSupportedOptions() {
@@ -135,27 +131,23 @@ public static PnDcp_BlockBuilder staticParsePnDcp_BlockBuilder(
     readBuffer.closeContext("PnDcp_Block_DevicePropertiesDeviceOptions");
     // Create the instance
     return new PnDcp_Block_DevicePropertiesDeviceOptionsBuilderImpl(
-        supportedOptions, blockLength, reservedField0);
+        supportedOptions, reservedField0);
   }
 
   public static class PnDcp_Block_DevicePropertiesDeviceOptionsBuilderImpl
       implements PnDcp_Block.PnDcp_BlockBuilder {
     private final List<PnDcp_SupportedDeviceOption> supportedOptions;
-    private final Integer blockLength;
     private final Integer reservedField0;
 
     public PnDcp_Block_DevicePropertiesDeviceOptionsBuilderImpl(
-        List<PnDcp_SupportedDeviceOption> supportedOptions,
-        Integer blockLength,
-        Integer reservedField0) {
+        List<PnDcp_SupportedDeviceOption> supportedOptions, Integer reservedField0) {
       this.supportedOptions = supportedOptions;
-      this.blockLength = blockLength;
       this.reservedField0 = reservedField0;
     }
 
     public PnDcp_Block_DevicePropertiesDeviceOptions build() {
       PnDcp_Block_DevicePropertiesDeviceOptions pnDcp_Block_DevicePropertiesDeviceOptions =
-          new PnDcp_Block_DevicePropertiesDeviceOptions(supportedOptions, blockLength);
+          new PnDcp_Block_DevicePropertiesDeviceOptions(supportedOptions);
       pnDcp_Block_DevicePropertiesDeviceOptions.reservedField0 = reservedField0;
       return pnDcp_Block_DevicePropertiesDeviceOptions;
     }
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceRole.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceRole.java
index be4e6a960d8..e0ac1a881de 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceRole.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceRole.java
@@ -51,7 +51,6 @@ public Short getSuboption() {
   protected final boolean pnioMultidevive;
   protected final boolean pnioController;
   protected final boolean pnioDevice;
-
   // Reserved Fields
   private Integer reservedField0;
   private Short reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceVendor.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceVendor.java
index 50204dac258..4581ada7b09 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceVendor.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceVendor.java
@@ -48,16 +48,12 @@ public Short getSuboption() {
 
   // Properties.
   protected final byte[] deviceVendorValue;
-
-  // Arguments.
-  protected final Integer blockLength;
   // Reserved Fields
   private Integer reservedField0;
 
-  public PnDcp_Block_DevicePropertiesDeviceVendor(byte[] deviceVendorValue, Integer blockLength) {
+  public PnDcp_Block_DevicePropertiesDeviceVendor(byte[] deviceVendorValue) {
     super();
     this.deviceVendorValue = deviceVendorValue;
-    this.blockLength = blockLength;
   }
 
   public byte[] getDeviceVendorValue() {
@@ -160,25 +156,23 @@ public static PnDcp_BlockBuilder staticParsePnDcp_BlockBuilder(
     readBuffer.closeContext("PnDcp_Block_DevicePropertiesDeviceVendor");
     // Create the instance
     return new PnDcp_Block_DevicePropertiesDeviceVendorBuilderImpl(
-        deviceVendorValue, blockLength, reservedField0);
+        deviceVendorValue, reservedField0);
   }
 
   public static class PnDcp_Block_DevicePropertiesDeviceVendorBuilderImpl
       implements PnDcp_Block.PnDcp_BlockBuilder {
     private final byte[] deviceVendorValue;
-    private final Integer blockLength;
     private final Integer reservedField0;
 
     public PnDcp_Block_DevicePropertiesDeviceVendorBuilderImpl(
-        byte[] deviceVendorValue, Integer blockLength, Integer reservedField0) {
+        byte[] deviceVendorValue, Integer reservedField0) {
       this.deviceVendorValue = deviceVendorValue;
-      this.blockLength = blockLength;
       this.reservedField0 = reservedField0;
     }
 
     public PnDcp_Block_DevicePropertiesDeviceVendor build() {
       PnDcp_Block_DevicePropertiesDeviceVendor pnDcp_Block_DevicePropertiesDeviceVendor =
-          new PnDcp_Block_DevicePropertiesDeviceVendor(deviceVendorValue, blockLength);
+          new PnDcp_Block_DevicePropertiesDeviceVendor(deviceVendorValue);
       pnDcp_Block_DevicePropertiesDeviceVendor.reservedField0 = reservedField0;
       return pnDcp_Block_DevicePropertiesDeviceVendor;
     }
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesNameOfStation.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesNameOfStation.java
index 2e5f9f4498e..6a4ab08d151 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesNameOfStation.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesNameOfStation.java
@@ -48,16 +48,12 @@ public Short getSuboption() {
 
   // Properties.
   protected final byte[] nameOfStation;
-
-  // Arguments.
-  protected final Integer blockLength;
   // Reserved Fields
   private Integer reservedField0;
 
-  public PnDcp_Block_DevicePropertiesNameOfStation(byte[] nameOfStation, Integer blockLength) {
+  public PnDcp_Block_DevicePropertiesNameOfStation(byte[] nameOfStation) {
     super();
     this.nameOfStation = nameOfStation;
-    this.blockLength = blockLength;
   }
 
   public byte[] getNameOfStation() {
@@ -159,26 +155,23 @@ public static PnDcp_BlockBuilder staticParsePnDcp_BlockBuilder(
 
     readBuffer.closeContext("PnDcp_Block_DevicePropertiesNameOfStation");
     // Create the instance
-    return new PnDcp_Block_DevicePropertiesNameOfStationBuilderImpl(
-        nameOfStation, blockLength, reservedField0);
+    return new PnDcp_Block_DevicePropertiesNameOfStationBuilderImpl(nameOfStation, reservedField0);
   }
 
   public static class PnDcp_Block_DevicePropertiesNameOfStationBuilderImpl
       implements PnDcp_Block.PnDcp_BlockBuilder {
     private final byte[] nameOfStation;
-    private final Integer blockLength;
     private final Integer reservedField0;
 
     public PnDcp_Block_DevicePropertiesNameOfStationBuilderImpl(
-        byte[] nameOfStation, Integer blockLength, Integer reservedField0) {
+        byte[] nameOfStation, Integer reservedField0) {
       this.nameOfStation = nameOfStation;
-      this.blockLength = blockLength;
       this.reservedField0 = reservedField0;
     }
 
     public PnDcp_Block_DevicePropertiesNameOfStation build() {
       PnDcp_Block_DevicePropertiesNameOfStation pnDcp_Block_DevicePropertiesNameOfStation =
-          new PnDcp_Block_DevicePropertiesNameOfStation(nameOfStation, blockLength);
+          new PnDcp_Block_DevicePropertiesNameOfStation(nameOfStation);
       pnDcp_Block_DevicePropertiesNameOfStation.reservedField0 = reservedField0;
       return pnDcp_Block_DevicePropertiesNameOfStation;
     }
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpMacAddress.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpMacAddress.java
index f3fa71e912f..cd128dcdc0b 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpMacAddress.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpMacAddress.java
@@ -48,7 +48,6 @@ public Short getSuboption() {
 
   // Properties.
   protected final MacAddress macAddress;
-
   // Reserved Fields
   private Integer reservedField0;
 
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpParameter.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpParameter.java
index 5c15dbd1654..609c01014c3 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpParameter.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpParameter.java
@@ -53,7 +53,6 @@ public Short getSuboption() {
   protected final byte[] ipAddress;
   protected final byte[] subnetMask;
   protected final byte[] standardGateway;
-
   // Reserved Fields
   private Short reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyReq.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyReq.java
index 4bbce088afe..2c4478a0e7f 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyReq.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyReq.java
@@ -48,7 +48,6 @@ public class PnDcp_Pdu_IdentifyReq extends PnDcp_Pdu implements Message {
   protected final long xid;
   protected final int responseDelay;
   protected final List<PnDcp_Block> blocks;
-
   // Reserved Fields
   private Byte reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyRes.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyRes.java
index a07212ee5eb..66b68691a61 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyRes.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyRes.java
@@ -47,7 +47,6 @@ public class PnDcp_Pdu_IdentifyRes extends PnDcp_Pdu implements Message {
   protected final boolean notSupported;
   protected final long xid;
   protected final List<PnDcp_Block> blocks;
-
   // Reserved Fields
   private Byte reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_RealTimeCyclic.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_RealTimeCyclic.java
index f871c5e3d02..4a8ab675c10 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_RealTimeCyclic.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_RealTimeCyclic.java
@@ -48,7 +48,6 @@ public class PnDcp_Pdu_RealTimeCyclic extends PnDcp_Pdu implements Message {
   protected final boolean dataValid;
   protected final boolean redundancy;
   protected final boolean statePrimary;
-
   // Reserved Fields
   private Boolean reservedField0;
   private Boolean reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_ServiceType.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_ServiceType.java
index 1eadfb25ea3..a4d20beda75 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_ServiceType.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_ServiceType.java
@@ -40,7 +40,6 @@ public class PnDcp_ServiceType implements Message {
   // Properties.
   protected final boolean notSupported;
   protected final boolean response;
-
   // Reserved Fields
   private Byte reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_AlarmCrReq.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_AlarmCrReq.java
index 778720ffa0f..5001d4df0cf 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_AlarmCrReq.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_AlarmCrReq.java
@@ -55,7 +55,6 @@ public PnIoCm_BlockType getBlockType() {
   protected final int maxAlarmDataLength;
   protected final int alarmCtrTagHeaderHigh;
   protected final int alarmCtrTagHeaderLow;
-
   // Reserved Fields
   private Integer reservedField0;
 
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_ArReq.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_ArReq.java
index 7cfda91d64f..41976b98b71 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_ArReq.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_ArReq.java
@@ -62,7 +62,6 @@ public PnIoCm_BlockType getBlockType() {
   protected final int cmInitiatorActivityTimeoutFactor;
   protected final int cmInitiatorUdpRtPort;
   protected final String cmInitiatorStationName;
-
   // Reserved Fields
   private Integer reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_IoCrReq.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_IoCrReq.java
index 5c55853773a..2f6e220a699 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_IoCrReq.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_IoCrReq.java
@@ -65,7 +65,6 @@ public PnIoCm_BlockType getBlockType() {
   protected final int ioCrTagHeader;
   protected final MacAddress ioCrMulticastMacAdr;
   protected final List<PnIoCm_IoCrBlockReqApi> apis;
-
   // Reserved Fields
   private Integer reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ApplicationReady.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ApplicationReady.java
index b320d7f6a2c..fc7487f3383 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ApplicationReady.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ApplicationReady.java
@@ -48,7 +48,6 @@ public PnIoCm_BlockType getBlockType() {
   protected final Uuid arUuid;
   protected final int sessionKey;
   protected final int controlCommand;
-
   // Reserved Fields
   private Integer reservedField0;
   private Integer reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ParameterEnd.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ParameterEnd.java
index b86fe4031c8..1312ca305ee 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ParameterEnd.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ParameterEnd.java
@@ -48,7 +48,6 @@ public PnIoCm_BlockType getBlockType() {
   protected final Uuid arUuid;
   protected final int sessionKey;
   protected final int controlCommand;
-
   // Reserved Fields
   private Integer reservedField0;
   private Integer reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ApplicationReady.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ApplicationReady.java
index dc0cc7d69f5..cc5b0ad16e3 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ApplicationReady.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ApplicationReady.java
@@ -49,7 +49,6 @@ public PnIoCm_BlockType getBlockType() {
   protected final int sessionKey;
   protected final int controlCommand;
   protected final int controlBlockProperties;
-
   // Reserved Fields
   private Integer reservedField0;
   private Integer reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ParameterEnd.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ParameterEnd.java
index b453981998a..b097876599a 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ParameterEnd.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ParameterEnd.java
@@ -48,7 +48,6 @@ public PnIoCm_BlockType getBlockType() {
   protected final Uuid arUuid;
   protected final int sessionKey;
   protected final int controlCommand;
-
   // Reserved Fields
   private Integer reservedField0;
   private Integer reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitDataObject.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitDataObject.java
index 3caeb6805cd..90cf3395497 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitDataObject.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitDataObject.java
@@ -41,15 +41,10 @@ public class PnIoCm_DataUnitDataObject implements Message {
   protected final byte[] dataState;
   protected final PnIoCm_DataUnitIoCs iops;
 
-  // Arguments.
-  protected final Integer dataObjectLength;
-
-  public PnIoCm_DataUnitDataObject(
-      byte[] dataState, PnIoCm_DataUnitIoCs iops, Integer dataObjectLength) {
+  public PnIoCm_DataUnitDataObject(byte[] dataState, PnIoCm_DataUnitIoCs iops) {
     super();
     this.dataState = dataState;
     this.iops = iops;
-    this.dataObjectLength = dataObjectLength;
   }
 
   public byte[] getDataState() {
@@ -122,7 +117,7 @@ public static PnIoCm_DataUnitDataObject staticParse(
     readBuffer.closeContext("PnIoCm_DataUnitDataObject");
     // Create the instance
     PnIoCm_DataUnitDataObject _pnIoCm_DataUnitDataObject;
-    _pnIoCm_DataUnitDataObject = new PnIoCm_DataUnitDataObject(dataState, iops, dataObjectLength);
+    _pnIoCm_DataUnitDataObject = new PnIoCm_DataUnitDataObject(dataState, iops);
     return _pnIoCm_DataUnitDataObject;
   }
 
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitIoCs.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitIoCs.java
index 51ffd1dbb05..0096db587c1 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitIoCs.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitIoCs.java
@@ -41,7 +41,6 @@ public class PnIoCm_DataUnitIoCs implements Message {
   protected final boolean dataState;
   protected final byte instance;
   protected final boolean extension;
-
   // Reserved Fields
   private Byte reservedField0;
 
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Submodule.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Submodule.java
index 9e27ed7e02f..81fd6230225 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Submodule.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Submodule.java
@@ -47,7 +47,6 @@ public abstract class PnIoCm_Submodule implements Message {
   protected final boolean reduceOutputModuleDataLength;
   protected final boolean reduceInputModuleDataLength;
   protected final boolean sharedInput;
-
   // Reserved Fields
   private Short reservedField0;
 
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIo_CyclicServiceDataUnit.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIo_CyclicServiceDataUnit.java
index 1bbb0289eb3..cca18e4a69e 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIo_CyclicServiceDataUnit.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIo_CyclicServiceDataUnit.java
@@ -40,13 +40,9 @@ public class PnIo_CyclicServiceDataUnit implements Message {
   // Properties.
   protected final byte[] data;
 
-  // Arguments.
-  protected final Short dataUnitLength;
-
-  public PnIo_CyclicServiceDataUnit(byte[] data, Short dataUnitLength) {
+  public PnIo_CyclicServiceDataUnit(byte[] data) {
     super();
     this.data = data;
-    this.dataUnitLength = dataUnitLength;
   }
 
   public byte[] getData() {
@@ -94,7 +90,7 @@ public static PnIo_CyclicServiceDataUnit staticParse(ReadBuffer readBuffer, Shor
     readBuffer.closeContext("PnIo_CyclicServiceDataUnit");
     // Create the instance
     PnIo_CyclicServiceDataUnit _pnIo_CyclicServiceDataUnit;
-    _pnIo_CyclicServiceDataUnit = new PnIo_CyclicServiceDataUnit(data, dataUnitLength);
+    _pnIo_CyclicServiceDataUnit = new PnIo_CyclicServiceDataUnit(data);
     return _pnIo_CyclicServiceDataUnit;
   }
 
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvProfibusSubTypePortStatus.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvProfibusSubTypePortStatus.java
index 007095f49b2..05c83b2501b 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvProfibusSubTypePortStatus.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvProfibusSubTypePortStatus.java
@@ -47,7 +47,6 @@ public TlvProfibusSubType getSubType() {
   protected final boolean preample;
   protected final boolean fragmentation;
   protected final byte rtClass3PortStatus;
-
   // Reserved Fields
   private Byte reservedField0;
   private Short reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvSystemCapabilities.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvSystemCapabilities.java
index 476e8f6a45e..054f8942e30 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvSystemCapabilities.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvSystemCapabilities.java
@@ -59,7 +59,6 @@ public TlvType getTlvId() {
   protected final boolean bridgeEnabled;
   protected final boolean repeaterEnabled;
   protected final boolean otherEnabled;
-
   // Reserved Fields
   private Short reservedField0;
   private Short reservedField1;
diff --git a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/UserData.java b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/UserData.java
index d9300b3d460..21d8d4f36fd 100644
--- a/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/UserData.java
+++ b/plc4j/drivers/profinet-ng/src/main/generated/org/apache/plc4x/java/profinet/readwrite/UserData.java
@@ -40,13 +40,9 @@ public class UserData implements Message {
   // Properties.
   protected final byte[] data;
 
-  // Arguments.
-  protected final Long recordDataLength;
-
-  public UserData(byte[] data, Long recordDataLength) {
+  public UserData(byte[] data) {
     super();
     this.data = data;
-    this.recordDataLength = recordDataLength;
   }
 
   public byte[] getData() {
@@ -102,7 +98,7 @@ public static UserData staticParse(ReadBuffer readBuffer, Long recordDataLength)
     readBuffer.closeContext("UserData");
     // Create the instance
     UserData _userData;
-    _userData = new UserData(data, recordDataLength);
+    _userData = new UserData(data);
     return _userData;
   }
 
diff --git a/plc4j/drivers/profinet/pom.xml b/plc4j/drivers/profinet/pom.xml
index 661bcf8ec75..039c714043e 100644
--- a/plc4j/drivers/profinet/pom.xml
+++ b/plc4j/drivers/profinet/pom.xml
@@ -204,7 +204,6 @@
                   <outputFlavor>read-write</outputFlavor>
                   <outputDir>src/main/generated</outputDir>
                   <options>
-                    <generate-properties-for-parser-arguments>true</generate-properties-for-parser-arguments>
                     <!-- We want properties that contain the values of reserved fields, if the value differs from the expected one -->
                     <generate-properties-for-reserved-fields>true</generate-properties-for-reserved-fields>
                   </options>
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/DceRpc_Packet.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/DceRpc_Packet.java
index dd8e949fc7a..b6473c5dadf 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/DceRpc_Packet.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/DceRpc_Packet.java
@@ -66,7 +66,6 @@ public class DceRpc_Packet implements Message {
   protected final DceRpc_Operation operation;
   protected final short serialLow;
   protected final PnIoCm_Packet payload;
-
   // Reserved Fields
   private Boolean reservedField0;
   private Boolean reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/Ethernet_FramePayload_IPv4.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/Ethernet_FramePayload_IPv4.java
index 4c188ca3117..1ed61cbf8a3 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/Ethernet_FramePayload_IPv4.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/Ethernet_FramePayload_IPv4.java
@@ -60,7 +60,6 @@ public Integer getPacketType() {
   protected final int sourcePort;
   protected final int destinationPort;
   protected final DceRpc_Packet payload;
-
   // Reserved Fields
   private Boolean reservedField0;
 
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODReadRequestHeader.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODReadRequestHeader.java
index 9e2f205f2ac..f789e83c56f 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODReadRequestHeader.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODReadRequestHeader.java
@@ -219,7 +219,6 @@ protected void serializePnIoCm_BlockChild(WriteBuffer writeBuffer) throws Serial
         "targetArUuid",
         targetArUuid,
         writeComplex(writeBuffer),
-        org.apache.plc4x.java.profinet.readwrite.utils.StaticHelper.isNullUuid(getArUuid()),
         WithOption.WithByteOrder(ByteOrder.BIG_ENDIAN));
 
     // Padding Field (padding)
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODWriteRequestHeader.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODWriteRequestHeader.java
index 8ef93705c26..18470097515 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODWriteRequestHeader.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/IODWriteRequestHeader.java
@@ -227,7 +227,6 @@ protected void serializePnIoCm_BlockChild(WriteBuffer writeBuffer) throws Serial
         "userData",
         userData,
         writeComplex(writeBuffer),
-        (getIndex()) < (0x8000),
         WithOption.WithByteOrder(ByteOrder.BIG_ENDIAN));
 
     writeBuffer.popContext("IODWriteRequestHeader");
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_GetSet_Pdu.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_GetSet_Pdu.java
index cadd4260b9c..f79f6c82356 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_GetSet_Pdu.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_GetSet_Pdu.java
@@ -47,7 +47,6 @@ public class PcDcp_GetSet_Pdu extends PnDcp_Pdu implements Message {
   protected final boolean response;
   protected final long xid;
   protected final List<PnDcp_Block> blocks;
-
   // Reserved Fields
   private Byte reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_Pdu_DelayReq.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_Pdu_DelayReq.java
index b126b22be53..6319fae87ff 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_Pdu_DelayReq.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PcDcp_Pdu_DelayReq.java
@@ -49,7 +49,6 @@ public class PcDcp_Pdu_DelayReq extends PnDcp_Pdu implements Message {
   protected final int sequenceId;
   protected final long delayInNs;
   protected final MacAddress portMacAddress;
-
   // Reserved Fields
   private Long reservedField0;
   private Long reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesAliasName.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesAliasName.java
index 3256b241c47..47d610008bf 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesAliasName.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesAliasName.java
@@ -48,16 +48,12 @@ public Short getSuboption() {
 
   // Properties.
   protected final byte[] aliasNameValue;
-
-  // Arguments.
-  protected final Integer blockLength;
   // Reserved Fields
   private Integer reservedField0;
 
-  public PnDcp_Block_DevicePropertiesAliasName(byte[] aliasNameValue, Integer blockLength) {
+  public PnDcp_Block_DevicePropertiesAliasName(byte[] aliasNameValue) {
     super();
     this.aliasNameValue = aliasNameValue;
-    this.blockLength = blockLength;
   }
 
   public byte[] getAliasNameValue() {
@@ -159,26 +155,23 @@ public static PnDcp_BlockBuilder staticParsePnDcp_BlockBuilder(
 
     readBuffer.closeContext("PnDcp_Block_DevicePropertiesAliasName");
     // Create the instance
-    return new PnDcp_Block_DevicePropertiesAliasNameBuilderImpl(
-        aliasNameValue, blockLength, reservedField0);
+    return new PnDcp_Block_DevicePropertiesAliasNameBuilderImpl(aliasNameValue, reservedField0);
   }
 
   public static class PnDcp_Block_DevicePropertiesAliasNameBuilderImpl
       implements PnDcp_Block.PnDcp_BlockBuilder {
     private final byte[] aliasNameValue;
-    private final Integer blockLength;
     private final Integer reservedField0;
 
     public PnDcp_Block_DevicePropertiesAliasNameBuilderImpl(
-        byte[] aliasNameValue, Integer blockLength, Integer reservedField0) {
+        byte[] aliasNameValue, Integer reservedField0) {
       this.aliasNameValue = aliasNameValue;
-      this.blockLength = blockLength;
       this.reservedField0 = reservedField0;
     }
 
     public PnDcp_Block_DevicePropertiesAliasName build() {
       PnDcp_Block_DevicePropertiesAliasName pnDcp_Block_DevicePropertiesAliasName =
-          new PnDcp_Block_DevicePropertiesAliasName(aliasNameValue, blockLength);
+          new PnDcp_Block_DevicePropertiesAliasName(aliasNameValue);
       pnDcp_Block_DevicePropertiesAliasName.reservedField0 = reservedField0;
       return pnDcp_Block_DevicePropertiesAliasName;
     }
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceId.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceId.java
index 01b772e1d55..d6c4b8ed156 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceId.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceId.java
@@ -49,7 +49,6 @@ public Short getSuboption() {
   // Properties.
   protected final int vendorId;
   protected final int deviceId;
-
   // Reserved Fields
   private Integer reservedField0;
 
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceInstance.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceInstance.java
index ed18654b739..a5450bbed6d 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceInstance.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceInstance.java
@@ -49,7 +49,6 @@ public Short getSuboption() {
   // Properties.
   protected final short deviceInstanceHigh;
   protected final short deviceInstanceLow;
-
   // Reserved Fields
   private Integer reservedField0;
 
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceOptions.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceOptions.java
index 41cf18fca0a..c44c05e698e 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceOptions.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceOptions.java
@@ -48,17 +48,13 @@ public Short getSuboption() {
 
   // Properties.
   protected final List<PnDcp_SupportedDeviceOption> supportedOptions;
-
-  // Arguments.
-  protected final Integer blockLength;
   // Reserved Fields
   private Integer reservedField0;
 
   public PnDcp_Block_DevicePropertiesDeviceOptions(
-      List<PnDcp_SupportedDeviceOption> supportedOptions, Integer blockLength) {
+      List<PnDcp_SupportedDeviceOption> supportedOptions) {
     super();
     this.supportedOptions = supportedOptions;
-    this.blockLength = blockLength;
   }
 
   public List<PnDcp_SupportedDeviceOption> getSupportedOptions() {
@@ -135,27 +131,23 @@ public static PnDcp_BlockBuilder staticParsePnDcp_BlockBuilder(
     readBuffer.closeContext("PnDcp_Block_DevicePropertiesDeviceOptions");
     // Create the instance
     return new PnDcp_Block_DevicePropertiesDeviceOptionsBuilderImpl(
-        supportedOptions, blockLength, reservedField0);
+        supportedOptions, reservedField0);
   }
 
   public static class PnDcp_Block_DevicePropertiesDeviceOptionsBuilderImpl
       implements PnDcp_Block.PnDcp_BlockBuilder {
     private final List<PnDcp_SupportedDeviceOption> supportedOptions;
-    private final Integer blockLength;
     private final Integer reservedField0;
 
     public PnDcp_Block_DevicePropertiesDeviceOptionsBuilderImpl(
-        List<PnDcp_SupportedDeviceOption> supportedOptions,
-        Integer blockLength,
-        Integer reservedField0) {
+        List<PnDcp_SupportedDeviceOption> supportedOptions, Integer reservedField0) {
       this.supportedOptions = supportedOptions;
-      this.blockLength = blockLength;
       this.reservedField0 = reservedField0;
     }
 
     public PnDcp_Block_DevicePropertiesDeviceOptions build() {
       PnDcp_Block_DevicePropertiesDeviceOptions pnDcp_Block_DevicePropertiesDeviceOptions =
-          new PnDcp_Block_DevicePropertiesDeviceOptions(supportedOptions, blockLength);
+          new PnDcp_Block_DevicePropertiesDeviceOptions(supportedOptions);
       pnDcp_Block_DevicePropertiesDeviceOptions.reservedField0 = reservedField0;
       return pnDcp_Block_DevicePropertiesDeviceOptions;
     }
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceRole.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceRole.java
index be4e6a960d8..e0ac1a881de 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceRole.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceRole.java
@@ -51,7 +51,6 @@ public Short getSuboption() {
   protected final boolean pnioMultidevive;
   protected final boolean pnioController;
   protected final boolean pnioDevice;
-
   // Reserved Fields
   private Integer reservedField0;
   private Short reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceVendor.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceVendor.java
index 50204dac258..4581ada7b09 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceVendor.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesDeviceVendor.java
@@ -48,16 +48,12 @@ public Short getSuboption() {
 
   // Properties.
   protected final byte[] deviceVendorValue;
-
-  // Arguments.
-  protected final Integer blockLength;
   // Reserved Fields
   private Integer reservedField0;
 
-  public PnDcp_Block_DevicePropertiesDeviceVendor(byte[] deviceVendorValue, Integer blockLength) {
+  public PnDcp_Block_DevicePropertiesDeviceVendor(byte[] deviceVendorValue) {
     super();
     this.deviceVendorValue = deviceVendorValue;
-    this.blockLength = blockLength;
   }
 
   public byte[] getDeviceVendorValue() {
@@ -160,25 +156,23 @@ public static PnDcp_BlockBuilder staticParsePnDcp_BlockBuilder(
     readBuffer.closeContext("PnDcp_Block_DevicePropertiesDeviceVendor");
     // Create the instance
     return new PnDcp_Block_DevicePropertiesDeviceVendorBuilderImpl(
-        deviceVendorValue, blockLength, reservedField0);
+        deviceVendorValue, reservedField0);
   }
 
   public static class PnDcp_Block_DevicePropertiesDeviceVendorBuilderImpl
       implements PnDcp_Block.PnDcp_BlockBuilder {
     private final byte[] deviceVendorValue;
-    private final Integer blockLength;
     private final Integer reservedField0;
 
     public PnDcp_Block_DevicePropertiesDeviceVendorBuilderImpl(
-        byte[] deviceVendorValue, Integer blockLength, Integer reservedField0) {
+        byte[] deviceVendorValue, Integer reservedField0) {
       this.deviceVendorValue = deviceVendorValue;
-      this.blockLength = blockLength;
       this.reservedField0 = reservedField0;
     }
 
     public PnDcp_Block_DevicePropertiesDeviceVendor build() {
       PnDcp_Block_DevicePropertiesDeviceVendor pnDcp_Block_DevicePropertiesDeviceVendor =
-          new PnDcp_Block_DevicePropertiesDeviceVendor(deviceVendorValue, blockLength);
+          new PnDcp_Block_DevicePropertiesDeviceVendor(deviceVendorValue);
       pnDcp_Block_DevicePropertiesDeviceVendor.reservedField0 = reservedField0;
       return pnDcp_Block_DevicePropertiesDeviceVendor;
     }
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesNameOfStation.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesNameOfStation.java
index 2e5f9f4498e..6a4ab08d151 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesNameOfStation.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesNameOfStation.java
@@ -48,16 +48,12 @@ public Short getSuboption() {
 
   // Properties.
   protected final byte[] nameOfStation;
-
-  // Arguments.
-  protected final Integer blockLength;
   // Reserved Fields
   private Integer reservedField0;
 
-  public PnDcp_Block_DevicePropertiesNameOfStation(byte[] nameOfStation, Integer blockLength) {
+  public PnDcp_Block_DevicePropertiesNameOfStation(byte[] nameOfStation) {
     super();
     this.nameOfStation = nameOfStation;
-    this.blockLength = blockLength;
   }
 
   public byte[] getNameOfStation() {
@@ -159,26 +155,23 @@ public static PnDcp_BlockBuilder staticParsePnDcp_BlockBuilder(
 
     readBuffer.closeContext("PnDcp_Block_DevicePropertiesNameOfStation");
     // Create the instance
-    return new PnDcp_Block_DevicePropertiesNameOfStationBuilderImpl(
-        nameOfStation, blockLength, reservedField0);
+    return new PnDcp_Block_DevicePropertiesNameOfStationBuilderImpl(nameOfStation, reservedField0);
   }
 
   public static class PnDcp_Block_DevicePropertiesNameOfStationBuilderImpl
       implements PnDcp_Block.PnDcp_BlockBuilder {
     private final byte[] nameOfStation;
-    private final Integer blockLength;
     private final Integer reservedField0;
 
     public PnDcp_Block_DevicePropertiesNameOfStationBuilderImpl(
-        byte[] nameOfStation, Integer blockLength, Integer reservedField0) {
+        byte[] nameOfStation, Integer reservedField0) {
       this.nameOfStation = nameOfStation;
-      this.blockLength = blockLength;
       this.reservedField0 = reservedField0;
     }
 
     public PnDcp_Block_DevicePropertiesNameOfStation build() {
       PnDcp_Block_DevicePropertiesNameOfStation pnDcp_Block_DevicePropertiesNameOfStation =
-          new PnDcp_Block_DevicePropertiesNameOfStation(nameOfStation, blockLength);
+          new PnDcp_Block_DevicePropertiesNameOfStation(nameOfStation);
       pnDcp_Block_DevicePropertiesNameOfStation.reservedField0 = reservedField0;
       return pnDcp_Block_DevicePropertiesNameOfStation;
     }
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpMacAddress.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpMacAddress.java
index f3fa71e912f..cd128dcdc0b 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpMacAddress.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpMacAddress.java
@@ -48,7 +48,6 @@ public Short getSuboption() {
 
   // Properties.
   protected final MacAddress macAddress;
-
   // Reserved Fields
   private Integer reservedField0;
 
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpParameter.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpParameter.java
index 5c15dbd1654..609c01014c3 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpParameter.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_IpParameter.java
@@ -53,7 +53,6 @@ public Short getSuboption() {
   protected final byte[] ipAddress;
   protected final byte[] subnetMask;
   protected final byte[] standardGateway;
-
   // Reserved Fields
   private Short reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyReq.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyReq.java
index 4bbce088afe..2c4478a0e7f 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyReq.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyReq.java
@@ -48,7 +48,6 @@ public class PnDcp_Pdu_IdentifyReq extends PnDcp_Pdu implements Message {
   protected final long xid;
   protected final int responseDelay;
   protected final List<PnDcp_Block> blocks;
-
   // Reserved Fields
   private Byte reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyRes.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyRes.java
index a07212ee5eb..66b68691a61 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyRes.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_IdentifyRes.java
@@ -47,7 +47,6 @@ public class PnDcp_Pdu_IdentifyRes extends PnDcp_Pdu implements Message {
   protected final boolean notSupported;
   protected final long xid;
   protected final List<PnDcp_Block> blocks;
-
   // Reserved Fields
   private Byte reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_RealTimeCyclic.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_RealTimeCyclic.java
index f871c5e3d02..4a8ab675c10 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_RealTimeCyclic.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Pdu_RealTimeCyclic.java
@@ -48,7 +48,6 @@ public class PnDcp_Pdu_RealTimeCyclic extends PnDcp_Pdu implements Message {
   protected final boolean dataValid;
   protected final boolean redundancy;
   protected final boolean statePrimary;
-
   // Reserved Fields
   private Boolean reservedField0;
   private Boolean reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_ServiceType.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_ServiceType.java
index 1eadfb25ea3..a4d20beda75 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_ServiceType.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_ServiceType.java
@@ -40,7 +40,6 @@ public class PnDcp_ServiceType implements Message {
   // Properties.
   protected final boolean notSupported;
   protected final boolean response;
-
   // Reserved Fields
   private Byte reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_AlarmCrReq.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_AlarmCrReq.java
index 778720ffa0f..5001d4df0cf 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_AlarmCrReq.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_AlarmCrReq.java
@@ -55,7 +55,6 @@ public PnIoCm_BlockType getBlockType() {
   protected final int maxAlarmDataLength;
   protected final int alarmCtrTagHeaderHigh;
   protected final int alarmCtrTagHeaderLow;
-
   // Reserved Fields
   private Integer reservedField0;
 
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_ArReq.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_ArReq.java
index 7cfda91d64f..41976b98b71 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_ArReq.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_ArReq.java
@@ -62,7 +62,6 @@ public PnIoCm_BlockType getBlockType() {
   protected final int cmInitiatorActivityTimeoutFactor;
   protected final int cmInitiatorUdpRtPort;
   protected final String cmInitiatorStationName;
-
   // Reserved Fields
   private Integer reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_IoCrReq.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_IoCrReq.java
index 5c55853773a..2f6e220a699 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_IoCrReq.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Block_IoCrReq.java
@@ -65,7 +65,6 @@ public PnIoCm_BlockType getBlockType() {
   protected final int ioCrTagHeader;
   protected final MacAddress ioCrMulticastMacAdr;
   protected final List<PnIoCm_IoCrBlockReqApi> apis;
-
   // Reserved Fields
   private Integer reservedField0;
   private Byte reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ApplicationReady.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ApplicationReady.java
index b320d7f6a2c..fc7487f3383 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ApplicationReady.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ApplicationReady.java
@@ -48,7 +48,6 @@ public PnIoCm_BlockType getBlockType() {
   protected final Uuid arUuid;
   protected final int sessionKey;
   protected final int controlCommand;
-
   // Reserved Fields
   private Integer reservedField0;
   private Integer reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ParameterEnd.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ParameterEnd.java
index b86fe4031c8..1312ca305ee 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ParameterEnd.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Request_ParameterEnd.java
@@ -48,7 +48,6 @@ public PnIoCm_BlockType getBlockType() {
   protected final Uuid arUuid;
   protected final int sessionKey;
   protected final int controlCommand;
-
   // Reserved Fields
   private Integer reservedField0;
   private Integer reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ApplicationReady.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ApplicationReady.java
index dc0cc7d69f5..cc5b0ad16e3 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ApplicationReady.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ApplicationReady.java
@@ -49,7 +49,6 @@ public PnIoCm_BlockType getBlockType() {
   protected final int sessionKey;
   protected final int controlCommand;
   protected final int controlBlockProperties;
-
   // Reserved Fields
   private Integer reservedField0;
   private Integer reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ParameterEnd.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ParameterEnd.java
index b453981998a..b097876599a 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ParameterEnd.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Control_Response_ParameterEnd.java
@@ -48,7 +48,6 @@ public PnIoCm_BlockType getBlockType() {
   protected final Uuid arUuid;
   protected final int sessionKey;
   protected final int controlCommand;
-
   // Reserved Fields
   private Integer reservedField0;
   private Integer reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitDataObject.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitDataObject.java
index 3caeb6805cd..90cf3395497 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitDataObject.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitDataObject.java
@@ -41,15 +41,10 @@ public class PnIoCm_DataUnitDataObject implements Message {
   protected final byte[] dataState;
   protected final PnIoCm_DataUnitIoCs iops;
 
-  // Arguments.
-  protected final Integer dataObjectLength;
-
-  public PnIoCm_DataUnitDataObject(
-      byte[] dataState, PnIoCm_DataUnitIoCs iops, Integer dataObjectLength) {
+  public PnIoCm_DataUnitDataObject(byte[] dataState, PnIoCm_DataUnitIoCs iops) {
     super();
     this.dataState = dataState;
     this.iops = iops;
-    this.dataObjectLength = dataObjectLength;
   }
 
   public byte[] getDataState() {
@@ -122,7 +117,7 @@ public static PnIoCm_DataUnitDataObject staticParse(
     readBuffer.closeContext("PnIoCm_DataUnitDataObject");
     // Create the instance
     PnIoCm_DataUnitDataObject _pnIoCm_DataUnitDataObject;
-    _pnIoCm_DataUnitDataObject = new PnIoCm_DataUnitDataObject(dataState, iops, dataObjectLength);
+    _pnIoCm_DataUnitDataObject = new PnIoCm_DataUnitDataObject(dataState, iops);
     return _pnIoCm_DataUnitDataObject;
   }
 
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitIoCs.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitIoCs.java
index 51ffd1dbb05..0096db587c1 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitIoCs.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_DataUnitIoCs.java
@@ -41,7 +41,6 @@ public class PnIoCm_DataUnitIoCs implements Message {
   protected final boolean dataState;
   protected final byte instance;
   protected final boolean extension;
-
   // Reserved Fields
   private Byte reservedField0;
 
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Submodule.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Submodule.java
index 9e27ed7e02f..81fd6230225 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Submodule.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIoCm_Submodule.java
@@ -47,7 +47,6 @@ public abstract class PnIoCm_Submodule implements Message {
   protected final boolean reduceOutputModuleDataLength;
   protected final boolean reduceInputModuleDataLength;
   protected final boolean sharedInput;
-
   // Reserved Fields
   private Short reservedField0;
 
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIo_CyclicServiceDataUnit.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIo_CyclicServiceDataUnit.java
index 1bbb0289eb3..cca18e4a69e 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIo_CyclicServiceDataUnit.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnIo_CyclicServiceDataUnit.java
@@ -40,13 +40,9 @@ public class PnIo_CyclicServiceDataUnit implements Message {
   // Properties.
   protected final byte[] data;
 
-  // Arguments.
-  protected final Short dataUnitLength;
-
-  public PnIo_CyclicServiceDataUnit(byte[] data, Short dataUnitLength) {
+  public PnIo_CyclicServiceDataUnit(byte[] data) {
     super();
     this.data = data;
-    this.dataUnitLength = dataUnitLength;
   }
 
   public byte[] getData() {
@@ -94,7 +90,7 @@ public static PnIo_CyclicServiceDataUnit staticParse(ReadBuffer readBuffer, Shor
     readBuffer.closeContext("PnIo_CyclicServiceDataUnit");
     // Create the instance
     PnIo_CyclicServiceDataUnit _pnIo_CyclicServiceDataUnit;
-    _pnIo_CyclicServiceDataUnit = new PnIo_CyclicServiceDataUnit(data, dataUnitLength);
+    _pnIo_CyclicServiceDataUnit = new PnIo_CyclicServiceDataUnit(data);
     return _pnIo_CyclicServiceDataUnit;
   }
 
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvProfibusSubTypePortStatus.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvProfibusSubTypePortStatus.java
index 007095f49b2..05c83b2501b 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvProfibusSubTypePortStatus.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvProfibusSubTypePortStatus.java
@@ -47,7 +47,6 @@ public TlvProfibusSubType getSubType() {
   protected final boolean preample;
   protected final boolean fragmentation;
   protected final byte rtClass3PortStatus;
-
   // Reserved Fields
   private Byte reservedField0;
   private Short reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvSystemCapabilities.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvSystemCapabilities.java
index 476e8f6a45e..054f8942e30 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvSystemCapabilities.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvSystemCapabilities.java
@@ -59,7 +59,6 @@ public TlvType getTlvId() {
   protected final boolean bridgeEnabled;
   protected final boolean repeaterEnabled;
   protected final boolean otherEnabled;
-
   // Reserved Fields
   private Short reservedField0;
   private Short reservedField1;
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/UserData.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/UserData.java
index d9300b3d460..21d8d4f36fd 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/UserData.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/UserData.java
@@ -40,13 +40,9 @@ public class UserData implements Message {
   // Properties.
   protected final byte[] data;
 
-  // Arguments.
-  protected final Long recordDataLength;
-
-  public UserData(byte[] data, Long recordDataLength) {
+  public UserData(byte[] data) {
     super();
     this.data = data;
-    this.recordDataLength = recordDataLength;
   }
 
   public byte[] getData() {
@@ -102,7 +98,7 @@ public static UserData staticParse(ReadBuffer readBuffer, Long recordDataLength)
     readBuffer.closeContext("UserData");
     // Create the instance
     UserData _userData;
-    _userData = new UserData(data, recordDataLength);
+    _userData = new UserData(data);
     return _userData;
   }
 
diff --git a/plc4j/drivers/profinet/src/main/java/org/apache/plc4x/java/profinet/device/ProfinetDevice.java b/plc4j/drivers/profinet/src/main/java/org/apache/plc4x/java/profinet/device/ProfinetDevice.java
index 59c470989f8..4233502960d 100644
--- a/plc4j/drivers/profinet/src/main/java/org/apache/plc4x/java/profinet/device/ProfinetDevice.java
+++ b/plc4j/drivers/profinet/src/main/java/org/apache/plc4x/java/profinet/device/ProfinetDevice.java
@@ -736,7 +736,7 @@ public DceRpc_Packet create() {
                                 0x0001,
                                 record.getIndex(),
                                 record.getLength(),
-                                new UserData(ByteBuffer.allocate(4).putInt(Integer.valueOf(record.getRef().getDefaultValue())).array(), (long) record.getLength())
+                                new UserData(ByteBuffer.allocate(4).putInt(Integer.parseInt(record.getRef().getDefaultValue())).array())
                             ));
                         seqNumber += 1;
                     }
@@ -1005,8 +1005,7 @@ public Ethernet_Frame create() {
                     // TODO: Need to specify the datatype length based on the gsd file
                     PnIoCm_DataUnitDataObject ioc = new PnIoCm_DataUnitDataObject(
                         new byte[1],
-                        new PnIoCm_DataUnitIoCs(false, (byte) 0x03, false),
-                        1
+                        new PnIoCm_DataUnitIoCs(false, (byte) 0x03, false)
                     );
                     ioc.serialize(buffer);
                 }
@@ -1028,7 +1027,7 @@ public Ethernet_Frame create() {
                         new Ethernet_FramePayload_PnDcp(
                             new PnDcp_Pdu_RealTimeCyclic(
                                 deviceContext.getOutputReq().getFrameId(),
-                                new PnIo_CyclicServiceDataUnit(buffer.getBytes(), (short) deviceContext.getOutputReq().getDataLength()),
+                                new PnIo_CyclicServiceDataUnit(buffer.getBytes()),
                                 elapsedTime,
                                 false,
                                 true,
@@ -1054,7 +1053,7 @@ public Ethernet_Frame create() {
                         new Ethernet_FramePayload_PnDcp(
                             new PnDcp_Pdu_RealTimeCyclic(
                                 deviceContext.getOutputReq().getFrameId(),
-                                new PnIo_CyclicServiceDataUnit(new byte[]{}, (short) 0),
+                                new PnIo_CyclicServiceDataUnit(new byte[]{}),
                                 elapsedTime,
                                 false,
                                 true,
diff --git a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/bacnet/BacnetServerModule.java b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/bacnet/BacnetServerModule.java
index 6459a0c82b7..a907a0fb742 100644
--- a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/bacnet/BacnetServerModule.java
+++ b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/bacnet/BacnetServerModule.java
@@ -32,7 +32,7 @@
 import io.netty.util.concurrent.FastThreadLocal;
 import org.apache.plc4x.java.bacnetip.BacNetIpDriver;
 import org.apache.plc4x.java.bacnetip.readwrite.BVLC;
-import org.apache.plc4x.java.bacnetip.readwrite.BacnetConstants;
+import org.apache.plc4x.java.bacnetip.readwrite.Constants;
 import org.apache.plc4x.java.spi.connection.GeneratedProtocolMessageCodec;
 import org.apache.plc4x.java.spi.generation.ByteOrder;
 import org.apache.plc4x.simulator.PlcSimulatorConfig;
@@ -109,7 +109,7 @@ protected void encode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out)
                     }
                 });
 
-            int port = BacnetConstants.BACNETUDPDEFAULTPORT;
+            int port = Constants.BACNETUDPDEFAULTPORT;
             if (config.getCBusPort() != null) {
                 port = Integer.parseInt(config.getCBusPort());
             }
diff --git a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/bacnet/protocol/BacnetServerAdapter.java b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/bacnet/protocol/BacnetServerAdapter.java
index ab38975bc26..2ee7c5d3d9d 100644
--- a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/bacnet/protocol/BacnetServerAdapter.java
+++ b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/bacnet/protocol/BacnetServerAdapter.java
@@ -76,14 +76,11 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
                         (short) 0,
                         BACnetConfirmedServiceChoice.READ_PROPERTY,
                         new BACnetErrorGeneral(new Error(
-                            new ErrorClassTagged(new BACnetTagHeader((byte) 0, TagClass.APPLICATION_TAGS, (byte) 1, (short) 0, (short) 0, 0, 0L), ErrorClass.COMMUNICATION, 0, (short) 0, TagClass.APPLICATION_TAGS),
-                            new ErrorCodeTagged(new BACnetTagHeader((byte) 0, TagClass.APPLICATION_TAGS, (byte) 1, (short) 0, (short) 0, 0, 0L), ErrorCode.VENDOR_PROPRIETARY_VALUE, 0, (short) 0, TagClass.APPLICATION_TAGS)
-                        )),
-                        0
-                    ),
-                    0
-                ),
-                0
+                            new ErrorClassTagged(new BACnetTagHeader((byte) 0, TagClass.APPLICATION_TAGS, (byte) 1, (short) 0, (short) 0, 0, 0L), ErrorClass.COMMUNICATION, 0L),
+                            new ErrorCodeTagged(new BACnetTagHeader((byte) 0, TagClass.APPLICATION_TAGS, (byte) 1, (short) 0, (short) 0, 0, 0L), ErrorCode.VENDOR_PROPRIETARY_VALUE, 0L)
+                        ))
+                    )
+                )
             )).addListener((ChannelFutureListener) f -> {
                 if (!f.isSuccess()) {
                     f.cause().printStackTrace();
@@ -128,14 +125,10 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
                                 StaticHelper.createBACnetApplicationTagObjectIdentifier(BACnetObjectType.DEVICE.getValue(), DEVICE_INSTANCE),
                                 StaticHelper.createBACnetApplicationTagUnsignedInteger(1024),
                                 StaticHelper.creatBACnetSegmentationTagged(BACnetSegmentation.NO_SEGMENTATION),
-                                StaticHelper.createBACnetVendorIdApplicationTagged(BACnetVendorId.MAPPED.getVendorId()),
-                                0
-                            ),
-                            0
-                        ),
-                        0
-                    ),
-                    0
+                                StaticHelper.createBACnetVendorIdApplicationTagged(BACnetVendorId.MAPPED.getVendorId())
+                            )
+                        )
+                    )
                 );
                 System.out.println("Writing response");
                 System.out.println(response);
@@ -169,6 +162,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
                         null,
                         null,
                         new BACnetServiceAckReadProperty(
+                            0L,
                             StaticHelper.createBACnetContextTagObjectIdentifier((byte) 0, (short) 2, 1),
                             StaticHelper.createBACnetPropertyIdentifierTagged((byte) 1, 85),
                             null,
@@ -176,19 +170,13 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
                                 StaticHelper.createBACnetOpeningTag((short) 3),
                                 StaticHelper.createBACnetTagHeaderBalanced(true, (short) 3, 3L),
                                 StaticHelper.createBACnetClosingTag((short) 3),
-                                StaticHelper.createBACnetApplicationTagReal(101L),
-                                null,
-                                null
-                            ),
-                            0L
+                                StaticHelper.createBACnetApplicationTagReal(101L)
+                            )
                         ),
                         null,
-                        null,
-                        0
-                    ),
-                    0
-                ),
-                0
+                        null
+                    )
+                )
             );
             System.out.println("Writing response");
             System.out.println(response);
diff --git a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/cbus/CBusServerModule.java b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/cbus/CBusServerModule.java
index 1e6f8f02e25..fdb7576ee3a 100644
--- a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/cbus/CBusServerModule.java
+++ b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/cbus/CBusServerModule.java
@@ -27,15 +27,13 @@
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import org.apache.plc4x.java.cbus.CBusDriver;
-import org.apache.plc4x.java.cbus.readwrite.CBusConstants;
 import org.apache.plc4x.java.cbus.readwrite.CBusMessage;
 import org.apache.plc4x.java.cbus.readwrite.CBusOptions;
+import org.apache.plc4x.java.cbus.readwrite.Constants;
 import org.apache.plc4x.java.cbus.readwrite.RequestContext;
 import org.apache.plc4x.java.spi.connection.GeneratedProtocolMessageCodec;
 import org.apache.plc4x.java.spi.generation.ByteOrder;
 import org.apache.plc4x.java.spi.generation.MessageInput;
-import org.apache.plc4x.java.spi.generation.ParseException;
-import org.apache.plc4x.java.spi.generation.ReadBuffer;
 import org.apache.plc4x.simulator.PlcSimulatorConfig;
 import org.apache.plc4x.simulator.exceptions.SimulatorException;
 import org.apache.plc4x.simulator.model.Context;
@@ -95,7 +93,7 @@ public void initChannel(SocketChannel channel) {
                 .option(ChannelOption.SO_BACKLOG, 128)
                 .childOption(ChannelOption.SO_KEEPALIVE, true);
 
-            int port = CBusConstants.CBUSTCPDEFAULTPORT;
+            int port = Constants.CBUSTCPDEFAULTPORT;
             if (config.getCBusPort() != null) {
                 port = Integer.parseInt(config.getCBusPort());
             }
diff --git a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/cbus/protocol/CBusServerAdapter.java b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/cbus/protocol/CBusServerAdapter.java
index aa0f9d729ac..d745f2823cf 100644
--- a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/cbus/protocol/CBusServerAdapter.java
+++ b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/cbus/protocol/CBusServerAdapter.java
@@ -170,8 +170,8 @@ private void handleRequestCommand(ChannelHandlerContext ctx, RequestCommand requ
             boolean knownUnit = AVAILABLE_UNITS.contains(unitAddress.getAddress());
             if (!knownUnit) {
                 LOGGER.warn("{} not a known unit", unitAddress);
-                ReplyOrConfirmation replyOrConfirmation = new ServerErrorReply((byte) 0x0, cBusOptions, requestContext);
-                CBusMessageToClient cBusMessageToClient = new CBusMessageToClient(replyOrConfirmation, requestContext, cBusOptions);
+                ReplyOrConfirmation replyOrConfirmation = new ServerErrorReply((byte) 0x0);
+                CBusMessageToClient cBusMessageToClient = new CBusMessageToClient(replyOrConfirmation);
                 ctx.writeAndFlush(cBusMessageToClient);
                 return;
             }
@@ -225,8 +225,8 @@ private void handleRequestCommand(ChannelHandlerContext ctx, RequestCommand requ
         Alpha alpha = requestCommand.getAlpha();
         if (alpha != null) {
             Confirmation confirmation = new Confirmation(alpha, null, ConfirmationType.NOT_TRANSMITTED_CORRUPTION);
-            ReplyOrConfirmationConfirmation replyOrConfirmationConfirmation = new ReplyOrConfirmationConfirmation(alpha.getCharacter(), confirmation, null, cBusOptions, requestContext);
-            CBusMessage response = new CBusMessageToClient(replyOrConfirmationConfirmation, requestContext, cBusOptions);
+            ReplyOrConfirmationConfirmation replyOrConfirmationConfirmation = new ReplyOrConfirmationConfirmation(alpha.getCharacter(), confirmation, null);
+            CBusMessage response = new CBusMessageToClient(replyOrConfirmationConfirmation);
             LOGGER.info("Send response\n{}", response);
             ctx.writeAndFlush(response);
         }
@@ -237,12 +237,12 @@ private static void handleStatusRequestLevel(ChannelHandlerContext ctx, RequestC
         // TODO: map actual values from simulator
         byte blockStart = statusRequestLevel.getStartingGroupAddressLabel();
         List<LevelInformation> levelInformations = Collections.singletonList(new LevelInformationNormal(0x5555, LevelInformationNibblePair.Value_F, LevelInformationNibblePair.Value_F));
-        CALData calData = new CALDataStatusExtended(CALCommandTypeContainer.CALCommandReply_4Bytes, null, coding, statusRequestLevel.getApplication(), blockStart, null, levelInformations, requestContext);
+        CALData calData = new CALDataStatusExtended(requestContext, CALCommandTypeContainer.CALCommandReply_4Bytes, null, coding, statusRequestLevel.getApplication(), blockStart, null, levelInformations);
         CALReply calReply;
         if (exstat) {
-            calReply = new CALReplyLong((byte) 0x0, calData, (byte) 0x0, new UnitAddress((byte) 0x04), null, new SerialInterfaceAddress((byte) 0x02), (byte) 0x0, null, cBusOptions, requestContext);
+            calReply = new CALReplyLong((byte) 0x0, calData, (byte) 0x0, new UnitAddress((byte) 0x04), null, new SerialInterfaceAddress((byte) 0x02), (byte) 0x0, null);
         } else {
-            calReply = new CALReplyShort((byte) 0x0, calData, cBusOptions, requestContext);
+            calReply = new CALReplyShort((byte) 0x0, calData);
         }
         CBusMessage response = createCBusMessageForReply(requestCommand.getAlpha(), calReply, cBusOptions);
         LOGGER.info("Send level status response\n{}", response);
@@ -284,15 +284,15 @@ private void handleCalData(ChannelHandlerContext ctx, CALData calData, Alpha alp
         } else if (calData instanceof CALDataWrite) {
             CALDataWrite calDataWrite = (CALDataWrite) calData;
             Runnable acknowledger = () -> {
-                CALDataAcknowledge calDataAcknowledge = new CALDataAcknowledge(CALCommandTypeContainer.CALCommandAcknowledge, null, calDataWrite.getParamNo(), (short) 0x0, requestContext);
-                CALReplyShort calReply = new CALReplyShort((byte) 0x0, calDataAcknowledge, cBusOptions, requestContext);
-                EncodedReplyCALReply encodedReply = new EncodedReplyCALReply((byte) 0x0, calReply, cBusOptions, requestContext);
-                ReplyEncodedReply replyEncodedReply = new ReplyEncodedReply((byte) 0x0, encodedReply, null, cBusOptions, requestContext);
-                ReplyOrConfirmation replyOrConfirmation = new ReplyOrConfirmationReply((byte) 0x0, replyEncodedReply, new ResponseTermination(), cBusOptions, requestContext);
+                CALDataAcknowledge calDataAcknowledge = new CALDataAcknowledge(requestContext, CALCommandTypeContainer.CALCommandAcknowledge, null, calDataWrite.getParamNo(), (short) 0x0);
+                CALReplyShort calReply = new CALReplyShort((byte) 0x0, calDataAcknowledge);
+                EncodedReplyCALReply encodedReply = new EncodedReplyCALReply(requestContext, (byte) 0x0, calReply);
+                ReplyEncodedReply replyEncodedReply = new ReplyEncodedReply((byte) 0x0, cBusOptions, encodedReply, null);
+                ReplyOrConfirmation replyOrConfirmation = new ReplyOrConfirmationReply((byte) 0x0, replyEncodedReply, new ResponseTermination());
                 if (alpha != null) {
-                    replyOrConfirmation = new ReplyOrConfirmationConfirmation((byte) 0x0, new Confirmation(alpha, null, ConfirmationType.CONFIRMATION_SUCCESSFUL), replyOrConfirmation, cBusOptions, requestContext);
+                    replyOrConfirmation = new ReplyOrConfirmationConfirmation((byte) 0x0, new Confirmation(alpha, null, ConfirmationType.CONFIRMATION_SUCCESSFUL), replyOrConfirmation);
                 }
-                CBusMessageToClient cBusMessageToClient = new CBusMessageToClient(replyOrConfirmation, requestContext, cBusOptions);
+                CBusMessageToClient cBusMessageToClient = new CBusMessageToClient(replyOrConfirmation);
                 LOGGER.info("Sending ack\n{}", cBusMessageToClient);
                 ctx.writeAndFlush(cBusMessageToClient);
             };
@@ -394,14 +394,14 @@ private void handleCalData(ChannelHandlerContext ctx, CALData calData, Alpha alp
     }
 
     private static CBusMessage createCBusMessageForReply(Alpha alpha, CALReply calReply, CBusOptions cBusOptions) {
-        EncodedReply encodedReply = new EncodedReplyCALReply((byte) 0x0, calReply, CBusServerAdapter.cBusOptions, CBusServerAdapter.requestContext);
-        ReplyEncodedReply replyEncodedReply = new ReplyEncodedReply((byte) 0xC0, encodedReply, null, CBusServerAdapter.cBusOptions, CBusServerAdapter.requestContext);
-        ReplyOrConfirmation replyOrConfirmation = new ReplyOrConfirmationReply((byte) 0xFF, replyEncodedReply, new ResponseTermination(), CBusServerAdapter.cBusOptions, CBusServerAdapter.requestContext);
+        EncodedReply encodedReply = new EncodedReplyCALReply(CBusServerAdapter.requestContext, (byte) 0x0, calReply);
+        ReplyEncodedReply replyEncodedReply = new ReplyEncodedReply((byte) 0xC0, CBusServerAdapter.cBusOptions, encodedReply, null);
+        ReplyOrConfirmation replyOrConfirmation = new ReplyOrConfirmationReply((byte) 0xFF, replyEncodedReply, new ResponseTermination());
         if (alpha != null) {
             Confirmation confirmation = new Confirmation(alpha, null, ConfirmationType.CONFIRMATION_SUCCESSFUL);
-            replyOrConfirmation = new ReplyOrConfirmationConfirmation(alpha.getCharacter(), confirmation, replyOrConfirmation, CBusServerAdapter.cBusOptions, CBusServerAdapter.requestContext);
+            replyOrConfirmation = new ReplyOrConfirmationConfirmation(alpha.getCharacter(), confirmation, replyOrConfirmation);
         }
-        return new CBusMessageToClient(replyOrConfirmation, requestContext, cBusOptions);
+        return new CBusMessageToClient(replyOrConfirmation);
     }
 
     private static void sendInstallationMMIResponse(ChannelHandlerContext ctx, Alpha alpha) {
@@ -474,11 +474,11 @@ private static void sendStatusBytes(ChannelHandlerContext ctx, String logMessage
                     break;
                 }
             }
-            CALData calData = new CALDataStatusExtended(commandTypeContainer, null, StatusCoding.BINARY_BY_THIS_SERIAL_INTERFACE, application, blockStart, unitStatusBytes, null, requestContext);
+            CALData calData = new CALDataStatusExtended(requestContext, commandTypeContainer, null, StatusCoding.BINARY_BY_THIS_SERIAL_INTERFACE, application, blockStart, unitStatusBytes, null);
             // TODO: do we use a random unit or a fixed or do we need it as parameter
             int randomElementIndex = ThreadLocalRandom.current().nextInt(AVAILABLE_UNITS.size()) % AVAILABLE_UNITS.size();
             byte randomUnit = AVAILABLE_UNITS.get(randomElementIndex);
-            calReply = new CALReplyLong((byte) 0x86, calData, 0x00, new UnitAddress(randomUnit), null, new SerialInterfaceAddress((byte) 0x02), (byte) 0x00, null, cBusOptions, requestContext);
+            calReply = new CALReplyLong((byte) 0x86, calData, 0x00, new UnitAddress(randomUnit), null, new SerialInterfaceAddress((byte) 0x02), (byte) 0x00, null);
         } else {
             for (CALCommandTypeContainer calCommandTypeContainerElement : CALCommandTypeContainer.values()) {
                 if (calCommandTypeContainerElement.getCommandType() != CALCommandType.STATUS) {
@@ -489,8 +489,8 @@ private static void sendStatusBytes(ChannelHandlerContext ctx, String logMessage
                     break;
                 }
             }
-            CALData calData = new CALDataStatus(commandTypeContainer, null, application, (byte) 0x00, unitStatusBytes, requestContext);
-            calReply = new CALReplyShort((byte) 0x0, calData, cBusOptions, requestContext);
+            CALData calData = new CALDataStatus(requestContext, commandTypeContainer, null, application, (byte) 0x00, unitStatusBytes);
+            calReply = new CALReplyShort((byte) 0x0, calData);
         }
         CBusMessage response = createCBusMessageForReply(alpha, calReply, cBusOptions);
         LOGGER.debug(logMessage, response);
@@ -503,95 +503,95 @@ private void handleCalDataIdentify(ChannelHandlerContext ctx, CALDataIdentify ca
         switch (calDataIdentify.getAttribute()) {
             case Manufacturer:
                 numBytes = 0x08;
-                identifyReplyCommand = new IdentifyReplyCommandManufacturer("Apache  ", numBytes);
+                identifyReplyCommand = new IdentifyReplyCommandManufacturer("Apache  ");
                 break;
             case Type:
                 numBytes = 0x08;
-                identifyReplyCommand = new IdentifyReplyCommandType("plc4x-si", numBytes);
+                identifyReplyCommand = new IdentifyReplyCommandType("plc4x-si");
                 break;
             case FirmwareVersion:
                 numBytes = 0x08;
-                identifyReplyCommand = new IdentifyReplyCommandFirmwareVersion("  0.09  ", numBytes);
+                identifyReplyCommand = new IdentifyReplyCommandFirmwareVersion("  0.09  ");
                 break;
             case Summary:
                 numBytes = 0x09;
-                identifyReplyCommand = new IdentifyReplyCommandSummary("NOIDEA", (byte) 0xAF, "0900", numBytes);
+                identifyReplyCommand = new IdentifyReplyCommandSummary("NOIDEA", (byte) 0xAF, "0900");
                 break;
             case ExtendedDiagnosticSummary:
                 numBytes = 0x0C;
-                identifyReplyCommand = new IdentifyReplyCommandExtendedDiagnosticSummary(ApplicationIdContainer.FREE_USAGE_01, ApplicationIdContainer.FREE_USAGE_0F, (byte) 0x0, 0x0, 4711L, (byte) 0x13, false, false, false, true, false, false, false, false, false, false, false, false, false, numBytes);
+                identifyReplyCommand = new IdentifyReplyCommandExtendedDiagnosticSummary(ApplicationIdContainer.FREE_USAGE_01, ApplicationIdContainer.FREE_USAGE_0F, (byte) 0x0, 0x0, 4711L, (byte) 0x13, false, false, false, true, false, false, false, false, false, false, false, false, false);
                 break;
             case NetworkTerminalLevels:
                 numBytes = 0x0C;
-                identifyReplyCommand = new IdentifyReplyCommandNetworkTerminalLevels(new byte[]{0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13}, numBytes);
+                identifyReplyCommand = new IdentifyReplyCommandNetworkTerminalLevels(new byte[]{0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13});
                 break;
             case TerminalLevel:
                 numBytes = 0x0C;
-                identifyReplyCommand = new IdentifyReplyCommandTerminalLevels(new byte[]{0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13}, numBytes);
+                identifyReplyCommand = new IdentifyReplyCommandTerminalLevels(new byte[]{0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13});
                 break;
             case NetworkVoltage:
                 numBytes = 0x05;
-                identifyReplyCommand = new IdentifyReplyCommandNetworkVoltage("48", "7", numBytes);
+                identifyReplyCommand = new IdentifyReplyCommandNetworkVoltage("48", "7");
                 break;
             case GAVValuesCurrent:
                 numBytes = 0x10;
                 identifyReplyCommand = new IdentifyReplyCommandGAVValuesCurrent(new byte[]{
                     0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13,
                     0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13,
-                }, numBytes);
+                });
                 break;
             case GAVValuesStored:
                 numBytes = 0x10;
                 identifyReplyCommand = new IdentifyReplyCommandGAVValuesStored(new byte[]{
                     0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13,
                     0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13,
-                }, numBytes);
+                });
                 break;
             case GAVPhysicalAddresses:
                 numBytes = 0x10;
                 identifyReplyCommand = new IdentifyReplyCommandGAVPhysicalAddresses(new byte[]{
                     0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13,
                     0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13,
-                }, numBytes);
+                });
                 break;
             case LogicalAssignment:
                 numBytes = 0x0E;
-                identifyReplyCommand = new IdentifyReplyCommandLogicalAssignment(Collections.singletonList(new LogicAssignment(false, true, true, true, true, true)), numBytes);
+                identifyReplyCommand = new IdentifyReplyCommandLogicalAssignment(Collections.singletonList(new LogicAssignment(false, true, true, true, true, true)));
                 break;
             case Delays:
                 numBytes = 0x0F;
-                identifyReplyCommand = new IdentifyReplyCommandDelays(new byte[]{0x3}, (byte) 0x13, numBytes);
+                identifyReplyCommand = new IdentifyReplyCommandDelays(new byte[]{0x3}, (byte) 0x13);
                 break;
             case MinimumLevels:
                 numBytes = 0x0E;
-                identifyReplyCommand = new IdentifyReplyCommandMinimumLevels(new byte[]{0x3}, numBytes);
+                identifyReplyCommand = new IdentifyReplyCommandMinimumLevels(new byte[]{0x3});
                 break;
             case MaximumLevels:
                 numBytes = 0x0F;
-                identifyReplyCommand = new IdentifyReplyCommandMaximumLevels(new byte[]{0xF}, numBytes);
+                identifyReplyCommand = new IdentifyReplyCommandMaximumLevels(new byte[]{0xF});
                 break;
             case CurrentSenseLevels:
                 numBytes = 0x10;
-                identifyReplyCommand = new IdentifyReplyCommandCurrentSenseLevels(new byte[]{0xF}, numBytes);
+                identifyReplyCommand = new IdentifyReplyCommandCurrentSenseLevels(new byte[]{0xF});
                 break;
             case OutputUnitSummary:
                 numBytes = 0x12;
-                identifyReplyCommand = new IdentifyReplyCommandOutputUnitSummary(new IdentifyReplyCommandUnitSummary(false, false, false, false, false, false, false, false), (byte) 0x4, (byte) 0x4, (short) 45, numBytes);
+                identifyReplyCommand = new IdentifyReplyCommandOutputUnitSummary(new IdentifyReplyCommandUnitSummary(false, false, false, false, false, false, false, false), (byte) 0x4, (byte) 0x4, (short) 45);
                 break;
             case DSIStatus:
                 numBytes = 0x12;
-                identifyReplyCommand = new IdentifyReplyCommandDSIStatus(ChannelStatus.OK, ChannelStatus.OK, ChannelStatus.OK, ChannelStatus.OK, ChannelStatus.OK, ChannelStatus.OK, ChannelStatus.OK, ChannelStatus.OK, UnitStatus.OK, (byte) 0x34, numBytes);
+                identifyReplyCommand = new IdentifyReplyCommandDSIStatus(ChannelStatus.OK, ChannelStatus.OK, ChannelStatus.OK, ChannelStatus.OK, ChannelStatus.OK, ChannelStatus.OK, ChannelStatus.OK, ChannelStatus.OK, UnitStatus.OK, (byte) 0x34);
                 break;
             default:
                 throw new IllegalStateException("unmapped type " + calDataIdentify.getAttribute());
         }
 
-        CALData calData = new CALDataIdentifyReply(getReplyCommandType(numBytes + 1), null, calDataIdentify.getAttribute(), identifyReplyCommand, requestContext);
+        CALData calData = new CALDataIdentifyReply(requestContext, getReplyCommandType(numBytes + 1), null, calDataIdentify.getAttribute(), identifyReplyCommand);
         CALReply calReply;
         if (exstat) {
-            calReply = new CALReplyLong((byte) 0x0, calData, (byte) 0x0, new UnitAddress((byte) 0x0), null, new SerialInterfaceAddress((byte) 0x02), (byte) 0x0, null, cBusOptions, requestContext);
+            calReply = new CALReplyLong((byte) 0x0, calData, (byte) 0x0, new UnitAddress((byte) 0x0), null, new SerialInterfaceAddress((byte) 0x02), (byte) 0x0, null);
         } else {
-            calReply = new CALReplyShort((byte) 0x0, calData, cBusOptions, requestContext);
+            calReply = new CALReplyShort((byte) 0x0, calData);
         }
         CBusMessage response = createCBusMessageForReply(alpha, calReply, cBusOptions);
         LOGGER.info("Send identify response\n{}", response);
@@ -637,14 +637,14 @@ private void startSALMonitor(ChannelHandlerContext ctx) {
                 MonitoredSAL monitoredSAL;
                 SALData salData = createLightingData();
                 if (cBusOptions.getExstat()) {
-                    monitoredSAL = new MonitoredSALLongFormSmartMode((byte) 0x05, (byte) 0x00, new UnitAddress(randomUnit), null, ApplicationIdContainer.LIGHTING_38, (byte) 0x00, null, salData, cBusOptions);
+                    monitoredSAL = new MonitoredSALLongFormSmartMode((byte) 0x05, (byte) 0x00, new UnitAddress(randomUnit), null, ApplicationIdContainer.LIGHTING_38, (byte) 0x00, null, salData);
                 } else {
-                    monitoredSAL = new MonitoredSALShortFormBasicMode((byte) 0x0, (byte) 0x0, (short) 0x0, (short) 0x0, (byte) 0x0, ApplicationIdContainer.LIGHTING_38, salData, cBusOptions);
+                    monitoredSAL = new MonitoredSALShortFormBasicMode((byte) 0x0, (byte) 0x0, (short) 0x0, (short) 0x0, (byte) 0x0, ApplicationIdContainer.LIGHTING_38, salData);
                 }
-                EncodedReply encodedReply = new MonitoredSALReply((byte) 0x0, monitoredSAL, cBusOptions, requestContext);
-                Reply reply = new ReplyEncodedReply((byte) 0x0, encodedReply, null, cBusOptions, requestContext);
-                ReplyOrConfirmation replyOrConfirmation = new ReplyOrConfirmationReply((byte) 0x00, reply, new ResponseTermination(), cBusOptions, requestContext);
-                CBusMessage message = new CBusMessageToClient(replyOrConfirmation, requestContext, cBusOptions);
+                EncodedReply encodedReply = new MonitoredSALReply(requestContext, (byte) 0x0, monitoredSAL);
+                Reply reply = new ReplyEncodedReply((byte) 0x0, cBusOptions, encodedReply, null);
+                ReplyOrConfirmation replyOrConfirmation = new ReplyOrConfirmationReply((byte) 0x00, reply, new ResponseTermination());
+                CBusMessage message = new CBusMessageToClient(replyOrConfirmation);
                 LOGGER.info("[SAL Monitor] Sending out\n{}", message);
                 ctx.writeAndFlush(message);
             } finally {
diff --git a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
index 45c5b2095c3..f852b00c490 100644
--- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
+++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
@@ -766,7 +766,7 @@ public enum KnxManufacturer
         M_ZHONGSHAN_ILLUS_LIGHTING_CO__LTD = 738,
         M_HANGZHOU_KONKE_INFORMATION_TECHNOLOGY_CO___LTD_ = 739,
         M_SHANGHAI_FANTE_DIGITAL_TECHNOLOGY_CO___LTD = 740,
-        M_CONFIO = 741,
+        M_CONFIO_TECHNOLOGIES_PVT__LTD = 741,
         M_SONIC_TECHNOLOGIES = 742,
         M_SHANGHAI_INNOVATECH_INFORMATION_TECHNOLOGY_CO___LT = 743,
         M_ABI_SICHERHEITSSYSTEME_GMBH = 744,
@@ -777,8 +777,12 @@ public enum KnxManufacturer
         M_ROGERWELL_CONTROL_SYSTEM_LIMITED = 749,
         M_SHANGHAI_YUKON_AUTOMATION_TECHNOLOGIES_CO___LTD_ = 750,
         M_TECCO_PTY_LTD = 751,
-        M_ABB___RESERVED = 752,
-        M_BUSCH_JAEGER_ELEKTRO___RESERVED = 753,
+        M_A_LAN_TECHNOLOGIE = 752,
+        M_VOLTAN_TECHNOLOGY = 753,
+        M_BAERWINKEL_AND_STRASSER_GMBH = 754,
+        M_CATERLUX = 755,
+        M_ABB___RESERVED = 756,
+        M_BUSCH_JAEGER_ELEKTRO___RESERVED = 757,
     }
 
     public static class KnxManufacturerInfo
@@ -2930,7 +2934,7 @@ public static class KnxManufacturerInfo
                 case KnxManufacturer.M_SHANGHAI_FANTE_DIGITAL_TECHNOLOGY_CO___LTD: { /* '740' */
                     return 801;
                 }
-                case KnxManufacturer.M_CONFIO: { /* '741' */
+                case KnxManufacturer.M_CONFIO_TECHNOLOGIES_PVT__LTD: { /* '741' */
                     return 802;
                 }
                 case KnxManufacturer.M_SONIC_TECHNOLOGIES: { /* '742' */
@@ -2966,10 +2970,22 @@ public static class KnxManufacturerInfo
                 case KnxManufacturer.M_TECCO_PTY_LTD: { /* '751' */
                     return 812;
                 }
-                case KnxManufacturer.M_ABB___RESERVED: { /* '752' */
+                case KnxManufacturer.M_A_LAN_TECHNOLOGIE: { /* '752' */
+                    return 813;
+                }
+                case KnxManufacturer.M_VOLTAN_TECHNOLOGY: { /* '753' */
+                    return 814;
+                }
+                case KnxManufacturer.M_BAERWINKEL_AND_STRASSER_GMBH: { /* '754' */
+                    return 815;
+                }
+                case KnxManufacturer.M_CATERLUX: { /* '755' */
+                    return 816;
+                }
+                case KnxManufacturer.M_ABB___RESERVED: { /* '756' */
                     return 43954;
                 }
-                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '753' */
+                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '757' */
                     return 43959;
                 }
                 case KnxManufacturer.M_HDL: { /* '76' */
@@ -5202,8 +5218,8 @@ public static string Name(this KnxManufacturer value)
                 case KnxManufacturer.M_SHANGHAI_FANTE_DIGITAL_TECHNOLOGY_CO___LTD: { /* '740' */
                     return "Shanghai Fante Digital Technology Co., Ltd";
                 }
-                case KnxManufacturer.M_CONFIO: { /* '741' */
-                    return "CONFIO";
+                case KnxManufacturer.M_CONFIO_TECHNOLOGIES_PVT__LTD: { /* '741' */
+                    return "Confio Technologies Pvt. Ltd";
                 }
                 case KnxManufacturer.M_SONIC_TECHNOLOGIES: { /* '742' */
                     return "Sonic Technologies";
@@ -5238,10 +5254,22 @@ public static string Name(this KnxManufacturer value)
                 case KnxManufacturer.M_TECCO_PTY_LTD: { /* '751' */
                     return "Tecco Pty Ltd";
                 }
-                case KnxManufacturer.M_ABB___RESERVED: { /* '752' */
+                case KnxManufacturer.M_A_LAN_TECHNOLOGIE: { /* '752' */
+                    return "A-LAN Technologie";
+                }
+                case KnxManufacturer.M_VOLTAN_TECHNOLOGY: { /* '753' */
+                    return "Voltan Technology";
+                }
+                case KnxManufacturer.M_BAERWINKEL_AND_STRASSER_GMBH: { /* '754' */
+                    return "Baerwinkel & Strasser GmbH";
+                }
+                case KnxManufacturer.M_CATERLUX: { /* '755' */
+                    return "Caterlux";
+                }
+                case KnxManufacturer.M_ABB___RESERVED: { /* '756' */
                     return "ABB - reserved";
                 }
-                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '753' */
+                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '757' */
                     return "Busch-Jaeger Elektro - reserved";
                 }
                 case KnxManufacturer.M_HDL: { /* '76' */
diff --git a/plc4py/plc4py/drivers/umas/UmasConfiguration.py b/plc4py/plc4py/drivers/umas/UmasConfiguration.py
index 4b017b95b70..c9ab25da2b3 100644
--- a/plc4py/plc4py/drivers/umas/UmasConfiguration.py
+++ b/plc4py/plc4py/drivers/umas/UmasConfiguration.py
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-from plc4py.protocols.umas.readwrite.UmasConstants import UmasConstants
+from plc4py.protocols.umas.readwrite.Constants import Constants
 from plc4py.spi.configuration.PlcConfiguration import PlcConfiguration
 
 
diff --git a/plc4py/plc4py/protocols/modbus/readwrite/Constants.py b/plc4py/plc4py/protocols/modbus/readwrite/Constants.py
new file mode 100644
index 00000000000..e762afe30ac
--- /dev/null
+++ b/plc4py/plc4py/protocols/modbus/readwrite/Constants.py
@@ -0,0 +1,25 @@
+#
+# 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.
+#
+
+from dataclasses import dataclass
+
+
+@dataclass
+class Constants:
+    MODBUS_TCP_DEFAULT_PORT: int = int(502)
diff --git a/plc4py/plc4py/protocols/modbus/readwrite/ModbusConstants.py b/plc4py/plc4py/protocols/modbus/readwrite/ModbusConstants.py
deleted file mode 100644
index 73b418fc2fb..00000000000
--- a/plc4py/plc4py/protocols/modbus/readwrite/ModbusConstants.py
+++ /dev/null
@@ -1,88 +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.
-#
-
-from dataclasses import dataclass
-
-from plc4py.api.exceptions.exceptions import PlcRuntimeException
-from plc4py.api.exceptions.exceptions import SerializationException
-from plc4py.api.messages.PlcMessage import PlcMessage
-from plc4py.spi.generation.ReadBuffer import ReadBuffer
-from plc4py.spi.generation.WriteBuffer import WriteBuffer
-import math
-
-
-@dataclass
-class ModbusConstants:
-    MODBUS_TCP_DEFAULT_PORT: int = int(502)
-
-    def serialize(self, write_buffer: WriteBuffer):
-        write_buffer.push_context("ModbusConstants")
-
-        # Const Field (modbusTcpDefaultPort)
-        write_buffer.write_unsigned_short(
-            self.MODBUS_TCP_DEFAULT_PORT, logical_name="modbusTcpDefaultPort"
-        )
-
-        write_buffer.pop_context("ModbusConstants")
-
-    def length_in_bytes(self) -> int:
-        return int(math.ceil(float(self.length_in_bits() / 8.0)))
-
-    def length_in_bits(self) -> int:
-        length_in_bits: int = 0
-        _value: ModbusConstants = self
-
-        # Const Field (modbusTcpDefaultPort)
-        length_in_bits += 16
-
-        return length_in_bits
-
-    @staticmethod
-    def static_parse(read_buffer: ReadBuffer, **kwargs):
-        return ModbusConstants.static_parse_context(read_buffer)
-
-    @staticmethod
-    def static_parse_context(read_buffer: ReadBuffer):
-        read_buffer.push_context("ModbusConstants")
-
-        MODBUS_TCP_DEFAULT_PORT: int = read_buffer.read_unsigned_short(
-            logical_name="modbus_tcp_default_port"
-        )
-
-        read_buffer.pop_context("ModbusConstants")
-        # Create the instance
-        _modbus_constants: ModbusConstants = ModbusConstants()
-        return _modbus_constants
-
-    def equals(self, o: object) -> bool:
-        if self == o:
-            return True
-
-        if not isinstance(o, ModbusConstants):
-            return False
-
-        that: ModbusConstants = ModbusConstants(o)
-        return True
-
-    def hash_code(self) -> int:
-        return hash(self)
-
-    def __str__(self) -> str:
-        # TODO:- Implement a generic python object to probably json convertor or something.
-        return ""
diff --git a/plc4py/plc4py/protocols/umas/readwrite/Constants.py b/plc4py/plc4py/protocols/umas/readwrite/Constants.py
new file mode 100644
index 00000000000..a9fff82e6ff
--- /dev/null
+++ b/plc4py/plc4py/protocols/umas/readwrite/Constants.py
@@ -0,0 +1,25 @@
+#
+# 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.
+#
+
+from dataclasses import dataclass
+
+
+@dataclass
+class Constants:
+    UMAS_TCP_DEFAULT_PORT: int = int(502)
diff --git a/plc4py/plc4py/protocols/umas/readwrite/UmasConstants.py b/plc4py/plc4py/protocols/umas/readwrite/UmasConstants.py
deleted file mode 100644
index 4a1bef7c230..00000000000
--- a/plc4py/plc4py/protocols/umas/readwrite/UmasConstants.py
+++ /dev/null
@@ -1,88 +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.
-#
-
-from dataclasses import dataclass
-
-from plc4py.api.exceptions.exceptions import PlcRuntimeException
-from plc4py.api.exceptions.exceptions import SerializationException
-from plc4py.api.messages.PlcMessage import PlcMessage
-from plc4py.spi.generation.ReadBuffer import ReadBuffer
-from plc4py.spi.generation.WriteBuffer import WriteBuffer
-import math
-
-
-@dataclass
-class UmasConstants:
-    UMAS_TCP_DEFAULT_PORT: int = int(502)
-
-    def serialize(self, write_buffer: WriteBuffer):
-        write_buffer.push_context("UmasConstants")
-
-        # Const Field (UmasTcpDefaultPort)
-        write_buffer.write_unsigned_short(
-            self.UMAS_TCP_DEFAULT_PORT, logical_name="UmasTcpDefaultPort"
-        )
-
-        write_buffer.pop_context("UmasConstants")
-
-    def length_in_bytes(self) -> int:
-        return int(math.ceil(float(self.length_in_bits() / 8.0)))
-
-    def length_in_bits(self) -> int:
-        length_in_bits: int = 0
-        _value: UmasConstants = self
-
-        # Const Field (UmasTcpDefaultPort)
-        length_in_bits += 16
-
-        return length_in_bits
-
-    @staticmethod
-    def static_parse(read_buffer: ReadBuffer, **kwargs):
-        return UmasConstants.static_parse_context(read_buffer)
-
-    @staticmethod
-    def static_parse_context(read_buffer: ReadBuffer):
-        read_buffer.push_context("UmasConstants")
-
-        UMAS_TCP_DEFAULT_PORT: int = read_buffer.read_unsigned_short(
-            logical_name="umas_tcp_default_port"
-        )
-
-        read_buffer.pop_context("UmasConstants")
-        # Create the instance
-        _umas_constants: UmasConstants = UmasConstants()
-        return _umas_constants
-
-    def equals(self, o: object) -> bool:
-        if self == o:
-            return True
-
-        if not isinstance(o, UmasConstants):
-            return False
-
-        that: UmasConstants = UmasConstants(o)
-        return True
-
-    def hash_code(self) -> int:
-        return hash(self)
-
-    def __str__(self) -> str:
-        # TODO:- Implement a generic python object to probably json convertor or something.
-        return ""
diff --git a/pom.xml b/pom.xml
index 5e8056ac536..a6725d16889 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
     <sonar.cfamily.build-wrapper-output>${project.basedir}/plc4c/target/build-wrapper-output
     </sonar.cfamily.build-wrapper-output>
 
-    <plc4x-code-generation.version>1.8.0</plc4x-code-generation.version>
+    <plc4x-code-generation.version>1.9.0-SNAPSHOT</plc4x-code-generation.version>
 
     <antlr.version>4.13.2</antlr.version>
     <apiguardian.version>1.1.2</apiguardian.version>
diff --git a/protocols/ads/src/main/resources/protocols/ads/ads-discovery.mspec b/protocols/ads/src/main/resources/protocols/ads/ads-discovery.mspec
index a8bcb78dd38..010a8e862e1 100644
--- a/protocols/ads/src/main/resources/protocols/ads/ads-discovery.mspec
+++ b/protocols/ads/src/main/resources/protocols/ads/ads-discovery.mspec
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-[type AdsDiscoveryConstants
+[constants
     [const          uint 16     adsDiscoveryUdpDefaultPort 48899]
 ]
 
diff --git a/protocols/ads/src/main/resources/protocols/ads/ads.mspec b/protocols/ads/src/main/resources/protocols/ads/ads.mspec
index 5835e7b6908..109523320c4 100644
--- a/protocols/ads/src/main/resources/protocols/ads/ads.mspec
+++ b/protocols/ads/src/main/resources/protocols/ads/ads.mspec
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-[type AdsConstants
+[constants
     [const          uint 16     adsTcpDefaultPort 48898]
 ]
 
diff --git a/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec b/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec
index 1cf6705cfa5..6faad002cc3 100644
--- a/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec
+++ b/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec
@@ -1571,6 +1571,13 @@
   ['1557' ZAPHIREAS ['1557', '"Zaphire AS"']]
   ['1558' AJ_MANUFACTURING ['1558', '"AJ Manufacturing"']]
   ['1559' FUTURE_MOTORS_LTD ['1559', '"Future Motors Ltd."']]
+  ['1560' HIMEL_HONG_KONG_LIMITED ['1560', '"Himel Hong Kong Limited"']]
+  ['1561' SHENZHEN_SUNRICHER_TECHNOLOGY_CO_LTD ['1561', '"Shenzhen Sunricher Technology Co., Ltd."']]
+  ['1562' ACTILITYSA ['1562', '"Actility S.A."']]
+  ['1563' OY_HALTON_GROUP_LTD ['1563', '"Oy Halton Group Ltd."']]
+  ['1564' AVTECH_SOFTWARE_INC ['1564', '"AVTECH Software, Inc."']]
+  ['1565' IN_CONTROL_ENGINEERINGLLC ['1565', '"InControl Engineering LLC"']]
+  ['1566' SOUND_WATER_TECHNOLOGIESLLC ['1566', '"SoundWater Technologies LLC"']]
  
   ['0xFFFF' UNKNOWN_VENDOR ['0xFFFF', '"Unknown"']]
 ]
diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnet-tags.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnet-tags.mspec
index 9feddfe8fcd..e38f7749e17 100644
--- a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnet-tags.mspec
+++ b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnet-tags.mspec
@@ -202,12 +202,14 @@
 ]
 
 [type BACnetTagPayloadBoolean(uint 32 actualLength)
-    [virtual bit value   'actualLength == 1'    ]
-    [virtual bit isTrue  'value'                ]
-    [virtual bit isFalse '!value'               ]
+    [state       actualLength                       ]
+    [virtual bit value          'actualLength == 1' ]
+    [virtual bit isTrue         'value'             ]
+    [virtual bit isFalse        '!value'            ]
 ]
 
 [type BACnetTagPayloadUnsignedInteger(uint 32 actualLength)
+    [state                  actualLength                         ]
     [virtual    bit         isUint8         'actualLength == 1'  ]
     [optional   uint  8     valueUint8      'isUint8'            ]
     [virtual    bit         isUint16        'actualLength == 2'  ]
@@ -229,6 +231,7 @@
 ]
 
 [type BACnetTagPayloadSignedInteger(uint 32 actualLength)
+    [state                  actualLength                         ]
     [virtual    bit         isInt8          'actualLength == 1'  ]
     [optional   int 8       valueInt8       'isInt8'             ]
     [virtual    bit         isInt16         'actualLength == 2'  ]
@@ -262,11 +265,12 @@
 ]
 
 [type BACnetTagPayloadCharacterString(uint 32 actualLength)
-    [simple     BACnetCharacterEncoding      encoding]
+    [state                                   actualLength                            ]
+    [simple     BACnetCharacterEncoding      encoding                                ]
     // TODO: The reader expects int but uint32 gets mapped to long so even uint32 would easily overflow...
     [virtual    uint     16                  actualLengthInBit 'actualLength * 8 - 8']
     // TODO: call to string on encoding or add type conversion so we can use the enum above
-    [simple     vstring 'actualLengthInBit'  value encoding='"UTF-8"']
+    [simple     vstring 'actualLengthInBit'  value                 encoding='"UTF-8"']
 ]
 
 [type BACnetTagPayloadBitString(uint 32 actualLength)
diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
index c9c81f9a60e..7da2f7706c2 100644
--- a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
+++ b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-[type BacnetConstants
+[constants
     [const    uint 16     bacnetUdpDefaultPort 47808]
 ]
 
@@ -411,6 +411,7 @@
 
 // Not really tagged as it has no header but is consistent with naming schema enum+Tagged
 [type BACnetRejectReasonTagged(uint 32 actualLength)
+    [state          actualLength                                                        ]
     [manual   BACnetRejectReason
                     value
                         'STATIC_CALL("readEnumGeneric", readBuffer, actualLength, BACnetRejectReason.VENDOR_PROPRIETARY_VALUE)'
@@ -427,6 +428,7 @@
 
 // Not really tagged as it has no header but is consistent with naming schema enum+Tagged
 [type BACnetAbortReasonTagged(uint 32 actualLength)
+    [state          actualLength                                                        ]
     [manual   BACnetAbortReason
                     value
                         'STATIC_CALL("readEnumGeneric", readBuffer, actualLength, BACnetAbortReason.VENDOR_PROPRIETARY_VALUE)'
@@ -443,7 +445,8 @@
 
 [discriminatedType BACnetConfirmedServiceRequest(uint 32 serviceRequestLength)
     [discriminator BACnetConfirmedServiceChoice serviceChoice]
-    // we substract serviceChoice from our payload
+    // we subtract serviceChoice from our payload
+    [state                  serviceRequestLength                                                                   ]
     [virtual       uint 32  serviceRequestPayloadLength '(serviceRequestLength>0)?(serviceRequestLength - 1):0'    ]
     [typeSwitch serviceChoice
         ////
@@ -1050,9 +1053,10 @@
 ]
 
 [discriminatedType BACnetServiceAck(uint 32 serviceAckLength)
+    [state              serviceAckLength                                                               ]
     [discriminator   BACnetConfirmedServiceChoice
                         serviceChoice                   ]
-    // we substract serviceChoice from our payload
+    // we subtract serviceChoice from our payload
     [virtual       uint 32  serviceAckPayloadLength '(serviceAckLength>0)?(serviceAckLength - 1):0'    ]
     [typeSwitch serviceChoice
         ////
diff --git a/protocols/c-bus/src/main/resources/protocols/cbus/c-bus.mspec b/protocols/c-bus/src/main/resources/protocols/cbus/c-bus.mspec
index 71e31493b81..e8128a434ef 100644
--- a/protocols/c-bus/src/main/resources/protocols/cbus/c-bus.mspec
+++ b/protocols/c-bus/src/main/resources/protocols/cbus/c-bus.mspec
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-[type CBusConstants
+[constants
     [const    uint 16     cbusTcpDefaultPort 10001]
 ]
 
@@ -25,6 +25,35 @@
     // Useful for response parsing: Set this to true if you send a identify request before. This will change the way the response will be parsed
     [simple   bit       sendIdentifyRequestBefore   ]
 ]
+// TODO: idee
+//[context
+//    Access via "context.sendIdentifyRequestBefore"
+//    // Useful for response parsing: Set this to true if you send a identify request before. This will change the way the response will be parsed
+//    [simple   bit       sendIdentifyRequestBefore   ]
+//]
+
+// TODO: we need global options that can be set
+//[global
+//    Access via "global.srchk"
+//// Defines that SAL messages can occur at any time
+//[simple bit connect]
+//// Disable echo of characters. When used with connect SAL have a long option. Select long from of most CAL replies
+//[simple bit smart  ]
+//// only works with smart. Select long form of CAL messages
+//[simple bit idmon  ]
+//// useful with smart. Select long form, extended format for all monitored and initiated status requests
+//[simple bit exstat ]
+//// monitors all traffic for status requests. Status requests will be returned as CAL. Replies are modified by exstat. Usually used in conjunction with connect.
+//[simple bit monitor]
+//// Same as connect. In addition it will return remote network SAL
+//[simple bit monall ]
+//// Serial interface will emit a power up notification
+//[simple bit pun    ]
+//// causes parameter change notifications to be emitted.
+//[simple bit pcn    ]
+//// enabled the checksum checks
+//[simple bit srchk ]
+//]
 
 [type CBusOptions
     // Defines that SAL messages can occur at any time
@@ -90,7 +119,8 @@
             [optional Alpha         alpha                                   ]
         ]
         ['REQUEST_COMMAND' *Command
-            [const    byte  initiator 0x5C                                  ] // 0x5C == "\"
+            [state                 cBusOptions                              ]
+            [const    byte         initiator   0x5C                         ] // 0x5C == "\"
             [manual   CBusCommand
                               cbusCommand
                         'STATIC_CALL("readCBusCommand", readBuffer, cBusOptions, cBusOptions.srchk)'
@@ -551,6 +581,7 @@
 ]
 
 [type CALData(RequestContext requestContext)
+    [state                           requestContext                                         ]
     //TODO: golang doesn't like checking for null so we use that static call to check that the enum is known
     [validation 'STATIC_CALL("knowsCALCommandTypeContainer", readBuffer)' "no command type could be found" shouldFail=false]
     [simple  CALCommandTypeContainer commandTypeContainer                                   ]
@@ -1020,7 +1051,8 @@
 ]
 
 [type CustomManufacturer(uint 8 numBytes) // Note 7
-    [simple vstring '8 * numBytes' customString        ]
+    [state                         numBytes     ]
+    [simple vstring '8 * numBytes' customString ]
 ]
 
 [type SerialNumber // Note 8
@@ -1031,7 +1063,8 @@
 ]
 
 [type CustomTypes(uint 8 numBytes) // Note 9
-    [simple vstring '8 * numBytes' customString        ]
+    [state                         numBytes     ]
+    [simple vstring '8 * numBytes' customString ]
 ]
 
 [enum uint 8 Attribute(uint 8 bytesReturned)
@@ -1466,6 +1499,7 @@
             [simple ParameterChange parameterChange                         ]
         ]
         [*      *EncodedReply
+            [state            cBusOptions                                   ]
             [manual   EncodedReply
                               encodedReply
                                     'STATIC_CALL("readEncodedReply", readBuffer, cBusOptions, requestContext, cBusOptions.srchk)'
@@ -1485,7 +1519,8 @@
 ]
 
 [type EncodedReply(CBusOptions cBusOptions, RequestContext requestContext)
-    [peek    byte peekedByte                                                        ]
+    [state                  requestContext                     ]
+    [peek    byte           peekedByte                         ]
     // TODO: if we reliable can detect this with the mask we don't need the request context anymore
     [virtual bit  isMonitoredSAL            '((peekedByte & 0x3F) == 0x05 || peekedByte == 0x00 || (peekedByte & 0xF8) == 0x00) && !requestContext.sendIdentifyRequestBefore'] // First check if it is in long mode, second for short mode, third for bridged short mode
     [typeSwitch isMonitoredSAL
diff --git a/protocols/eip/src/main/resources/protocols/eip/eip.mspec b/protocols/eip/src/main/resources/protocols/eip/eip.mspec
index da2c40ba01b..c252c45bf83 100644
--- a/protocols/eip/src/main/resources/protocols/eip/eip.mspec
+++ b/protocols/eip/src/main/resources/protocols/eip/eip.mspec
@@ -17,7 +17,7 @@
  * under the License.
  */
 
- [type EipConstants
+ [constants
      [const          uint 16     eipUdpDiscoveryDefaultPort 44818]
      [const          uint 16     eipTcpDefaultPort 44818]
  ]
diff --git a/protocols/iec-60870/src/main/resources/protocols/iec608705104/iec-60870-5-104.mspec b/protocols/iec-60870/src/main/resources/protocols/iec608705104/iec-60870-5-104.mspec
index 133c6902521..07a8191c6ac 100644
--- a/protocols/iec-60870/src/main/resources/protocols/iec608705104/iec-60870-5-104.mspec
+++ b/protocols/iec-60870/src/main/resources/protocols/iec608705104/iec-60870-5-104.mspec
@@ -19,7 +19,7 @@
 
 // https://www.fit.vut.cz/research/publication-file/11570/TR-IEC104.pdf
 
-[type IEC608705104Constants
+[constants
     [const          uint 16     defaultPort 2404]
 ]
 
diff --git a/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec b/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
index 2fa0dcf7d36..ac696d74611 100644
--- a/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
+++ b/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
@@ -1490,7 +1490,7 @@
     ['738' M_ZHONGSHAN_ILLUS_LIGHTING_CO__LTD ['799', '"Zhongshan Illus LIghting Co.,Ltd"']]
     ['739' M_HANGZHOU_KONKE_INFORMATION_TECHNOLOGY_CO___LTD_ ['800', '"Hangzhou Konke Information Technology Co., Ltd."']]
     ['740' M_SHANGHAI_FANTE_DIGITAL_TECHNOLOGY_CO___LTD ['801', '"Shanghai Fante Digital Technology Co., Ltd"']]
-    ['741' M_CONFIO ['802', '"CONFIO"']]
+    ['741' M_CONFIO_TECHNOLOGIES_PVT__LTD ['802', '"Confio Technologies Pvt. Ltd"']]
     ['742' M_SONIC_TECHNOLOGIES ['803', '"Sonic Technologies"']]
     ['743' M_SHANGHAI_INNOVATECH_INFORMATION_TECHNOLOGY_CO___LT ['804', '"Shanghai Innovatech Information Technology Co., Lt"']]
     ['744' M_ABI_SICHERHEITSSYSTEME_GMBH ['805', '"ABI Sicherheitssysteme GmbH"']]
@@ -1501,8 +1501,12 @@
     ['749' M_ROGERWELL_CONTROL_SYSTEM_LIMITED ['810', '"Rogerwell Control System Limited"']]
     ['750' M_SHANGHAI_YUKON_AUTOMATION_TECHNOLOGIES_CO___LTD_ ['811', '"Shanghai YUKON Automation Technologies Co., Ltd."']]
     ['751' M_TECCO_PTY_LTD ['812', '"Tecco Pty Ltd"']]
-    ['752' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
-    ['753' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
+    ['752' M_A_LAN_TECHNOLOGIE ['813', '"A-LAN Technologie"']]
+    ['753' M_VOLTAN_TECHNOLOGY ['814', '"Voltan Technology"']]
+    ['754' M_BAERWINKEL_AND_STRASSER_GMBH ['815', '"Baerwinkel & Strasser GmbH"']]
+    ['755' M_CATERLUX ['816', '"Caterlux"']]
+    ['756' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
+    ['757' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
     
 ]
 
diff --git a/protocols/modbus/src/main/resources/protocols/modbus/modbus.mspec b/protocols/modbus/src/main/resources/protocols/modbus/modbus.mspec
index b5b21fe96e9..6496e3b4161 100644
--- a/protocols/modbus/src/main/resources/protocols/modbus/modbus.mspec
+++ b/protocols/modbus/src/main/resources/protocols/modbus/modbus.mspec
@@ -21,7 +21,7 @@
 
 // Remark: The different fields are encoded in Big-endian.
 
-[type ModbusConstants
+[constants
     [const          uint 16     modbusTcpDefaultPort 502]
 ]
 
diff --git a/protocols/open-protocol/src/main/resources/protocols/openprotocol/open-protocol.mspec b/protocols/open-protocol/src/main/resources/protocols/openprotocol/open-protocol.mspec
index 0a35e16441f..b6151f3420c 100644
--- a/protocols/open-protocol/src/main/resources/protocols/openprotocol/open-protocol.mspec
+++ b/protocols/open-protocol/src/main/resources/protocols/openprotocol/open-protocol.mspec
@@ -20,7 +20,7 @@
 // Spec available from here:
 // https://de.scribd.com/document/428086428/OpenProtocol-Specification-R-2-8-0-9836-4415-01
 
-[type Constants
+[constants
     [const          uint 16     tcpDefaultPort 4545]
 ]
 
diff --git a/protocols/plc4x/src/main/resources/protocols/plc4x/v0/plc4x.mspec b/protocols/plc4x/src/main/resources/protocols/plc4x/v0/plc4x.mspec
index 63de2c00a85..c17156c0076 100644
--- a/protocols/plc4x/src/main/resources/protocols/plc4x/v0/plc4x.mspec
+++ b/protocols/plc4x/src/main/resources/protocols/plc4x/v0/plc4x.mspec
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-[type Plc4xConstants
+[constants
     [const          uint 16     plc4xTcpDefaultPort 59837] // Hex of CAFE
 ]
 
diff --git a/protocols/umas/src/main/resources/protocols/umas/umas.mspec b/protocols/umas/src/main/resources/protocols/umas/umas.mspec
index cf65be4c060..102e971dc08 100644
--- a/protocols/umas/src/main/resources/protocols/umas/umas.mspec
+++ b/protocols/umas/src/main/resources/protocols/umas/umas.mspec
@@ -21,7 +21,7 @@
 
 // Remark: The different fields are encoded in Big-endian.
 
-[type UmasConstants
+[constants
     [const          uint 16     UmasTcpDefaultPort 502]
 ]