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 21be8782d5d..d69d13298b3 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
@@ -31,6 +31,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;
@@ -55,11 +56,13 @@ public void generate(File outputDir, String version, String languageName, String
         List<Template> complexTypesTemplateList;
         List<Template> enumTypesTemplateList;
         List<Template> dataIoTemplateList;
+        List<Template> miscTemplateList;
         try {
             specTemplates = getSpecTemplates(freemarkerConfiguration);
             complexTypesTemplateList = getComplexTypeTemplates(freemarkerConfiguration);
             enumTypesTemplateList = getEnumTypeTemplates(freemarkerConfiguration);
             dataIoTemplateList = getDataIoTemplates(freemarkerConfiguration);
+            miscTemplateList = getMiscTemplates(freemarkerConfiguration);
         } catch (IOException e) {
             throw new GenerationException("Error getting template", e);
         }
@@ -117,6 +120,24 @@ public void generate(File outputDir, String version, String languageName, String
                 }
             }
         }
+
+        // Generate misc outputs
+        if (!miscTemplateList.isEmpty()) {
+            Map<String, Object> typeContext = new HashMap<>();
+            typeContext.put("languageName", languageName);
+            typeContext.put("protocolName", protocolName);
+            typeContext.put("outputFlavor", outputFlavor);
+            typeContext.put("helper", getHelper(null, protocolName, outputFlavor, types, options));
+            typeContext.putAll(options);
+
+            for (Template template : miscTemplateList) {
+                try {
+                    renderTemplate(outputDir, template, typeContext);
+                } catch (IOException | TemplateException e) {
+                    throw new GenerationException("Error generating misc protocol output.", e);
+                }
+            }
+        }
     }
 
     protected void renderTemplate(File outputDir, Template template, Map<String, Object> context)
@@ -186,6 +207,10 @@ private Configuration getFreemarkerConfiguration() throws GenerationException {
 
     protected abstract List<Template> getDataIoTemplates(Configuration freemarkerConfiguration) throws IOException;
 
+    protected List<Template> getMiscTemplates(Configuration freemarkerConfiguration) throws IOException {
+        return Collections.emptyList();
+    }
+
     protected abstract FreemarkerLanguageTemplateHelper getHelper(TypeDefinition thisType, String protocolName, String flavorName, Map<String, TypeDefinition> types,
                                                                   Map<String, String> options);
 
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 485483a56f1..9a486ce8bbd 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
@@ -68,6 +68,11 @@ protected List<Template> getDataIoTemplates(Configuration freemarkerConfiguratio
             freemarkerConfiguration.getTemplate("templates/go/data-io-template.go.ftlh"));
     }
 
+    protected List<Template> getMiscTemplates(Configuration freemarkerConfiguration) throws IOException {
+        return Collections.singletonList(
+            freemarkerConfiguration.getTemplate("templates/go/plc4x_common.go.ftlh"));
+    }
+
     @Override
     protected FreemarkerLanguageTemplateHelper getHelper(TypeDefinition thisType, String protocolName, String flavorName, Map<String, TypeDefinition> types,
         Map<String, String> options) {
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 ea2e9ae40d0..904ddf43ac0 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
@@ -1201,7 +1201,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
 
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):<@emitImport import="io" />
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")<@emitImport import="github.com/rs/zerolog/log" />
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing '${optionalField.name}' field of ${type.name}")<@emitImport import="github.com/pkg/errors" />
@@ -1288,7 +1288,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of ${type.name}")<@emitImport import="github.com/pkg/errors" />
 		}
 		if ${helper.toTypeSafeCompare(reservedField)} {
-			log.Info().Fields(map[string]interface{}{<@emitImport import="github.com/rs/zerolog/log" />
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": ${helper.getReservedValue(reservedField)},
 				"got value": reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -1815,7 +1815,7 @@ func (m *_${type.name}) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved ${helper.getLanguageTypeNameForTypeReference(simpleTypeReference)} = ${helper.getReservedValue(reservedField)}
 		if <#if type.isAbstract()>p</#if>m.reservedField${reservedFieldIndex} != nil {
-			log.Info().Fields(map[string]interface{}{<@emitImport import="github.com/rs/zerolog/log" />
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": ${helper.getReservedValue(reservedField)},
 				"got value": reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/code-generation/language-go/src/main/resources/templates/go/enum-template.go.ftlh b/code-generation/language-go/src/main/resources/templates/go/enum-template.go.ftlh
index 4afc9276ecd..e46efc9c9c9 100644
--- a/code-generation/language-go/src/main/resources/templates/go/enum-template.go.ftlh
+++ b/code-generation/language-go/src/main/resources/templates/go/enum-template.go.ftlh
@@ -51,7 +51,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -184,7 +183,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer) (${type.name}, error) {
 		return <#if type.type.orElseThrow().isStringTypeReference() || type.type.orElseThrow().isVstringTypeReference()>""<#elseif baseType == "bool">false<#else>0</#if>, errors.Wrap(err, "error reading ${type.name}")
 	}
 	if enum, ok := ${type.name}ByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ${type.name}(val), nil
 	} else {
 		return enum, nil
diff --git a/code-generation/language-go/src/main/resources/templates/go/plc4x_common.go.ftlh b/code-generation/language-go/src/main/resources/templates/go/plc4x_common.go.ftlh
new file mode 100644
index 00000000000..f844cffc25b
--- /dev/null
+++ b/code-generation/language-go/src/main/resources/templates/go/plc4x_common.go.ftlh
@@ -0,0 +1,55 @@
+<#--
+  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" -->
+${helper.fileName(protocolName, languageName, outputFlavor)?replace(".", "/")}/model/plc4x_common.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
+
+import "github.com/rs/zerolog/log"
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Plc4xModelLog is the Logger used by the Parse/Serialize methods
+var Plc4xModelLog = log.Logger
+
+</#outputformat>
diff --git a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationPacket.go b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationPacket.go
index 73cece9a0e5..252fba6fb19 100644
--- a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationPacket.go
+++ b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationPacket.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -234,7 +233,7 @@ func CIPEncapsulationPacketParse(readBuffer utils.ReadBuffer) (CIPEncapsulationP
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CIPEncapsulationPacket")
 		}
 		if reserved != uint32(0x00000000) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint32(0x00000000),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -343,7 +342,7 @@ func (pm *_CIPEncapsulationPacket) SerializeParent(writeBuffer utils.WriteBuffer
 	{
 		var reserved uint32 = uint32(0x00000000)
 		if pm.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint32(0x00000000),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/abeth/readwrite/model/DF1RequestMessage.go b/plc4go/protocols/abeth/readwrite/model/DF1RequestMessage.go
index e65619def35..661b643eb9d 100644
--- a/plc4go/protocols/abeth/readwrite/model/DF1RequestMessage.go
+++ b/plc4go/protocols/abeth/readwrite/model/DF1RequestMessage.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -186,7 +185,7 @@ func DF1RequestMessageParse(readBuffer utils.ReadBuffer) (DF1RequestMessage, err
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of DF1RequestMessage")
 		}
 		if reserved != uint16(0x0000) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint16(0x0000),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -273,7 +272,7 @@ func (pm *_DF1RequestMessage) SerializeParent(writeBuffer utils.WriteBuffer, chi
 	{
 		var reserved uint16 = uint16(0x0000)
 		if pm.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint16(0x0000),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/abeth/readwrite/model/DF1ResponseMessage.go b/plc4go/protocols/abeth/readwrite/model/DF1ResponseMessage.go
index 4e86f96c21b..0fc9f8dd190 100644
--- a/plc4go/protocols/abeth/readwrite/model/DF1ResponseMessage.go
+++ b/plc4go/protocols/abeth/readwrite/model/DF1ResponseMessage.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -179,7 +178,7 @@ func DF1ResponseMessageParse(readBuffer utils.ReadBuffer, payloadLength uint16)
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of DF1ResponseMessage")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -210,7 +209,7 @@ func DF1ResponseMessageParse(readBuffer utils.ReadBuffer, payloadLength uint16)
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of DF1ResponseMessage")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -284,7 +283,7 @@ func (pm *_DF1ResponseMessage) SerializeParent(writeBuffer utils.WriteBuffer, ch
 	{
 		var reserved uint8 = uint8(0x00)
 		if pm.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -314,7 +313,7 @@ func (pm *_DF1ResponseMessage) SerializeParent(writeBuffer utils.WriteBuffer, ch
 	{
 		var reserved uint8 = uint8(0x00)
 		if pm.reservedField1 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/abeth/readwrite/model/plc4x_common.go b/plc4go/protocols/abeth/readwrite/model/plc4x_common.go
new file mode 100644
index 00000000000..4a586f90cfe
--- /dev/null
+++ b/plc4go/protocols/abeth/readwrite/model/plc4x_common.go
@@ -0,0 +1,27 @@
+/*
+* 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
+
+import "github.com/rs/zerolog/log"
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Plc4xModelLog is the Logger used by the Parse/Serialize methods
+var Plc4xModelLog = log.Logger
diff --git a/plc4go/protocols/ads/readwrite/model/AdsAddDeviceNotificationRequest.go b/plc4go/protocols/ads/readwrite/model/AdsAddDeviceNotificationRequest.go
index 99d0cf9a0f6..5e1061e6006 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsAddDeviceNotificationRequest.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsAddDeviceNotificationRequest.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -259,7 +258,7 @@ func AdsAddDeviceNotificationRequestParse(readBuffer utils.ReadBuffer) (AdsAddDe
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of AdsAddDeviceNotificationRequest")
 		}
 		if reserved != uint64(0x0000) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint64(0x0000),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -276,7 +275,7 @@ func AdsAddDeviceNotificationRequestParse(readBuffer utils.ReadBuffer) (AdsAddDe
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of AdsAddDeviceNotificationRequest")
 		}
 		if reserved != uint64(0x0000) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint64(0x0000),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -359,7 +358,7 @@ func (m *_AdsAddDeviceNotificationRequest) Serialize(writeBuffer utils.WriteBuff
 		{
 			var reserved uint64 = uint64(0x0000)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint64(0x0000),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -375,7 +374,7 @@ func (m *_AdsAddDeviceNotificationRequest) Serialize(writeBuffer utils.WriteBuff
 		{
 			var reserved uint64 = uint64(0x0000)
 			if m.reservedField1 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint64(0x0000),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/ads/readwrite/model/AdsDataType.go b/plc4go/protocols/ads/readwrite/model/AdsDataType.go
index 6918b275c38..fd0f87ce215 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsDataType.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsDataType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -687,7 +686,7 @@ func AdsDataTypeParse(readBuffer utils.ReadBuffer) (AdsDataType, error) {
 		return 0, errors.Wrap(err, "error reading AdsDataType")
 	}
 	if enum, ok := AdsDataTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return AdsDataType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/ads/readwrite/model/AdsSymbolTableEntry.go b/plc4go/protocols/ads/readwrite/model/AdsSymbolTableEntry.go
index 08428a45553..66b497697e4 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsSymbolTableEntry.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsSymbolTableEntry.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -475,7 +474,7 @@ func AdsSymbolTableEntryParse(readBuffer utils.ReadBuffer) (AdsSymbolTableEntry,
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of AdsSymbolTableEntry")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -527,7 +526,7 @@ func AdsSymbolTableEntryParse(readBuffer utils.ReadBuffer) (AdsSymbolTableEntry,
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of AdsSymbolTableEntry")
 		}
 		if reserved != uint16(0x0000) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint16(0x0000),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -746,7 +745,7 @@ func (m *_AdsSymbolTableEntry) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved uint8 = uint8(0x00)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -797,7 +796,7 @@ func (m *_AdsSymbolTableEntry) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved uint16 = uint16(0x0000)
 		if m.reservedField1 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint16(0x0000),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/ads/readwrite/model/AmsPacket.go b/plc4go/protocols/ads/readwrite/model/AmsPacket.go
index e5daa72110d..a1ac8f63d15 100644
--- a/plc4go/protocols/ads/readwrite/model/AmsPacket.go
+++ b/plc4go/protocols/ads/readwrite/model/AmsPacket.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -407,7 +406,7 @@ func AmsPacketParse(readBuffer utils.ReadBuffer) (AmsPacket, error) {
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of AmsPacket")
 		}
 		if reserved != int8(0x0) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": int8(0x0),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -627,7 +626,7 @@ func (pm *_AmsPacket) SerializeParent(writeBuffer utils.WriteBuffer, child AmsPa
 	{
 		var reserved int8 = int8(0x0)
 		if pm.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": int8(0x0),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/ads/readwrite/model/AmsTCPPacket.go b/plc4go/protocols/ads/readwrite/model/AmsTCPPacket.go
index b59b22ef7b9..ef9e4a36bef 100644
--- a/plc4go/protocols/ads/readwrite/model/AmsTCPPacket.go
+++ b/plc4go/protocols/ads/readwrite/model/AmsTCPPacket.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -123,7 +122,7 @@ func AmsTCPPacketParse(readBuffer utils.ReadBuffer) (AmsTCPPacket, error) {
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of AmsTCPPacket")
 		}
 		if reserved != uint16(0x0000) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint16(0x0000),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -174,7 +173,7 @@ func (m *_AmsTCPPacket) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved uint16 = uint16(0x0000)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint16(0x0000),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/ads/readwrite/model/CommandId.go b/plc4go/protocols/ads/readwrite/model/CommandId.go
index e840877f4d7..064b211368b 100644
--- a/plc4go/protocols/ads/readwrite/model/CommandId.go
+++ b/plc4go/protocols/ads/readwrite/model/CommandId.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -150,7 +149,7 @@ func CommandIdParse(readBuffer utils.ReadBuffer) (CommandId, error) {
 		return 0, errors.Wrap(err, "error reading CommandId")
 	}
 	if enum, ok := CommandIdByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return CommandId(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/ads/readwrite/model/PlcValueType.go b/plc4go/protocols/ads/readwrite/model/PlcValueType.go
index 2817a8ba022..f923131b0a1 100644
--- a/plc4go/protocols/ads/readwrite/model/PlcValueType.go
+++ b/plc4go/protocols/ads/readwrite/model/PlcValueType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -276,7 +275,7 @@ func PlcValueTypeParse(readBuffer utils.ReadBuffer) (PlcValueType, error) {
 		return 0, errors.Wrap(err, "error reading PlcValueType")
 	}
 	if enum, ok := PlcValueTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return PlcValueType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/ads/readwrite/model/ReservedIndexGroups.go b/plc4go/protocols/ads/readwrite/model/ReservedIndexGroups.go
index 257a4568bbc..4ea3e9c11cd 100644
--- a/plc4go/protocols/ads/readwrite/model/ReservedIndexGroups.go
+++ b/plc4go/protocols/ads/readwrite/model/ReservedIndexGroups.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -300,7 +299,7 @@ func ReservedIndexGroupsParse(readBuffer utils.ReadBuffer) (ReservedIndexGroups,
 		return 0, errors.Wrap(err, "error reading ReservedIndexGroups")
 	}
 	if enum, ok := ReservedIndexGroupsByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ReservedIndexGroups(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/ads/readwrite/model/ReturnCode.go b/plc4go/protocols/ads/readwrite/model/ReturnCode.go
index 7246ebe812c..5ef2e4229b5 100644
--- a/plc4go/protocols/ads/readwrite/model/ReturnCode.go
+++ b/plc4go/protocols/ads/readwrite/model/ReturnCode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -822,7 +821,7 @@ func ReturnCodeParse(readBuffer utils.ReadBuffer) (ReturnCode, error) {
 		return 0, errors.Wrap(err, "error reading ReturnCode")
 	}
 	if enum, ok := ReturnCodeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ReturnCode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/ads/readwrite/model/plc4x_common.go b/plc4go/protocols/ads/readwrite/model/plc4x_common.go
new file mode 100644
index 00000000000..4a586f90cfe
--- /dev/null
+++ b/plc4go/protocols/ads/readwrite/model/plc4x_common.go
@@ -0,0 +1,27 @@
+/*
+* 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
+
+import "github.com/rs/zerolog/log"
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Plc4xModelLog is the Logger used by the Parse/Serialize methods
+var Plc4xModelLog = log.Logger
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUAbort.go b/plc4go/protocols/bacnetip/readwrite/model/APDUAbort.go
index 458a0887014..5c74b309a4a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUAbort.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUAbort.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -169,7 +168,7 @@ func APDUAbortParse(readBuffer utils.ReadBuffer, apduLength uint16) (APDUAbort,
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of APDUAbort")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -235,7 +234,7 @@ func (m *_APDUAbort) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUComplexAck.go b/plc4go/protocols/bacnetip/readwrite/model/APDUComplexAck.go
index f0b96c998a2..0b4adc3240a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUComplexAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUComplexAck.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -290,7 +289,7 @@ func APDUComplexAckParse(readBuffer utils.ReadBuffer, apduLength uint16) (APDUCo
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of APDUComplexAck")
 		}
 		if reserved != uint8(0) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -341,7 +340,7 @@ func APDUComplexAckParse(readBuffer utils.ReadBuffer, apduLength uint16) (APDUCo
 		_val, _err := BACnetServiceAckParse(readBuffer, uint16(apduLength)-uint16(apduHeaderReduction))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'serviceAck' field of APDUComplexAck")
@@ -430,7 +429,7 @@ func (m *_APDUComplexAck) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved uint8 = uint8(0)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUConfirmedRequest.go b/plc4go/protocols/bacnetip/readwrite/model/APDUConfirmedRequest.go
index 10cf49933b1..2d08db32090 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUConfirmedRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUConfirmedRequest.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -330,7 +329,7 @@ func APDUConfirmedRequestParse(readBuffer utils.ReadBuffer, apduLength uint16) (
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of APDUConfirmedRequest")
 		}
 		if reserved != uint8(0) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -407,7 +406,7 @@ func APDUConfirmedRequestParse(readBuffer utils.ReadBuffer, apduLength uint16) (
 		_val, _err := BACnetConfirmedServiceRequestParse(readBuffer, uint16(apduLength)-uint16(apduHeaderReduction))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'serviceRequest' field of APDUConfirmedRequest")
@@ -506,7 +505,7 @@ func (m *_APDUConfirmedRequest) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved uint8 = uint8(0)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUError.go b/plc4go/protocols/bacnetip/readwrite/model/APDUError.go
index aa9506148c5..89376ca5ef9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUError.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -169,7 +168,7 @@ func APDUErrorParse(readBuffer utils.ReadBuffer, apduLength uint16) (APDUError,
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of APDUError")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -241,7 +240,7 @@ func (m *_APDUError) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUReject.go b/plc4go/protocols/bacnetip/readwrite/model/APDUReject.go
index d6692fe0419..65a39cd0d3c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUReject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUReject.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -158,7 +157,7 @@ func APDURejectParse(readBuffer utils.ReadBuffer, apduLength uint16) (APDUReject
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of APDUReject")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -216,7 +215,7 @@ func (m *_APDUReject) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUSegmentAck.go b/plc4go/protocols/bacnetip/readwrite/model/APDUSegmentAck.go
index f5f623f0f31..d9b2aa18573 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUSegmentAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUSegmentAck.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -191,7 +190,7 @@ func APDUSegmentAckParse(readBuffer utils.ReadBuffer, apduLength uint16) (APDUSe
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of APDUSegmentAck")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -267,7 +266,7 @@ func (m *_APDUSegmentAck) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUSimpleAck.go b/plc4go/protocols/bacnetip/readwrite/model/APDUSimpleAck.go
index be8e6ae60ee..98df9463cd0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUSimpleAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUSimpleAck.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -158,7 +157,7 @@ func APDUSimpleAckParse(readBuffer utils.ReadBuffer, apduLength uint16) (APDUSim
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of APDUSimpleAck")
 		}
 		if reserved != uint8(0) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -210,7 +209,7 @@ func (m *_APDUSimpleAck) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved uint8 = uint8(0)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUUnconfirmedRequest.go b/plc4go/protocols/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
index 57a5486bc1f..25eb3476181 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -147,7 +146,7 @@ func APDUUnconfirmedRequestParse(readBuffer utils.ReadBuffer, apduLength uint16)
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of APDUUnconfirmedRequest")
 		}
 		if reserved != uint8(0) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -197,7 +196,7 @@ func (m *_APDUUnconfirmedRequest) Serialize(writeBuffer utils.WriteBuffer) error
 		{
 			var reserved uint8 = uint8(0)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ApduType.go b/plc4go/protocols/bacnetip/readwrite/model/ApduType.go
index 2dd9588478c..d5b28f86ef9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ApduType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ApduType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -186,7 +185,7 @@ func ApduTypeParse(readBuffer utils.ReadBuffer) (ApduType, error) {
 		return 0, errors.Wrap(err, "error reading ApduType")
 	}
 	if enum, ok := ApduTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ApduType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReason.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReason.go
index 273efb4be45..8e5fdd9cebf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReason.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReason.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -168,7 +167,7 @@ func BACnetAbortReasonParse(readBuffer utils.ReadBuffer) (BACnetAbortReason, err
 		return 0, errors.Wrap(err, "error reading BACnetAbortReason")
 	}
 	if enum, ok := BACnetAbortReasonByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAbortReason(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisable.go
index 8db9223aa29..1aec83db15b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisable.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -132,7 +131,7 @@ func BACnetAccessAuthenticationFactorDisableParse(readBuffer utils.ReadBuffer) (
 		return 0, errors.Wrap(err, "error reading BACnetAccessAuthenticationFactorDisable")
 	}
 	if enum, ok := BACnetAccessAuthenticationFactorDisableByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAccessAuthenticationFactorDisable(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisable.go
index e270db34dfd..fb84ecf0932 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisable.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -120,7 +119,7 @@ func BACnetAccessCredentialDisableParse(readBuffer utils.ReadBuffer) (BACnetAcce
 		return 0, errors.Wrap(err, "error reading BACnetAccessCredentialDisable")
 	}
 	if enum, ok := BACnetAccessCredentialDisableByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAccessCredentialDisable(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReason.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReason.go
index a1a8d0ea146..31c9052bf81 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReason.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReason.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -156,7 +155,7 @@ func BACnetAccessCredentialDisableReasonParse(readBuffer utils.ReadBuffer) (BACn
 		return 0, errors.Wrap(err, "error reading BACnetAccessCredentialDisableReason")
 	}
 	if enum, ok := BACnetAccessCredentialDisableReasonByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAccessCredentialDisableReason(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEvent.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEvent.go
index 7d2e0c7a829..401ef301450 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEvent.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEvent.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -420,7 +419,7 @@ func BACnetAccessEventParse(readBuffer utils.ReadBuffer) (BACnetAccessEvent, err
 		return 0, errors.Wrap(err, "error reading BACnetAccessEvent")
 	}
 	if enum, ok := BACnetAccessEventByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAccessEvent(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackMode.go
index 335118f9238..7119c75e683 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackMode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func BACnetAccessPassbackModeParse(readBuffer utils.ReadBuffer) (BACnetAccessPas
 		return 0, errors.Wrap(err, "error reading BACnetAccessPassbackMode")
 	}
 	if enum, ok := BACnetAccessPassbackModeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAccessPassbackMode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRule.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRule.go
index f78dc08a2cc..025869d28aa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRule.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRule.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -175,7 +174,7 @@ func BACnetAccessRuleParse(readBuffer utils.ReadBuffer) (BACnetAccessRule, error
 		_val, _err := BACnetDeviceObjectPropertyReferenceEnclosedParse(readBuffer, uint8(1))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'timeRange' field of BACnetAccessRule")
@@ -210,7 +209,7 @@ func BACnetAccessRuleParse(readBuffer utils.ReadBuffer) (BACnetAccessRule, error
 		_val, _err := BACnetDeviceObjectReferenceEnclosedParse(readBuffer, uint8(3))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'location' field of BACnetAccessRule")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifier.go
index 76adf6f7d14..231fcb380bf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifier.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -102,7 +101,7 @@ func BACnetAccessRuleLocationSpecifierParse(readBuffer utils.ReadBuffer) (BACnet
 		return 0, errors.Wrap(err, "error reading BACnetAccessRuleLocationSpecifier")
 	}
 	if enum, ok := BACnetAccessRuleLocationSpecifierByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAccessRuleLocationSpecifier(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifier.go
index 73b7bfd7e8d..6d4d3a0c0f6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifier.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -102,7 +101,7 @@ func BACnetAccessRuleTimeRangeSpecifierParse(readBuffer utils.ReadBuffer) (BACne
 		return 0, errors.Wrap(err, "error reading BACnetAccessRuleTimeRangeSpecifier")
 	}
 	if enum, ok := BACnetAccessRuleTimeRangeSpecifierByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAccessRuleTimeRangeSpecifier(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserType.go
index 0c5edf630b6..5bc730d4155 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func BACnetAccessUserTypeParse(readBuffer utils.ReadBuffer) (BACnetAccessUserTyp
 		return 0, errors.Wrap(err, "error reading BACnetAccessUserType")
 	}
 	if enum, ok := BACnetAccessUserTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAccessUserType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyState.go
index 8740463d9fb..1058bb78410 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyState.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -138,7 +137,7 @@ func BACnetAccessZoneOccupancyStateParse(readBuffer utils.ReadBuffer) (BACnetAcc
 		return 0, errors.Wrap(err, "error reading BACnetAccessZoneOccupancyState")
 	}
 	if enum, ok := BACnetAccessZoneOccupancyStateByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAccessZoneOccupancyState(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatus.go
index bf75ed01ca5..c92af99936a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -120,7 +119,7 @@ func BACnetAccumulatorRecordAccumulatorStatusParse(readBuffer utils.ReadBuffer)
 		return 0, errors.Wrap(err, "error reading BACnetAccumulatorRecordAccumulatorStatus")
 	}
 	if enum, ok := BACnetAccumulatorRecordAccumulatorStatusByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAccumulatorRecordAccumulatorStatus(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAction.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAction.go
index 08b53ecde90..020f1d4d356 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAction.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAction.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -102,7 +101,7 @@ func BACnetActionParse(readBuffer utils.ReadBuffer) (BACnetAction, error) {
 		return 0, errors.Wrap(err, "error reading BACnetAction")
 	}
 	if enum, ok := BACnetActionByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAction(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetActionCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetActionCommand.go
index 39a6de0cbc1..b7f6c83912d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetActionCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetActionCommand.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -208,7 +207,7 @@ func BACnetActionCommandParse(readBuffer utils.ReadBuffer) (BACnetActionCommand,
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(0), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'deviceIdentifier' field of BACnetActionCommand")
@@ -256,7 +255,7 @@ func BACnetActionCommandParse(readBuffer utils.ReadBuffer) (BACnetActionCommand,
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(3), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'arrayIndex' field of BACnetActionCommand")
@@ -278,7 +277,7 @@ func BACnetActionCommandParse(readBuffer utils.ReadBuffer) (BACnetActionCommand,
 		_val, _err := BACnetConstructedDataParse(readBuffer, uint8(4), objectIdentifier.GetObjectType(), propertyIdentifier.GetValue(), (CastBACnetTagPayloadUnsignedInteger(utils.InlineIf(bool((arrayIndex) != (nil)), func() interface{} { return CastBACnetTagPayloadUnsignedInteger((arrayIndex).GetPayload()) }, func() interface{} { return CastBACnetTagPayloadUnsignedInteger(nil) }))))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'propertyValue' field of BACnetActionCommand")
@@ -300,7 +299,7 @@ func BACnetActionCommandParse(readBuffer utils.ReadBuffer) (BACnetActionCommand,
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(5), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'priority' field of BACnetActionCommand")
@@ -322,7 +321,7 @@ func BACnetActionCommandParse(readBuffer utils.ReadBuffer) (BACnetActionCommand,
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(6), BACnetDataType_BOOLEAN)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'postDelay' field of BACnetActionCommand")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorFormat.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorFormat.go
index 98904bceea3..d28bee0e0dd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorFormat.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorFormat.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -155,7 +154,7 @@ func BACnetAuthenticationFactorFormatParse(readBuffer utils.ReadBuffer) (BACnetA
 		_val, _err := BACnetVendorIdTaggedParse(readBuffer, uint8(1), TagClass_CONTEXT_SPECIFIC_TAGS)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'vendorId' field of BACnetAuthenticationFactorFormat")
@@ -177,7 +176,7 @@ func BACnetAuthenticationFactorFormatParse(readBuffer utils.ReadBuffer) (BACnetA
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'vendorFormat' field of BACnetAuthenticationFactorFormat")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorType.go
index f53b5013115..a8b099015d1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -240,7 +239,7 @@ func BACnetAuthenticationFactorTypeParse(readBuffer utils.ReadBuffer) (BACnetAut
 		return 0, errors.Wrap(err, "error reading BACnetAuthenticationFactorType")
 	}
 	if enum, ok := BACnetAuthenticationFactorTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAuthenticationFactorType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatus.go
index ba6c61c8e55..fb1d58b70de 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -132,7 +131,7 @@ func BACnetAuthenticationStatusParse(readBuffer utils.ReadBuffer) (BACnetAuthent
 		return 0, errors.Wrap(err, "error reading BACnetAuthenticationStatus")
 	}
 	if enum, ok := BACnetAuthenticationStatusByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAuthenticationStatus(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemption.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemption.go
index 2000d0db3ad..376c6240923 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemption.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemption.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -138,7 +137,7 @@ func BACnetAuthorizationExemptionParse(readBuffer utils.ReadBuffer) (BACnetAutho
 		return 0, errors.Wrap(err, "error reading BACnetAuthorizationExemption")
 	}
 	if enum, ok := BACnetAuthorizationExemptionByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAuthorizationExemption(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationMode.go
index 91a9e96db47..b31c2a56138 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationMode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -132,7 +131,7 @@ func BACnetAuthorizationModeParse(readBuffer utils.ReadBuffer) (BACnetAuthorizat
 		return 0, errors.Wrap(err, "error reading BACnetAuthorizationMode")
 	}
 	if enum, ok := BACnetAuthorizationModeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetAuthorizationMode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetBDTEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetBDTEntry.go
index b507979ce5a..d5fb8c07477 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetBDTEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetBDTEntry.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -143,7 +142,7 @@ func BACnetBDTEntryParse(readBuffer utils.ReadBuffer) (BACnetBDTEntry, error) {
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_OCTET_STRING)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'broadcastMask' field of BACnetBDTEntry")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupState.go
index f7f4f38a2f0..a2ba0d61650 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupState.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -132,7 +131,7 @@ func BACnetBackupStateParse(readBuffer utils.ReadBuffer) (BACnetBackupState, err
 		return 0, errors.Wrap(err, "error reading BACnetBackupState")
 	}
 	if enum, ok := BACnetBackupStateByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetBackupState(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPV.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPV.go
index be08e6eb2d3..833ba0edc08 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPV.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPV.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -132,7 +131,7 @@ func BACnetBinaryLightingPVParse(readBuffer utils.ReadBuffer) (BACnetBinaryLight
 		return 0, errors.Wrap(err, "error reading BACnetBinaryLightingPV")
 	}
 	if enum, ok := BACnetBinaryLightingPVByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetBinaryLightingPV(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPV.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPV.go
index 8e56f5ac15e..08712b497e0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPV.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPV.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -102,7 +101,7 @@ func BACnetBinaryPVParse(readBuffer utils.ReadBuffer) (BACnetBinaryPV, error) {
 		return 0, errors.Wrap(err, "error reading BACnetBinaryPV")
 	}
 	if enum, ok := BACnetBinaryPVByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetBinaryPV(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry.go
index 1dc0191e464..ca60a85ef90 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -153,7 +152,7 @@ func BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfC
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_REAL)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'covIncrement' field of BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVSubscription.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVSubscription.go
index 473f6522b63..7dc31190fc9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVSubscription.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVSubscription.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -212,7 +211,7 @@ func BACnetCOVSubscriptionParse(readBuffer utils.ReadBuffer) (BACnetCOVSubscript
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(4), BACnetDataType_REAL)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'covIncrement' field of BACnetCOVSubscription")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCharacterEncoding.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCharacterEncoding.go
index e61fd1a02b5..5bd5703e64a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCharacterEncoding.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCharacterEncoding.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -126,7 +125,7 @@ func BACnetCharacterEncodingParse(readBuffer utils.ReadBuffer) (BACnetCharacterE
 		return 0, errors.Wrap(err, "error reading BACnetCharacterEncoding")
 	}
 	if enum, ok := BACnetCharacterEncodingByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetCharacterEncoding(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceChoice.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceChoice.go
index 1c8106129c8..c0deb911218 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceChoice.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceChoice.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -282,7 +281,7 @@ func BACnetConfirmedServiceChoiceParse(readBuffer utils.ReadBuffer) (BACnetConfi
 		return 0, errors.Wrap(err, "error reading BACnetConfirmedServiceChoice")
 	}
 	if enum, ok := BACnetConfirmedServiceChoiceByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetConfirmedServiceChoice(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
index 591a22f253f..a4362d6ceb0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -209,7 +208,7 @@ func BACnetConfirmedServiceRequestAddListElementParse(readBuffer utils.ReadBuffe
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'arrayIndex' field of BACnetConfirmedServiceRequestAddListElement")
@@ -231,7 +230,7 @@ func BACnetConfirmedServiceRequestAddListElementParse(readBuffer utils.ReadBuffe
 		_val, _err := BACnetConstructedDataParse(readBuffer, uint8(3), objectIdentifier.GetObjectType(), propertyIdentifier.GetValue(), (CastBACnetTagPayloadUnsignedInteger(utils.InlineIf(bool((arrayIndex) != (nil)), func() interface{} { return CastBACnetTagPayloadUnsignedInteger((arrayIndex).GetPayload()) }, func() interface{} { return CastBACnetTagPayloadUnsignedInteger(nil) }))))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'listOfElements' field of BACnetConfirmedServiceRequestAddListElement")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
index 7e220f145b4..1dd10fcdeb0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -207,7 +206,7 @@ func BACnetConfirmedServiceRequestAtomicWriteFileParse(readBuffer utils.ReadBuff
 		_val, _err := BACnetOpeningTagParse(readBuffer, uint8(0))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'openingTag' field of BACnetConfirmedServiceRequestAtomicWriteFile")
@@ -255,7 +254,7 @@ func BACnetConfirmedServiceRequestAtomicWriteFileParse(readBuffer utils.ReadBuff
 		_val, _err := BACnetClosingTagParse(readBuffer, uint8(0))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'closingTag' field of BACnetConfirmedServiceRequestAtomicWriteFile")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
index 5a57ba4573d..dd3622a1764 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -231,7 +230,7 @@ func BACnetConfirmedServiceRequestConfirmedCOVNotificationMultipleParse(readBuff
 		_val, _err := BACnetTimeStampEnclosedParse(readBuffer, uint8(3))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'timestamp' field of BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
index 71c7e999f49..5d27e45d199 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -377,7 +376,7 @@ func BACnetConfirmedServiceRequestConfirmedEventNotificationParse(readBuffer uti
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(7), BACnetDataType_CHARACTER_STRING)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'messageText' field of BACnetConfirmedServiceRequestConfirmedEventNotification")
@@ -412,7 +411,7 @@ func BACnetConfirmedServiceRequestConfirmedEventNotificationParse(readBuffer uti
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(9), BACnetDataType_BOOLEAN)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'ackRequired' field of BACnetConfirmedServiceRequestConfirmedEventNotification")
@@ -434,7 +433,7 @@ func BACnetConfirmedServiceRequestConfirmedEventNotificationParse(readBuffer uti
 		_val, _err := BACnetEventStateTaggedParse(readBuffer, uint8(10), TagClass_CONTEXT_SPECIFIC_TAGS)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'fromState' field of BACnetConfirmedServiceRequestConfirmedEventNotification")
@@ -469,7 +468,7 @@ func BACnetConfirmedServiceRequestConfirmedEventNotificationParse(readBuffer uti
 		_val, _err := BACnetNotificationParametersParse(readBuffer, uint8(12), eventObjectIdentifier.GetObjectType())
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'eventValues' field of BACnetConfirmedServiceRequestConfirmedEventNotification")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
index f21c834ba7e..1d357c6845d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -196,7 +195,7 @@ func BACnetConfirmedServiceRequestConfirmedPrivateTransferParse(readBuffer utils
 		_val, _err := BACnetConstructedDataParse(readBuffer, uint8(2), BACnetObjectType_VENDOR_PROPRIETARY_VALUE, BACnetPropertyIdentifier_VENDOR_PROPRIETARY_VALUE, nil)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'serviceParameters' field of BACnetConfirmedServiceRequestConfirmedPrivateTransfer")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
index b86665ba927..1ec45babbb1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConfirmedServiceRequestConfirmedTextMessageParse(readBuffer utils.Rea
 		_val, _err := BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassParse(readBuffer, uint8(1))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'messageClass' field of BACnetConfirmedServiceRequestConfirmedTextMessage")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority.go
index db50be92c4c..e993fdb80b1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -102,7 +101,7 @@ func BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityParse(readB
 		return 0, errors.Wrap(err, "error reading BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority")
 	}
 	if enum, ok := BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
index a07218b0e5b..cf6428c0bb6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -172,7 +171,7 @@ func BACnetConfirmedServiceRequestCreateObjectParse(readBuffer utils.ReadBuffer,
 		_val, _err := BACnetPropertyValuesParse(readBuffer, uint8(1), CastBACnetObjectType(utils.InlineIf(objectSpecifier.GetIsObjectType(), func() interface{} { return CastBACnetObjectType(objectSpecifier.GetObjectType()) }, func() interface{} { return CastBACnetObjectType(objectSpecifier.GetObjectIdentifier().GetObjectType()) })))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'listOfValues' field of BACnetConfirmedServiceRequestCreateObject")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.go
index ac69db14cbd..ef427606251 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -213,7 +212,7 @@ func BACnetConfirmedServiceRequestCreateObjectObjectSpecifierParse(readBuffer ut
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(0), BACnetDataType_ENUMERATED)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'rawObjectType' field of BACnetConfirmedServiceRequestCreateObjectObjectSpecifier")
@@ -245,7 +244,7 @@ func BACnetConfirmedServiceRequestCreateObjectObjectSpecifierParse(readBuffer ut
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'objectIdentifier' field of BACnetConfirmedServiceRequestCreateObjectObjectSpecifier")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
index a67a4ba8520..95811f8df9b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -172,7 +171,7 @@ func BACnetConfirmedServiceRequestDeviceCommunicationControlParse(readBuffer uti
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(0), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'timeDuration' field of BACnetConfirmedServiceRequestDeviceCommunicationControl")
@@ -207,7 +206,7 @@ func BACnetConfirmedServiceRequestDeviceCommunicationControlParse(readBuffer uti
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_CHARACTER_STRING)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'password' field of BACnetConfirmedServiceRequestDeviceCommunicationControl")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable.go
index 03e3219f21d..6208a24a843 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableParse(r
 		return 0, errors.Wrap(err, "error reading BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable")
 	}
 	if enum, ok := BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
index b696124a020..7d6a95fe5dc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -224,7 +223,7 @@ func BACnetConfirmedServiceRequestGetEnrollmentSummaryParse(readBuffer utils.Rea
 		_val, _err := BACnetRecipientProcessEnclosedParse(readBuffer, uint8(1))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'enrollmentFilter' field of BACnetConfirmedServiceRequestGetEnrollmentSummary")
@@ -246,7 +245,7 @@ func BACnetConfirmedServiceRequestGetEnrollmentSummaryParse(readBuffer utils.Rea
 		_val, _err := BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTaggedParse(readBuffer, uint8(2), TagClass_CONTEXT_SPECIFIC_TAGS)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'eventStateFilter' field of BACnetConfirmedServiceRequestGetEnrollmentSummary")
@@ -268,7 +267,7 @@ func BACnetConfirmedServiceRequestGetEnrollmentSummaryParse(readBuffer utils.Rea
 		_val, _err := BACnetEventTypeTaggedParse(readBuffer, uint8(3), TagClass_CONTEXT_SPECIFIC_TAGS)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'eventTypeFilter' field of BACnetConfirmedServiceRequestGetEnrollmentSummary")
@@ -290,7 +289,7 @@ func BACnetConfirmedServiceRequestGetEnrollmentSummaryParse(readBuffer utils.Rea
 		_val, _err := BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilterParse(readBuffer, uint8(4))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'priorityFilter' field of BACnetConfirmedServiceRequestGetEnrollmentSummary")
@@ -312,7 +311,7 @@ func BACnetConfirmedServiceRequestGetEnrollmentSummaryParse(readBuffer utils.Rea
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(5), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'notificationClassFilter' field of BACnetConfirmedServiceRequestGetEnrollmentSummary")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter.go
index 30f6e3d3e67..4077aad9ef8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterParse
 		return 0, errors.Wrap(err, "error reading BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter")
 	}
 	if enum, ok := BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter.go
index df5b5a627fb..3416e7deb70 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -120,7 +119,7 @@ func BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterParse(read
 		return 0, errors.Wrap(err, "error reading BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter")
 	}
 	if enum, ok := BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
index 4fbc0ee7c23..a565062c965 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -148,7 +147,7 @@ func BACnetConfirmedServiceRequestGetEventInformationParse(readBuffer utils.Read
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(0), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'lastReceivedObjectIdentifier' field of BACnetConfirmedServiceRequestGetEventInformation")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
index 7089fc99950..3ca58d8c086 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -220,7 +219,7 @@ func BACnetConfirmedServiceRequestLifeSafetyOperationParse(readBuffer utils.Read
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(3), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'objectIdentifier' field of BACnetConfirmedServiceRequestLifeSafetyOperation")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
index 4d5f1c024b0..a54298f1b13 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -196,7 +195,7 @@ func BACnetConfirmedServiceRequestReadPropertyParse(readBuffer utils.ReadBuffer,
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'arrayIndex' field of BACnetConfirmedServiceRequestReadProperty")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
index 55ad180cab4..715f74547c9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -209,7 +208,7 @@ func BACnetConfirmedServiceRequestReadRangeParse(readBuffer utils.ReadBuffer, se
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'propertyArrayIndex' field of BACnetConfirmedServiceRequestReadRange")
@@ -231,7 +230,7 @@ func BACnetConfirmedServiceRequestReadRangeParse(readBuffer utils.ReadBuffer, se
 		_val, _err := BACnetConfirmedServiceRequestReadRangeRangeParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'readRange' field of BACnetConfirmedServiceRequestReadRange")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
index d9a45a886de..cfab369c8e1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -172,7 +171,7 @@ func BACnetConfirmedServiceRequestReinitializeDeviceParse(readBuffer utils.ReadB
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_CHARACTER_STRING)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'password' field of BACnetConfirmedServiceRequestReinitializeDevice")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice.go
index 6cf1ac0f777..25a0c0eda53 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -144,7 +143,7 @@ func BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevicePa
 		return 0, errors.Wrap(err, "error reading BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice")
 	}
 	if enum, ok := BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
index 2c37a30d72b..633ad89de74 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -209,7 +208,7 @@ func BACnetConfirmedServiceRequestRemoveListElementParse(readBuffer utils.ReadBu
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'arrayIndex' field of BACnetConfirmedServiceRequestRemoveListElement")
@@ -231,7 +230,7 @@ func BACnetConfirmedServiceRequestRemoveListElementParse(readBuffer utils.ReadBu
 		_val, _err := BACnetConstructedDataParse(readBuffer, uint8(3), objectIdentifier.GetObjectType(), propertyIdentifier.GetValue(), (CastBACnetTagPayloadUnsignedInteger(utils.InlineIf(bool((arrayIndex) != (nil)), func() interface{} { return CastBACnetTagPayloadUnsignedInteger((arrayIndex).GetPayload()) }, func() interface{} { return CastBACnetTagPayloadUnsignedInteger(nil) }))))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'listOfElements' field of BACnetConfirmedServiceRequestRemoveListElement")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
index 285a70ca790..790e4502437 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -209,7 +208,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVParse(readBuffer utils.ReadBuffer,
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_BOOLEAN)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'issueConfirmed' field of BACnetConfirmedServiceRequestSubscribeCOV")
@@ -231,7 +230,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVParse(readBuffer utils.ReadBuffer,
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(3), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'lifetimeInSeconds' field of BACnetConfirmedServiceRequestSubscribeCOV")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
index 31e903d5536..b5e86bb7b07 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -233,7 +232,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVPropertyParse(readBuffer utils.Rea
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_BOOLEAN)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'issueConfirmedNotifications' field of BACnetConfirmedServiceRequestSubscribeCOVProperty")
@@ -255,7 +254,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVPropertyParse(readBuffer utils.Rea
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(3), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'lifetime' field of BACnetConfirmedServiceRequestSubscribeCOVProperty")
@@ -290,7 +289,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVPropertyParse(readBuffer utils.Rea
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(5), BACnetDataType_REAL)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'covIncrement' field of BACnetConfirmedServiceRequestSubscribeCOVProperty")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
index 6771b1cba7d..02d3d3f8adc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -209,7 +208,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleParse(readBuffer u
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_BOOLEAN)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'issueConfirmedNotifications' field of BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple")
@@ -231,7 +230,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleParse(readBuffer u
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'lifetime' field of BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple")
@@ -253,7 +252,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleParse(readBuffer u
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(3), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'maxNotificationDelay' field of BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference.go
index 9e4896a6c4a..104981f5996 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -153,7 +152,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscript
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_REAL)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'covIncrement' field of BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
index 67d0ebb35a3..9e428e9487b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -220,7 +219,7 @@ func BACnetConfirmedServiceRequestWritePropertyParse(readBuffer utils.ReadBuffer
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'arrayIndex' field of BACnetConfirmedServiceRequestWriteProperty")
@@ -255,7 +254,7 @@ func BACnetConfirmedServiceRequestWritePropertyParse(readBuffer utils.ReadBuffer
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(4), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'priority' field of BACnetConfirmedServiceRequestWriteProperty")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoors.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoors.go
index 0cf8604a375..94fa95fd44c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoors.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoors.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataAccessDoorsParse(readBuffer utils.ReadBuffer, tagNumbe
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataAccessDoors")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAction.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAction.go
index 3101d5d1e45..532efe617fa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAction.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAction.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataActionParse(readBuffer utils.ReadBuffer, tagNumber uin
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataAction")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActionText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActionText.go
index 62f8293ad57..3fd64f9972b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActionText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActionText.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataActionTextParse(readBuffer utils.ReadBuffer, tagNumber
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataActionText")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValues.go
index f02ee31acd4..83d5f0c2b10 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValues.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataAlarmValuesParse(readBuffer utils.ReadBuffer, tagNumbe
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataAlarmValues")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedAccessRights.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedAccessRights.go
index e1cc5311aaf..717303fa80d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedAccessRights.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedAccessRights.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataAssignedAccessRightsParse(readBuffer utils.ReadBuffer,
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataAssignedAccessRights")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedLandingCalls.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedLandingCalls.go
index 1b957e76894..f2a23b99874 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedLandingCalls.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedLandingCalls.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataAssignedLandingCallsParse(readBuffer utils.ReadBuffer,
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataAssignedLandingCalls")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationFactors.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationFactors.go
index a6f2c704f76..b695aa44e9d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationFactors.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationFactors.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataAuthenticationFactorsParse(readBuffer utils.ReadBuffer
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataAuthenticationFactors")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyList.go
index e2b0d741741..2c924bdb995 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyList.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataAuthenticationPolicyListParse(readBuffer utils.ReadBuf
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataAuthenticationPolicyList")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyNames.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyNames.go
index 8691a32e7dc..da1100910ba 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyNames.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyNames.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataAuthenticationPolicyNamesParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataAuthenticationPolicyNames")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueAlarmValues.go
index e881a0ebb06..d39467fc2d7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueAlarmValues.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataBitStringValueAlarmValuesParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataBitStringValueAlarmValues")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitText.go
index 57b111345bb..0f6fdcada4c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitText.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataBitTextParse(readBuffer utils.ReadBuffer, tagNumber ui
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataBitText")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorCommand.go
index 4f4e22b190c..52324199291 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorCommand.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataCarDoorCommandParse(readBuffer utils.ReadBuffer, tagNu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataCarDoorCommand")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorStatus.go
index 57376642a93..34e4fa86147 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataCarDoorStatusParse(readBuffer utils.ReadBuffer, tagNum
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataCarDoorStatus")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorText.go
index 0eabdd6a2aa..c1f95380f75 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorText.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataCarDoorTextParse(readBuffer utils.ReadBuffer, tagNumbe
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataCarDoorText")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelListOfObjectPropertyReferences.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelListOfObjectPropertyReferences.go
index 17bb2f0d9b1..a01bb2df68a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelListOfObjectPropertyReferences.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelListOfObjectPropertyReferences.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataChannelListOfObjectPropertyReferencesParse(readBuffer
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataChannelListOfObjectPropertyReferences")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueAlarmValues.go
index aeafd8e16b1..0380a9e5891 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueAlarmValues.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataCharacterStringValueAlarmValuesParse(readBuffer utils.
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataCharacterStringValueAlarmValues")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueFaultValues.go
index ba93949d8e9..a532ea57a03 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueFaultValues.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataCharacterStringValueFaultValuesParse(readBuffer utils.
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataCharacterStringValueFaultValues")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAction.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAction.go
index f3e4fa91c21..ca8fb05433f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAction.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAction.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataCommandActionParse(readBuffer utils.ReadBuffer, tagNum
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataCommandAction")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandTimeArray.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandTimeArray.go
index 58cb2f6114e..7981e17799a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandTimeArray.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandTimeArray.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataCommandTimeArrayParse(readBuffer utils.ReadBuffer, tag
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataCommandTimeArray")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataConfigurationFiles.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataConfigurationFiles.go
index ad5781d2fe8..3761f9e0fd2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataConfigurationFiles.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataConfigurationFiles.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataConfigurationFilesParse(readBuffer utils.ReadBuffer, t
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataConfigurationFiles")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlGroups.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlGroups.go
index f6df7647433..76e79561a15 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlGroups.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlGroups.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataControlGroupsParse(readBuffer utils.ReadBuffer, tagNum
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataControlGroups")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorMembers.go
index 2de57016eed..8ed4e49c867 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorMembers.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataDoorMembersParse(readBuffer utils.ReadBuffer, tagNumbe
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataDoorMembers")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go
index 3c1ba0b795c..4158db14175 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -254,7 +253,7 @@ func BACnetConstructedDataElementParse(readBuffer utils.ReadBuffer, objectTypeAr
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'applicationTag' field of BACnetConstructedDataElement")
@@ -276,7 +275,7 @@ func BACnetConstructedDataElementParse(readBuffer utils.ReadBuffer, objectTypeAr
 		_val, _err := BACnetContextTagParse(readBuffer, peekedTagNumber, BACnetDataType_UNKNOWN)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'contextTag' field of BACnetConstructedDataElement")
@@ -298,7 +297,7 @@ func BACnetConstructedDataElementParse(readBuffer utils.ReadBuffer, objectTypeAr
 		_val, _err := BACnetConstructedDataParse(readBuffer, peekedTagNumber, objectTypeArgument, propertyIdentifierArgument, arrayIndexArgument)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'constructedData' field of BACnetConstructedDataElement")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupGroupMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupGroupMembers.go
index 226e4cf0faa..691548e8aab 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupGroupMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupGroupMembers.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataElevatorGroupGroupMembersParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataElevatorGroupGroupMembers")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTexts.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTexts.go
index 845b4f9c44b..b724a6fb807 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTexts.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTexts.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -224,7 +223,7 @@ func BACnetConstructedDataEventMessageTextsParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataEventMessageTexts")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTextsConfig.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTextsConfig.go
index fabbaea1ae2..53abeddf537 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTextsConfig.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTextsConfig.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -224,7 +223,7 @@ func BACnetConstructedDataEventMessageTextsConfigParse(readBuffer utils.ReadBuff
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataEventMessageTextsConfig")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventTimeStamps.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventTimeStamps.go
index 86f20984d7e..9c159d7dbbc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventTimeStamps.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventTimeStamps.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -224,7 +223,7 @@ func BACnetConstructedDataEventTimeStampsParse(readBuffer utils.ReadBuffer, tagN
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataEventTimeStamps")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExceptionSchedule.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExceptionSchedule.go
index d29079b16a8..25676b63877 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExceptionSchedule.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExceptionSchedule.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataExceptionScheduleParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataExceptionSchedule")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExecutionDelay.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExecutionDelay.go
index 2c8c85aa0da..f007e14773b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExecutionDelay.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExecutionDelay.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataExecutionDelayParse(readBuffer utils.ReadBuffer, tagNu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataExecutionDelay")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultValues.go
index e2968f42cff..f0ca7995ad2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultValues.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataFaultValuesParse(readBuffer utils.ReadBuffer, tagNumbe
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataFaultValues")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFloorText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFloorText.go
index ed96fe4e80a..0c24733c657 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFloorText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFloorText.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataFloorTextParse(readBuffer utils.ReadBuffer, tagNumber
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataFloorText")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupGroupMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupGroupMembers.go
index 921b4299cd1..d1bd2c621d7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupGroupMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupGroupMembers.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataGlobalGroupGroupMembersParse(readBuffer utils.ReadBuff
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataGlobalGroupGroupMembers")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupPresentValue.go
index c6285e37fe1..40beffca343 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupPresentValue.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataGlobalGroupPresentValueParse(readBuffer utils.ReadBuff
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataGlobalGroupPresentValue")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMemberNames.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMemberNames.go
index 6d0a35e199a..d50237921aa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMemberNames.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMemberNames.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataGroupMemberNamesParse(readBuffer utils.ReadBuffer, tag
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataGroupMemberNames")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMembers.go
index 4d0c26cf3e8..8fc7faa9c9a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMembers.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataGroupMembersParse(readBuffer utils.ReadBuffer, tagNumb
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataGroupMembers")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDNSServer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDNSServer.go
index 4bc38c1349d..f7d2d72ba16 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDNSServer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDNSServer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataIPDNSServerParse(readBuffer utils.ReadBuffer, tagNumbe
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataIPDNSServer")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DNSServer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DNSServer.go
index b7911917358..ff91bc99305 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DNSServer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DNSServer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataIPv6DNSServerParse(readBuffer utils.ReadBuffer, tagNum
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataIPv6DNSServer")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataKeySets.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataKeySets.go
index 032436015f9..2ab17287a9a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataKeySets.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataKeySets.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataKeySetsParse(readBuffer utils.ReadBuffer, tagNumber ui
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataKeySets")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingDoorStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingDoorStatus.go
index 4b5d94e87cd..1fb2ada97ab 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingDoorStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingDoorStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataLandingDoorStatusParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataLandingDoorStatus")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeeds.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeeds.go
index 10f75399b32..e53ca1c5394 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeeds.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeeds.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataLinkSpeedsParse(readBuffer utils.ReadBuffer, tagNumber
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataLinkSpeeds")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogBuffer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogBuffer.go
index 11849dd3696..c95734a3bc7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogBuffer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogBuffer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataLogBufferParse(readBuffer utils.ReadBuffer, tagNumber
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataLogBuffer")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMakingCarCall.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMakingCarCall.go
index 5027dab65a2..7c287372e9e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMakingCarCall.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMakingCarCall.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataMakingCarCallParse(readBuffer utils.ReadBuffer, tagNum
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataMakingCarCall")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNegativeAccessRules.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNegativeAccessRules.go
index f047d84558f..2372484a6ce 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNegativeAccessRules.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNegativeAccessRules.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataNegativeAccessRulesParse(readBuffer utils.ReadBuffer,
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataNegativeAccessRules")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkAccessSecurityPolicies.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkAccessSecurityPolicies.go
index 037c914fcf8..acc2316f329 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkAccessSecurityPolicies.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkAccessSecurityPolicies.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataNetworkAccessSecurityPoliciesParse(readBuffer utils.Re
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataNetworkAccessSecurityPolicies")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectList.go
index 889169a4464..09ba9dec290 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectList.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataObjectListParse(readBuffer utils.ReadBuffer, tagNumber
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataObjectList")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPortFilter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPortFilter.go
index e7e600b581f..664f8964d5c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPortFilter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPortFilter.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataPortFilterParse(readBuffer utils.ReadBuffer, tagNumber
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataPortFilter")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveAccessRules.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveAccessRules.go
index b49b154b370..5886dc7edfc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveAccessRules.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveAccessRules.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataPositiveAccessRulesParse(readBuffer utils.ReadBuffer,
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataPositiveAccessRules")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriority.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriority.go
index 899feaa1fe8..177410a7839 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriority.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriority.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataPriorityParse(readBuffer utils.ReadBuffer, tagNumber u
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataPriority")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPropertyList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPropertyList.go
index 0bb716b0375..00bfd0a8d67 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPropertyList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPropertyList.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataPropertyListParse(readBuffer utils.ReadBuffer, tagNumb
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataPropertyList")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRegisteredCarCall.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRegisteredCarCall.go
index cd01eb2d9d5..5c3f6498e97 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRegisteredCarCall.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRegisteredCarCall.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataRegisteredCarCallParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataRegisteredCarCall")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevelDescriptions.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevelDescriptions.go
index 84096d6c313..dca441766ff 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevelDescriptions.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevelDescriptions.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataShedLevelDescriptionsParse(readBuffer utils.ReadBuffer
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataShedLevelDescriptions")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevels.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevels.go
index 16e860cab92..99811aa9f21 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevels.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevels.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataShedLevelsParse(readBuffer utils.ReadBuffer, tagNumber
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataShedLevels")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateChangeValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateChangeValues.go
index 321d8ba31b2..8397a6d3edf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateChangeValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateChangeValues.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataStateChangeValuesParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataStateChangeValues")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateText.go
index b89fbfc095e..1daecaf0685 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateText.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataStateTextParse(readBuffer utils.ReadBuffer, tagNumber
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataStateText")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredObjectList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredObjectList.go
index 2b6f6d34263..104a7ef25cf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredObjectList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredObjectList.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataStructuredObjectListParse(readBuffer utils.ReadBuffer,
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataStructuredObjectList")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateAnnotations.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateAnnotations.go
index 4db30295bdc..1bf3af87bdb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateAnnotations.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateAnnotations.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataSubordinateAnnotationsParse(readBuffer utils.ReadBuffe
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataSubordinateAnnotations")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateList.go
index f8c6dcf0ceb..a58cb6d81e2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateList.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataSubordinateListParse(readBuffer utils.ReadBuffer, tagN
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataSubordinateList")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateNodeTypes.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateNodeTypes.go
index 4f9c32ea024..17d74ade160 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateNodeTypes.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateNodeTypes.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataSubordinateNodeTypesParse(readBuffer utils.ReadBuffer,
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataSubordinateNodeTypes")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateRelationships.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateRelationships.go
index ca52def404d..4f4cad06688 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateRelationships.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateRelationships.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataSubordinateRelationshipsParse(readBuffer utils.ReadBuf
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataSubordinateRelationships")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateTags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateTags.go
index 0b518ecd144..8d4b2b3f0c5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateTags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateTags.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataSubordinateTagsParse(readBuffer utils.ReadBuffer, tagN
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataSubordinateTags")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormatClasses.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormatClasses.go
index 515e87b5c91..e0f46fd395c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormatClasses.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormatClasses.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataSupportedFormatClassesParse(readBuffer utils.ReadBuffe
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataSupportedFormatClasses")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormats.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormats.go
index 92a569435f1..ed17a063d32 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormats.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormats.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataSupportedFormatsParse(readBuffer utils.ReadBuffer, tag
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataSupportedFormats")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTags.go
index ea5e453c597..00fc4766cb8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTags.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataTagsParse(readBuffer utils.ReadBuffer, tagNumber uint8
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataTags")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.go
index 1300b5e8bf1..019c04f2b87 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataTrendLogMultipleLogDeviceObjectPropertyParse(readBuffe
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
index a38d3136600..31e51ac3587 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataUnspecifiedParse(readBuffer utils.ReadBuffer, tagNumbe
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataUnspecified")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSourceArray.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSourceArray.go
index 281ba6b49cf..52e35aea592 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSourceArray.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSourceArray.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataValueSourceArrayParse(readBuffer utils.ReadBuffer, tag
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataValueSourceArray")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWeeklySchedule.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWeeklySchedule.go
index dfc0737453d..2b3b357a8ba 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWeeklySchedule.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWeeklySchedule.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetConstructedDataWeeklyScheduleParse(readBuffer utils.ReadBuffer, tagNu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetConstructedDataWeeklySchedule")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDataType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDataType.go
index 198907383a9..64435b13379 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDataType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDataType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -174,7 +173,7 @@ func BACnetDataTypeParse(readBuffer utils.ReadBuffer) (BACnetDataType, error) {
 		return 0, errors.Wrap(err, "error reading BACnetDataType")
 	}
 	if enum, ok := BACnetDataTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetDataType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeek.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeek.go
index 93e49590d47..64b07f3847f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeek.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeek.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -132,7 +131,7 @@ func BACnetDaysOfWeekParse(readBuffer utils.ReadBuffer) (BACnetDaysOfWeek, error
 		return 0, errors.Wrap(err, "error reading BACnetDaysOfWeek")
 	}
 	if enum, ok := BACnetDaysOfWeekByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetDaysOfWeek(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go
index 72c6278f700..3d372fe842b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -178,7 +177,7 @@ func BACnetDeviceObjectPropertyReferenceParse(readBuffer utils.ReadBuffer) (BACn
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'arrayIndex' field of BACnetDeviceObjectPropertyReference")
@@ -200,7 +199,7 @@ func BACnetDeviceObjectPropertyReferenceParse(readBuffer utils.ReadBuffer) (BACn
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(3), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'deviceIdentifier' field of BACnetDeviceObjectPropertyReference")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReference.go
index 5551ba31cbe..97e60878aae 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReference.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -130,7 +129,7 @@ func BACnetDeviceObjectReferenceParse(readBuffer utils.ReadBuffer) (BACnetDevice
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(0), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'deviceIdentifier' field of BACnetDeviceObjectReference")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatus.go
index 2847fcacef3..a48dbfa0c05 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -132,7 +131,7 @@ func BACnetDeviceStatusParse(readBuffer utils.ReadBuffer) (BACnetDeviceStatus, e
 		return 0, errors.Wrap(err, "error reading BACnetDeviceStatus")
 	}
 	if enum, ok := BACnetDeviceStatusByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetDeviceStatus(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmState.go
index 8412b423836..8dacdcb40e6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmState.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -150,7 +149,7 @@ func BACnetDoorAlarmStateParse(readBuffer utils.ReadBuffer) (BACnetDoorAlarmStat
 		return 0, errors.Wrap(err, "error reading BACnetDoorAlarmState")
 	}
 	if enum, ok := BACnetDoorAlarmStateByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetDoorAlarmState(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatus.go
index 655dd8bb248..a731999164d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func BACnetDoorSecuredStatusParse(readBuffer utils.ReadBuffer) (BACnetDoorSecure
 		return 0, errors.Wrap(err, "error reading BACnetDoorSecuredStatus")
 	}
 	if enum, ok := BACnetDoorSecuredStatusByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetDoorSecuredStatus(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatus.go
index a991357f95d..d564f9de580 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -156,7 +155,7 @@ func BACnetDoorStatusParse(readBuffer utils.ReadBuffer) (BACnetDoorStatus, error
 		return 0, errors.Wrap(err, "error reading BACnetDoorStatus")
 	}
 	if enum, ok := BACnetDoorStatusByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetDoorStatus(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValue.go
index 0ff511abe31..ed9a57c27f5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValue.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func BACnetDoorValueParse(readBuffer utils.ReadBuffer) (BACnetDoorValue, error)
 		return 0, errors.Wrap(err, "error reading BACnetDoorValue")
 	}
 	if enum, ok := BACnetDoorValueByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetDoorValue(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnits.go
index b4a24248ab7..6e42788c4d6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnits.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -1602,7 +1601,7 @@ func BACnetEngineeringUnitsParse(readBuffer utils.ReadBuffer) (BACnetEngineering
 		return 0, errors.Wrap(err, "error reading BACnetEngineeringUnits")
 	}
 	if enum, ok := BACnetEngineeringUnitsByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetEngineeringUnits(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFault.go
index 42d2fcf052b..a16088f08d7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFault.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -150,7 +149,7 @@ func BACnetEscalatorFaultParse(readBuffer utils.ReadBuffer) (BACnetEscalatorFaul
 		return 0, errors.Wrap(err, "error reading BACnetEscalatorFault")
 	}
 	if enum, ok := BACnetEscalatorFaultByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetEscalatorFault(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorMode.go
index 957ae9431be..848214ed265 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorMode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -132,7 +131,7 @@ func BACnetEscalatorModeParse(readBuffer utils.ReadBuffer) (BACnetEscalatorMode,
 		return 0, errors.Wrap(err, "error reading BACnetEscalatorMode")
 	}
 	if enum, ok := BACnetEscalatorModeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetEscalatorMode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirection.go
index a440366a4f9..c8567a871c5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirection.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -132,7 +131,7 @@ func BACnetEscalatorOperationDirectionParse(readBuffer utils.ReadBuffer) (BACnet
 		return 0, errors.Wrap(err, "error reading BACnetEscalatorOperationDirection")
 	}
 	if enum, ok := BACnetEscalatorOperationDirectionByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetEscalatorOperationDirection(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventNotificationSubscription.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventNotificationSubscription.go
index f3dfad7f7f4..464455236d9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventNotificationSubscription.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventNotificationSubscription.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -176,7 +175,7 @@ func BACnetEventNotificationSubscriptionParse(readBuffer utils.ReadBuffer) (BACn
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_BOOLEAN)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'issueConfirmedNotifications' field of BACnetEventNotificationSubscription")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go
index 9256293e269..45a7bbc55c2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -459,7 +458,7 @@ func BACnetEventParameterExtendedParametersParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'nullValue' field of BACnetEventParameterExtendedParameters")
@@ -481,7 +480,7 @@ func BACnetEventParameterExtendedParametersParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'realValue' field of BACnetEventParameterExtendedParameters")
@@ -503,7 +502,7 @@ func BACnetEventParameterExtendedParametersParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'unsignedValue' field of BACnetEventParameterExtendedParameters")
@@ -525,7 +524,7 @@ func BACnetEventParameterExtendedParametersParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'booleanValue' field of BACnetEventParameterExtendedParameters")
@@ -547,7 +546,7 @@ func BACnetEventParameterExtendedParametersParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'integerValue' field of BACnetEventParameterExtendedParameters")
@@ -569,7 +568,7 @@ func BACnetEventParameterExtendedParametersParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'doubleValue' field of BACnetEventParameterExtendedParameters")
@@ -591,7 +590,7 @@ func BACnetEventParameterExtendedParametersParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'octetStringValue' field of BACnetEventParameterExtendedParameters")
@@ -613,7 +612,7 @@ func BACnetEventParameterExtendedParametersParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'characterStringValue' field of BACnetEventParameterExtendedParameters")
@@ -635,7 +634,7 @@ func BACnetEventParameterExtendedParametersParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'bitStringValue' field of BACnetEventParameterExtendedParameters")
@@ -657,7 +656,7 @@ func BACnetEventParameterExtendedParametersParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'enumeratedValue' field of BACnetEventParameterExtendedParameters")
@@ -679,7 +678,7 @@ func BACnetEventParameterExtendedParametersParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'dateValue' field of BACnetEventParameterExtendedParameters")
@@ -701,7 +700,7 @@ func BACnetEventParameterExtendedParametersParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'timeValue' field of BACnetEventParameterExtendedParameters")
@@ -723,7 +722,7 @@ func BACnetEventParameterExtendedParametersParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'objectIdentifier' field of BACnetEventParameterExtendedParameters")
@@ -745,7 +744,7 @@ func BACnetEventParameterExtendedParametersParse(readBuffer utils.ReadBuffer, ta
 		_val, _err := BACnetDeviceObjectPropertyReferenceEnclosedParse(readBuffer, uint8(0))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'reference' field of BACnetEventParameterExtendedParameters")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventState.go
index c34ba270c8f..7b9be25f05e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventState.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -132,7 +131,7 @@ func BACnetEventStateParse(readBuffer utils.ReadBuffer) (BACnetEventState, error
 		return 0, errors.Wrap(err, "error reading BACnetEventState")
 	}
 	if enum, ok := BACnetEventStateByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetEventState(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBits.go
index 3dd49369ee2..ce5e7b30f79 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBits.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func BACnetEventTransitionBitsParse(readBuffer utils.ReadBuffer) (BACnetEventTra
 		return 0, errors.Wrap(err, "error reading BACnetEventTransitionBits")
 	}
 	if enum, ok := BACnetEventTransitionBitsByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetEventTransitionBits(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventType.go
index 8985562267b..9a7b8d4fa8d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -216,7 +215,7 @@ func BACnetEventTypeParse(readBuffer utils.ReadBuffer) (BACnetEventType, error)
 		return 0, errors.Wrap(err, "error reading BACnetEventType")
 	}
 	if enum, ok := BACnetEventTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetEventType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultType.go
index 52fe4eb3023..21fe2eccebc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -138,7 +137,7 @@ func BACnetFaultTypeParse(readBuffer utils.ReadBuffer) (BACnetFaultType, error)
 		return 0, errors.Wrap(err, "error reading BACnetFaultType")
 	}
 	if enum, ok := BACnetFaultTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetFaultType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethod.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethod.go
index 89594e2ad0c..9d4fd75e26f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethod.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethod.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -102,7 +101,7 @@ func BACnetFileAccessMethodParse(readBuffer utils.ReadBuffer) (BACnetFileAccessM
 		return 0, errors.Wrap(err, "error reading BACnetFileAccessMethod")
 	}
 	if enum, ok := BACnetFileAccessMethodByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetFileAccessMethod(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValue.go
index 596e73fb4fe..3ff8a3f47b5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValue.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -153,7 +152,7 @@ func BACnetGroupChannelValueParse(readBuffer utils.ReadBuffer) (BACnetGroupChann
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'overridingPriority' field of BACnetGroupChannelValue")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetIPMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetIPMode.go
index fead0e275a9..6181a1beff1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetIPMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetIPMode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func BACnetIPModeParse(readBuffer utils.ReadBuffer) (BACnetIPMode, error) {
 		return 0, errors.Wrap(err, "error reading BACnetIPMode")
 	}
 	if enum, ok := BACnetIPModeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetIPMode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatus.go
index 5abcd682007..0afeb950175 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -166,7 +165,7 @@ func BACnetLandingCallStatusParse(readBuffer utils.ReadBuffer) (BACnetLandingCal
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(3), BACnetDataType_CHARACTER_STRING)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'floorText' field of BACnetLandingCallStatus")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyMode.go
index 08f06614e97..5a438f09e09 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyMode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -186,7 +185,7 @@ func BACnetLifeSafetyModeParse(readBuffer utils.ReadBuffer) (BACnetLifeSafetyMod
 		return 0, errors.Wrap(err, "error reading BACnetLifeSafetyMode")
 	}
 	if enum, ok := BACnetLifeSafetyModeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLifeSafetyMode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperation.go
index 8400ece4170..2e7df6bda5e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperation.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -156,7 +155,7 @@ func BACnetLifeSafetyOperationParse(readBuffer utils.ReadBuffer) (BACnetLifeSafe
 		return 0, errors.Wrap(err, "error reading BACnetLifeSafetyOperation")
 	}
 	if enum, ok := BACnetLifeSafetyOperationByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLifeSafetyOperation(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyState.go
index e73c105410e..5187cf1edbc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyState.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -240,7 +239,7 @@ func BACnetLifeSafetyStateParse(readBuffer utils.ReadBuffer) (BACnetLifeSafetySt
 		return 0, errors.Wrap(err, "error reading BACnetLifeSafetyState")
 	}
 	if enum, ok := BACnetLifeSafetyStateByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLifeSafetyState(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirection.go
index db9a21124f1..cc61a5e5f73 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirection.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -132,7 +131,7 @@ func BACnetLiftCarDirectionParse(readBuffer utils.ReadBuffer) (BACnetLiftCarDire
 		return 0, errors.Wrap(err, "error reading BACnetLiftCarDirection")
 	}
 	if enum, ok := BACnetLiftCarDirectionByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLiftCarDirection(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommand.go
index 8421bef0756..e732a5bbfe3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommand.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func BACnetLiftCarDoorCommandParse(readBuffer utils.ReadBuffer) (BACnetLiftCarDo
 		return 0, errors.Wrap(err, "error reading BACnetLiftCarDoorCommand")
 	}
 	if enum, ok := BACnetLiftCarDoorCommandByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLiftCarDoorCommand(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatus.go
index ad89637adb4..84b22735a1a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -156,7 +155,7 @@ func BACnetLiftCarDriveStatusParse(readBuffer utils.ReadBuffer) (BACnetLiftCarDr
 		return 0, errors.Wrap(err, "error reading BACnetLiftCarDriveStatus")
 	}
 	if enum, ok := BACnetLiftCarDriveStatusByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLiftCarDriveStatus(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarMode.go
index 707a56eceb3..96c1a23deb9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarMode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -180,7 +179,7 @@ func BACnetLiftCarModeParse(readBuffer utils.ReadBuffer) (BACnetLiftCarMode, err
 		return 0, errors.Wrap(err, "error reading BACnetLiftCarMode")
 	}
 	if enum, ok := BACnetLiftCarModeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLiftCarMode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFault.go
index 4e8a4ebc0a2..cd44227caf6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFault.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -198,7 +197,7 @@ func BACnetLiftFaultParse(readBuffer utils.ReadBuffer) (BACnetLiftFault, error)
 		return 0, errors.Wrap(err, "error reading BACnetLiftFault")
 	}
 	if enum, ok := BACnetLiftFaultByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLiftFault(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupMode.go
index 246410ba1c0..00524c3aebe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupMode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -132,7 +131,7 @@ func BACnetLiftGroupModeParse(readBuffer utils.ReadBuffer) (BACnetLiftGroupMode,
 		return 0, errors.Wrap(err, "error reading BACnetLiftGroupMode")
 	}
 	if enum, ok := BACnetLiftGroupModeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLiftGroupMode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommand.go
index e2a0c83ca19..452f1fc9d96 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommand.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -191,7 +190,7 @@ func BACnetLightingCommandParse(readBuffer utils.ReadBuffer) (BACnetLightingComm
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_REAL)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'targetLevel' field of BACnetLightingCommand")
@@ -213,7 +212,7 @@ func BACnetLightingCommandParse(readBuffer utils.ReadBuffer) (BACnetLightingComm
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_REAL)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'rampRate' field of BACnetLightingCommand")
@@ -235,7 +234,7 @@ func BACnetLightingCommandParse(readBuffer utils.ReadBuffer) (BACnetLightingComm
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(3), BACnetDataType_REAL)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'stepIncrement' field of BACnetLightingCommand")
@@ -257,7 +256,7 @@ func BACnetLightingCommandParse(readBuffer utils.ReadBuffer) (BACnetLightingComm
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(4), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'fadeTime' field of BACnetLightingCommand")
@@ -279,7 +278,7 @@ func BACnetLightingCommandParse(readBuffer utils.ReadBuffer) (BACnetLightingComm
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(5), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'priority' field of BACnetLightingCommand")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgress.go
index fb31f423535..2d1557b3694 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgress.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -120,7 +119,7 @@ func BACnetLightingInProgressParse(readBuffer utils.ReadBuffer) (BACnetLightingI
 		return 0, errors.Wrap(err, "error reading BACnetLightingInProgress")
 	}
 	if enum, ok := BACnetLightingInProgressByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLightingInProgress(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperation.go
index cdbbddfebb9..b2f72dd6146 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperation.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -162,7 +161,7 @@ func BACnetLightingOperationParse(readBuffer utils.ReadBuffer) (BACnetLightingOp
 		return 0, errors.Wrap(err, "error reading BACnetLightingOperation")
 	}
 	if enum, ok := BACnetLightingOperationByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLightingOperation(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransition.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransition.go
index d9fe91750dd..f066f9f28f8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransition.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransition.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func BACnetLightingTransitionParse(readBuffer utils.ReadBuffer) (BACnetLightingT
 		return 0, errors.Wrap(err, "error reading BACnetLightingTransition")
 	}
 	if enum, ok := BACnetLightingTransitionByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLightingTransition(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnable.go
index 0f245430d2c..b0ac3578405 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnable.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -102,7 +101,7 @@ func BACnetLimitEnableParse(readBuffer utils.ReadBuffer) (BACnetLimitEnable, err
 		return 0, errors.Wrap(err, "error reading BACnetLimitEnable")
 	}
 	if enum, ok := BACnetLimitEnableByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLimitEnable(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatus.go
index 6169d611fa8..af9f1bd5b5a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -120,7 +119,7 @@ func BACnetLockStatusParse(readBuffer utils.ReadBuffer) (BACnetLockStatus, error
 		return 0, errors.Wrap(err, "error reading BACnetLockStatus")
 	}
 	if enum, ok := BACnetLockStatusByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLockStatus(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryAnyValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryAnyValue.go
index 3109d3657e2..1be9329708b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryAnyValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryAnyValue.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -145,7 +144,7 @@ func BACnetLogDataLogDataEntryAnyValueParse(readBuffer utils.ReadBuffer) (BACnet
 		_val, _err := BACnetConstructedDataParse(readBuffer, uint8(8), BACnetObjectType_VENDOR_PROPRIETARY_VALUE, BACnetPropertyIdentifier_VENDOR_PROPRIETARY_VALUE, nil)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'anyValue' field of BACnetLogDataLogDataEntryAnyValue")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecord.go
index 8652a35cba7..79066dc10c8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecord.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -166,7 +165,7 @@ func BACnetLogRecordParse(readBuffer utils.ReadBuffer) (BACnetLogRecord, error)
 		_val, _err := BACnetStatusFlagsTaggedParse(readBuffer, uint8(2), TagClass_CONTEXT_SPECIFIC_TAGS)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'statusFlags' field of BACnetLogRecord")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumAnyValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumAnyValue.go
index 36dd2668ee0..6441546fccb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumAnyValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumAnyValue.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -147,7 +146,7 @@ func BACnetLogRecordLogDatumAnyValueParse(readBuffer utils.ReadBuffer, tagNumber
 		_val, _err := BACnetConstructedDataParse(readBuffer, uint8(10), BACnetObjectType_VENDOR_PROPRIETARY_VALUE, BACnetPropertyIdentifier_VENDOR_PROPRIETARY_VALUE, nil)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'anyValue' field of BACnetLogRecordLogDatumAnyValue")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatus.go
index 85d399665be..0ef2674064f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func BACnetLogStatusParse(readBuffer utils.ReadBuffer) (BACnetLogStatus, error)
 		return 0, errors.Wrap(err, "error reading BACnetLogStatus")
 	}
 	if enum, ok := BACnetLogStatusByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLogStatus(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingType.go
index 7f0f0533f8f..9d40498b446 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func BACnetLoggingTypeParse(readBuffer utils.ReadBuffer) (BACnetLoggingType, err
 		return 0, errors.Wrap(err, "error reading BACnetLoggingType")
 	}
 	if enum, ok := BACnetLoggingTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetLoggingType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenance.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenance.go
index 21a918f2db9..a17fcb31c44 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenance.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenance.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -120,7 +119,7 @@ func BACnetMaintenanceParse(readBuffer utils.ReadBuffer) (BACnetMaintenance, err
 		return 0, errors.Wrap(err, "error reading BACnetMaintenance")
 	}
 	if enum, ok := BACnetMaintenanceByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetMaintenance(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValue.go
index 9c051fc6060..bcca1b50d40 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValue.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -143,7 +142,7 @@ func BACnetNameValueParse(readBuffer utils.ReadBuffer) (BACnetNameValue, error)
 		_val, _err := BACnetConstructedDataParse(readBuffer, uint8(1), BACnetObjectType_VENDOR_PROPRIETARY_VALUE, BACnetPropertyIdentifier_VENDOR_PROPRIETARY_VALUE, nil)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'value' field of BACnetNameValue")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQuality.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQuality.go
index a724fe847a2..ce617c74428 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQuality.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQuality.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func BACnetNetworkNumberQualityParse(readBuffer utils.ReadBuffer) (BACnetNetwork
 		return 0, errors.Wrap(err, "error reading BACnetNetworkNumberQuality")
 	}
 	if enum, ok := BACnetNetworkNumberQualityByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetNetworkNumberQuality(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommand.go
index dea708f89a5..56408533576 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommand.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -144,7 +143,7 @@ func BACnetNetworkPortCommandParse(readBuffer utils.ReadBuffer) (BACnetNetworkPo
 		return 0, errors.Wrap(err, "error reading BACnetNetworkPortCommand")
 	}
 	if enum, ok := BACnetNetworkPortCommandByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetNetworkPortCommand(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkType.go
index 2e8eaacd0e1..55f2599fa9a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -162,7 +161,7 @@ func BACnetNetworkTypeParse(readBuffer utils.ReadBuffer) (BACnetNetworkType, err
 		return 0, errors.Wrap(err, "error reading BACnetNetworkType")
 	}
 	if enum, ok := BACnetNetworkTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetNetworkType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeType.go
index a34b60a0812..3bfac5697e2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -222,7 +221,7 @@ func BACnetNodeTypeParse(readBuffer utils.ReadBuffer) (BACnetNodeType, error) {
 		return 0, errors.Wrap(err, "error reading BACnetNodeType")
 	}
 	if enum, ok := BACnetNodeTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetNodeType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go
index f25f81a36ad..ed5dd505558 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -302,7 +301,7 @@ func BACnetNotificationParametersAccessEventParse(readBuffer utils.ReadBuffer, t
 		_val, _err := BACnetAuthenticationFactorTypeTaggedParse(readBuffer, uint8(5), TagClass_CONTEXT_SPECIFIC_TAGS)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'authenticationFactor' field of BACnetNotificationParametersAccessEvent")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go
index 17afbf714e7..abd4a0ae38e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -280,7 +279,7 @@ func BACnetNotificationParametersChangeOfTimerParse(readBuffer utils.ReadBuffer,
 		_val, _err := BACnetTimerTransitionTaggedParse(readBuffer, uint8(3), TagClass_CONTEXT_SPECIFIC_TAGS)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'lastStateChange' field of BACnetNotificationParametersChangeOfTimer")
@@ -302,7 +301,7 @@ func BACnetNotificationParametersChangeOfTimerParse(readBuffer utils.ReadBuffer,
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(4), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'initialTimeout' field of BACnetNotificationParametersChangeOfTimer")
@@ -324,7 +323,7 @@ func BACnetNotificationParametersChangeOfTimerParse(readBuffer utils.ReadBuffer,
 		_val, _err := BACnetDateTimeEnclosedParse(readBuffer, uint8(5))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'expirationTime' field of BACnetNotificationParametersChangeOfTimer")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
index ff1881ae9fb..2ed61bffb64 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -459,7 +458,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'nullValue' field of BACnetNotificationParametersExtendedParameters")
@@ -481,7 +480,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'realValue' field of BACnetNotificationParametersExtendedParameters")
@@ -503,7 +502,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'unsignedValue' field of BACnetNotificationParametersExtendedParameters")
@@ -525,7 +524,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'booleanValue' field of BACnetNotificationParametersExtendedParameters")
@@ -547,7 +546,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'integerValue' field of BACnetNotificationParametersExtendedParameters")
@@ -569,7 +568,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'doubleValue' field of BACnetNotificationParametersExtendedParameters")
@@ -591,7 +590,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'octetStringValue' field of BACnetNotificationParametersExtendedParameters")
@@ -613,7 +612,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'characterStringValue' field of BACnetNotificationParametersExtendedParameters")
@@ -635,7 +634,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'bitStringValue' field of BACnetNotificationParametersExtendedParameters")
@@ -657,7 +656,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'enumeratedValue' field of BACnetNotificationParametersExtendedParameters")
@@ -679,7 +678,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'dateValue' field of BACnetNotificationParametersExtendedParameters")
@@ -701,7 +700,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'timeValue' field of BACnetNotificationParametersExtendedParameters")
@@ -723,7 +722,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'objectIdentifier' field of BACnetNotificationParametersExtendedParameters")
@@ -745,7 +744,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
 		_val, _err := BACnetDeviceObjectPropertyReferenceEnclosedParse(readBuffer, uint8(0))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'reference' field of BACnetNotificationParametersExtendedParameters")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyType.go
index b45fd196805..ade50b16c2a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func BACnetNotifyTypeParse(readBuffer utils.ReadBuffer) (BACnetNotifyType, error
 		return 0, errors.Wrap(err, "error reading BACnetNotifyType")
 	}
 	if enum, ok := BACnetNotifyTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetNotifyType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReference.go
index 2f0ca87c016..c0a0183fb4b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReference.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -166,7 +165,7 @@ func BACnetObjectPropertyReferenceParse(readBuffer utils.ReadBuffer) (BACnetObje
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'arrayIndex' field of BACnetObjectPropertyReference")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectType.go
index e9528f93dd2..88d50f20c06 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -456,7 +455,7 @@ func BACnetObjectTypeParse(readBuffer utils.ReadBuffer) (BACnetObjectType, error
 		return 0, errors.Wrap(err, "error reading BACnetObjectType")
 	}
 	if enum, ok := BACnetObjectTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetObjectType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupported.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupported.go
index f4594a27769..d7aaba36298 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupported.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupported.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -450,7 +449,7 @@ func BACnetObjectTypesSupportedParse(readBuffer utils.ReadBuffer) (BACnetObjectT
 		return 0, errors.Wrap(err, "error reading BACnetObjectTypesSupported")
 	}
 	if enum, ok := BACnetObjectTypesSupportedByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetObjectTypesSupported(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarity.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarity.go
index 1501700011c..757174e55fc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarity.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarity.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -102,7 +101,7 @@ func BACnetPolarityParse(readBuffer utils.ReadBuffer) (BACnetPolarity, error) {
 		return 0, errors.Wrap(err, "error reading BACnetPolarity")
 	}
 	if enum, ok := BACnetPolarityByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetPolarity(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPortPermission.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPortPermission.go
index de4c157e734..5dd747b280d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPortPermission.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPortPermission.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -143,7 +142,7 @@ func BACnetPortPermissionParse(readBuffer utils.ReadBuffer) (BACnetPortPermissio
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_BOOLEAN)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'enable' field of BACnetPortPermission")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityArray.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityArray.go
index 2e0532fc103..7ae5a6c03d6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityArray.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityArray.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -343,7 +342,7 @@ func BACnetPriorityArrayParse(readBuffer utils.ReadBuffer, objectTypeArgument BA
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'numberOfDataElements' field of BACnetPriorityArray")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramError.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramError.go
index fdca8dc80cc..0e75c725333 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramError.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -126,7 +125,7 @@ func BACnetProgramErrorParse(readBuffer utils.ReadBuffer) (BACnetProgramError, e
 		return 0, errors.Wrap(err, "error reading BACnetProgramError")
 	}
 	if enum, ok := BACnetProgramErrorByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetProgramError(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequest.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequest.go
index 20973d45af2..eb511267816 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequest.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -126,7 +125,7 @@ func BACnetProgramRequestParse(readBuffer utils.ReadBuffer) (BACnetProgramReques
 		return 0, errors.Wrap(err, "error reading BACnetProgramRequest")
 	}
 	if enum, ok := BACnetProgramRequestByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetProgramRequest(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramState.go
index ad81c789fdb..e68ce9f0bde 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramState.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -126,7 +125,7 @@ func BACnetProgramStateParse(readBuffer utils.ReadBuffer) (BACnetProgramState, e
 		return 0, errors.Wrap(err, "error reading BACnetProgramState")
 	}
 	if enum, ok := BACnetProgramStateByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetProgramState(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResult.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResult.go
index 69a30119138..25a0a27f4c5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResult.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResult.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -188,7 +187,7 @@ func BACnetPropertyAccessResultParse(readBuffer utils.ReadBuffer) (BACnetPropert
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'propertyArrayIndex' field of BACnetPropertyAccessResult")
@@ -210,7 +209,7 @@ func BACnetPropertyAccessResultParse(readBuffer utils.ReadBuffer) (BACnetPropert
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(3), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'deviceIdentifier' field of BACnetPropertyAccessResult")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifier.go
index 693d2639f9f..921094e8b42 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifier.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -2838,7 +2837,7 @@ func BACnetPropertyIdentifierParse(readBuffer utils.ReadBuffer) (BACnetPropertyI
 		return 0, errors.Wrap(err, "error reading BACnetPropertyIdentifier")
 	}
 	if enum, ok := BACnetPropertyIdentifierByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetPropertyIdentifier(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReference.go
index 3260a85c198..2dd582f6bb3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReference.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -143,7 +142,7 @@ func BACnetPropertyReferenceParse(readBuffer utils.ReadBuffer) (BACnetPropertyRe
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'arrayIndex' field of BACnetPropertyReference")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValue.go
index ed7994d08c4..e2b639740b0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValue.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -170,7 +169,7 @@ func BACnetPropertyValueParse(readBuffer utils.ReadBuffer, objectTypeArgument BA
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'propertyArrayIndex' field of BACnetPropertyValue")
@@ -192,7 +191,7 @@ func BACnetPropertyValueParse(readBuffer utils.ReadBuffer, objectTypeArgument BA
 		_val, _err := BACnetConstructedDataElementParse(readBuffer, objectTypeArgument, propertyIdentifier.GetValue(), (CastBACnetTagPayloadUnsignedInteger(utils.InlineIf(bool((propertyArrayIndex) != (nil)), func() interface{} { return CastBACnetTagPayloadUnsignedInteger((propertyArrayIndex).GetPayload()) }, func() interface{} { return CastBACnetTagPayloadUnsignedInteger(nil) }))))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'propertyValue' field of BACnetPropertyValue")
@@ -214,7 +213,7 @@ func BACnetPropertyValueParse(readBuffer utils.ReadBuffer, objectTypeArgument BA
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(3), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'priority' field of BACnetPropertyValue")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyWriteDefinition.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyWriteDefinition.go
index a01c0ef04cc..cd8655671b6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyWriteDefinition.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyWriteDefinition.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -170,7 +169,7 @@ func BACnetPropertyWriteDefinitionParse(readBuffer utils.ReadBuffer, objectTypeA
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'arrayIndex' field of BACnetPropertyWriteDefinition")
@@ -192,7 +191,7 @@ func BACnetPropertyWriteDefinitionParse(readBuffer utils.ReadBuffer, objectTypeA
 		_val, _err := BACnetConstructedDataParse(readBuffer, uint8(2), objectTypeArgument, propertyIdentifier.GetValue(), (CastBACnetTagPayloadUnsignedInteger(utils.InlineIf(bool((arrayIndex) != (nil)), func() interface{} { return CastBACnetTagPayloadUnsignedInteger((arrayIndex).GetPayload()) }, func() interface{} { return CastBACnetTagPayloadUnsignedInteger(nil) }))))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'propertyValue' field of BACnetPropertyWriteDefinition")
@@ -214,7 +213,7 @@ func BACnetPropertyWriteDefinitionParse(readBuffer utils.ReadBuffer, objectTypeA
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(3), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'priority' field of BACnetPropertyWriteDefinition")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevel.go
index 121d72ad296..ceb2c817a3d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevel.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func BACnetProtocolLevelParse(readBuffer utils.ReadBuffer) (BACnetProtocolLevel,
 		return 0, errors.Wrap(err, "error reading BACnetProtocolLevel")
 	}
 	if enum, ok := BACnetProtocolLevelByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetProtocolLevel(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessProperty.go
index 4a5b57b78b0..44746e39888 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessProperty.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -158,7 +157,7 @@ func BACnetReadAccessPropertyParse(readBuffer utils.ReadBuffer, objectTypeArgume
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(3), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'arrayIndex' field of BACnetReadAccessProperty")
@@ -180,7 +179,7 @@ func BACnetReadAccessPropertyParse(readBuffer utils.ReadBuffer, objectTypeArgume
 		_val, _err := BACnetReadAccessPropertyReadResultParse(readBuffer, objectTypeArgument, propertyIdentifier.GetValue(), (CastBACnetTagPayloadUnsignedInteger(utils.InlineIf(bool((arrayIndex) != (nil)), func() interface{} { return CastBACnetTagPayloadUnsignedInteger((arrayIndex).GetPayload()) }, func() interface{} { return CastBACnetTagPayloadUnsignedInteger(nil) }))))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'readResult' field of BACnetReadAccessProperty")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go
index 55a6ddd2cfb..1e321e1af95 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -178,7 +177,7 @@ func BACnetReadAccessPropertyReadResultParse(readBuffer utils.ReadBuffer, object
 		_val, _err := BACnetConstructedDataParse(readBuffer, uint8(4), objectTypeArgument, propertyIdentifierArgument, arrayIndexArgument)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'propertyValue' field of BACnetReadAccessPropertyReadResult")
@@ -205,7 +204,7 @@ func BACnetReadAccessPropertyReadResultParse(readBuffer utils.ReadBuffer, object
 		_val, _err := ErrorEnclosedParse(readBuffer, uint8(5))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'propertyAccessError' field of BACnetReadAccessPropertyReadResult")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResult.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResult.go
index 813f32f4518..b489ae1f06b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResult.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResult.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -143,7 +142,7 @@ func BACnetReadAccessResultParse(readBuffer utils.ReadBuffer) (BACnetReadAccessR
 		_val, _err := BACnetReadAccessResultListOfResultsParse(readBuffer, uint8(1), objectIdentifier.GetObjectType())
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'listOfResults' field of BACnetReadAccessResult")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcess.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcess.go
index 917694401d9..8d888586ce8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcess.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcess.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -143,7 +142,7 @@ func BACnetRecipientProcessParse(readBuffer utils.ReadBuffer) (BACnetRecipientPr
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'processIdentifier' field of BACnetRecipientProcess")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReason.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReason.go
index a8a6fa0fb86..af81ddd72ce 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReason.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReason.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -156,7 +155,7 @@ func BACnetRejectReasonParse(readBuffer utils.ReadBuffer) (BACnetRejectReason, e
 		return 0, errors.Wrap(err, "error reading BACnetRejectReason")
 	}
 	if enum, ok := BACnetRejectReasonByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetRejectReason(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationship.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationship.go
index 9184287f655..c5c2ba92552 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationship.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationship.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -276,7 +275,7 @@ func BACnetRelationshipParse(readBuffer utils.ReadBuffer) (BACnetRelationship, e
 		return 0, errors.Wrap(err, "error reading BACnetRelationship")
 	}
 	if enum, ok := BACnetRelationshipByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetRelationship(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReliability.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReliability.go
index 9953660bcb5..1797ad3e255 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReliability.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReliability.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -240,7 +239,7 @@ func BACnetReliabilityParse(readBuffer utils.ReadBuffer) (BACnetReliability, err
 		return 0, errors.Wrap(err, "error reading BACnetReliability")
 	}
 	if enum, ok := BACnetReliabilityByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetReliability(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReason.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReason.go
index cfc21707f95..48b24205fa2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReason.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReason.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -150,7 +149,7 @@ func BACnetRestartReasonParse(readBuffer utils.ReadBuffer) (BACnetRestartReason,
 		return 0, errors.Wrap(err, "error reading BACnetRestartReason")
 	}
 	if enum, ok := BACnetRestartReasonByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetRestartReason(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlags.go
index de58fefc246..059513138dd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlags.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func BACnetResultFlagsParse(readBuffer utils.ReadBuffer) (BACnetResultFlags, err
 		return 0, errors.Wrap(err, "error reading BACnetResultFlags")
 	}
 	if enum, ok := BACnetResultFlagsByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetResultFlags(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntry.go
index 4efda07fd69..4caff2c10d8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntry.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -189,7 +188,7 @@ func BACnetRouterEntryParse(readBuffer utils.ReadBuffer) (BACnetRouterEntry, err
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(3), BACnetDataType_OCTET_STRING)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'performanceIndex' field of BACnetRouterEntry")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatus.go
index 936a20bd3c6..0c2cc4422eb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func BACnetRouterEntryStatusParse(readBuffer utils.ReadBuffer) (BACnetRouterEntr
 		return 0, errors.Wrap(err, "error reading BACnetRouterEntryStatus")
 	}
 	if enum, ok := BACnetRouterEntryStatusByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetRouterEntryStatus(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevel.go
index af32c6654bc..b92df6081df 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevel.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -126,7 +125,7 @@ func BACnetSecurityLevelParse(readBuffer utils.ReadBuffer) (BACnetSecurityLevel,
 		return 0, errors.Wrap(err, "error reading BACnetSecurityLevel")
 	}
 	if enum, ok := BACnetSecurityLevelByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetSecurityLevel(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicy.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicy.go
index 48fd32ed6e1..b888ed1fa56 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicy.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicy.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func BACnetSecurityPolicyParse(readBuffer utils.ReadBuffer) (BACnetSecurityPolic
 		return 0, errors.Wrap(err, "error reading BACnetSecurityPolicy")
 	}
 	if enum, ok := BACnetSecurityPolicyByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetSecurityPolicy(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentation.go
index 1dc69b5a0e0..7ec3475feb7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentation.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func BACnetSegmentationParse(readBuffer utils.ReadBuffer) (BACnetSegmentation, e
 		return 0, errors.Wrap(err, "error reading BACnetSegmentation")
 	}
 	if enum, ok := BACnetSegmentationByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetSegmentation(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go
index b4950d0a8f1..a3485bb2887 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -195,7 +194,7 @@ func BACnetServiceAckConfirmedPrivateTransferParse(readBuffer utils.ReadBuffer,
 		_val, _err := BACnetConstructedDataParse(readBuffer, uint8(2), BACnetObjectType_VENDOR_PROPRIETARY_VALUE, BACnetPropertyIdentifier_VENDOR_PROPRIETARY_VALUE, nil)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'resultBlock' field of BACnetServiceAckConfirmedPrivateTransfer")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go
index d196d4a4232..2a7390be3dc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -243,7 +242,7 @@ func BACnetServiceAckGetEnrollmentSummaryParse(readBuffer utils.ReadBuffer, serv
 		_val, _err := BACnetApplicationTagParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'notificationClass' field of BACnetServiceAckGetEnrollmentSummary")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
index 15a0818aadd..f0d96196e2f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -208,7 +207,7 @@ func BACnetServiceAckReadPropertyParse(readBuffer utils.ReadBuffer, serviceAckLe
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'arrayIndex' field of BACnetServiceAckReadProperty")
@@ -230,7 +229,7 @@ func BACnetServiceAckReadPropertyParse(readBuffer utils.ReadBuffer, serviceAckLe
 		_val, _err := BACnetConstructedDataParse(readBuffer, uint8(3), objectIdentifier.GetObjectType(), propertyIdentifier.GetValue(), (CastBACnetTagPayloadUnsignedInteger(utils.InlineIf(bool((arrayIndex) != (nil)), func() interface{} { return CastBACnetTagPayloadUnsignedInteger((arrayIndex).GetPayload()) }, func() interface{} { return CastBACnetTagPayloadUnsignedInteger(nil) }))))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'values' field of BACnetServiceAckReadProperty")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadRange.go
index 8c6ff1dd769..f84e1eba482 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadRange.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -243,7 +242,7 @@ func BACnetServiceAckReadRangeParse(readBuffer utils.ReadBuffer, serviceAckLengt
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(2), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'propertyArrayIndex' field of BACnetServiceAckReadRange")
@@ -291,7 +290,7 @@ func BACnetServiceAckReadRangeParse(readBuffer utils.ReadBuffer, serviceAckLengt
 		_val, _err := BACnetConstructedDataParse(readBuffer, uint8(5), objectIdentifier.GetObjectType(), propertyIdentifier.GetValue(), (CastBACnetTagPayloadUnsignedInteger(utils.InlineIf(bool((propertyArrayIndex) != (nil)), func() interface{} { return CastBACnetTagPayloadUnsignedInteger((propertyArrayIndex).GetPayload()) }, func() interface{} { return CastBACnetTagPayloadUnsignedInteger(nil) }))))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'itemData' field of BACnetServiceAckReadRange")
@@ -313,7 +312,7 @@ func BACnetServiceAckReadRangeParse(readBuffer utils.ReadBuffer, serviceAckLengt
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(6), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'firstSequenceNumber' field of BACnetServiceAckReadRange")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupported.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupported.go
index 135b260876c..66a2df6af6e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupported.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupported.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -336,7 +335,7 @@ func BACnetServicesSupportedParse(readBuffer utils.ReadBuffer) (BACnetServicesSu
 		return 0, errors.Wrap(err, "error reading BACnetServicesSupported")
 	}
 	if enum, ok := BACnetServicesSupportedByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetServicesSupported(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSetpointReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSetpointReference.go
index 81025701eb5..e366b629f1d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSetpointReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSetpointReference.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -120,7 +119,7 @@ func BACnetSetpointReferenceParse(readBuffer utils.ReadBuffer) (BACnetSetpointRe
 		_val, _err := BACnetObjectPropertyReferenceEnclosedParse(readBuffer, uint8(0))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'setPointReference' field of BACnetSetpointReference")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedState.go
index 4c36ffe37eb..efdc382c76e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedState.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func BACnetShedStateParse(readBuffer utils.ReadBuffer) (BACnetShedState, error)
 		return 0, errors.Wrap(err, "error reading BACnetShedState")
 	}
 	if enum, ok := BACnetShedStateByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetShedState(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedState.go
index 63d8caa7bdc..ecfe7f08668 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedState.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -120,7 +119,7 @@ func BACnetSilencedStateParse(readBuffer utils.ReadBuffer) (BACnetSilencedState,
 		return 0, errors.Wrap(err, "error reading BACnetSilencedState")
 	}
 	if enum, ok := BACnetSilencedStateByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetSilencedState(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlags.go
index 539afb9ebad..7c4d7d37c0c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlags.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func BACnetStatusFlagsParse(readBuffer utils.ReadBuffer) (BACnetStatusFlags, err
 		return 0, errors.Wrap(err, "error reading BACnetStatusFlags")
 	}
 	if enum, ok := BACnetStatusFlagsByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetStatusFlags(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerState.go
index e5b26cda5da..37f906a979c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerState.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func BACnetTimerStateParse(readBuffer utils.ReadBuffer) (BACnetTimerState, error
 		return 0, errors.Wrap(err, "error reading BACnetTimerState")
 	}
 	if enum, ok := BACnetTimerStateByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetTimerState(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransition.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransition.go
index 4fa57b765bf..21ddadefa53 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransition.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransition.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -138,7 +137,7 @@ func BACnetTimerTransitionParse(readBuffer utils.ReadBuffer) (BACnetTimerTransit
 		return 0, errors.Wrap(err, "error reading BACnetTimerTransition")
 	}
 	if enum, ok := BACnetTimerTransitionByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetTimerTransition(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoice.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoice.go
index 515889ac409..e055fc13a37 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoice.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoice.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -162,7 +161,7 @@ func BACnetUnconfirmedServiceChoiceParse(readBuffer utils.ReadBuffer) (BACnetUnc
 		return 0, errors.Wrap(err, "error reading BACnetUnconfirmedServiceChoice")
 	}
 	if enum, ok := BACnetUnconfirmedServiceChoiceByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetUnconfirmedServiceChoice(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go
index a004725916f..eff230eb1db 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -231,7 +230,7 @@ func BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultipleParse(read
 		_val, _err := BACnetTimeStampEnclosedParse(readBuffer, uint8(3))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'timestamp' field of BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go
index edcdc61ab24..053535e1a66 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -377,7 +376,7 @@ func BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationParse(readBuffer
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(7), BACnetDataType_CHARACTER_STRING)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'messageText' field of BACnetUnconfirmedServiceRequestUnconfirmedEventNotification")
@@ -412,7 +411,7 @@ func BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationParse(readBuffer
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(9), BACnetDataType_BOOLEAN)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'ackRequired' field of BACnetUnconfirmedServiceRequestUnconfirmedEventNotification")
@@ -434,7 +433,7 @@ func BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationParse(readBuffer
 		_val, _err := BACnetEventStateTaggedParse(readBuffer, uint8(10), TagClass_CONTEXT_SPECIFIC_TAGS)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'fromState' field of BACnetUnconfirmedServiceRequestUnconfirmedEventNotification")
@@ -469,7 +468,7 @@ func BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationParse(readBuffer
 		_val, _err := BACnetNotificationParametersParse(readBuffer, uint8(12), eventObjectIdentifier.GetObjectType())
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'eventValues' field of BACnetUnconfirmedServiceRequestUnconfirmedEventNotification")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
index 002c6f09d8c..6d655f4b0e9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -196,7 +195,7 @@ func BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferParse(readBuffer u
 		_val, _err := BACnetConstructedDataParse(readBuffer, uint8(2), BACnetObjectType_VENDOR_PROPRIETARY_VALUE, BACnetPropertyIdentifier_VENDOR_PROPRIETARY_VALUE, nil)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'serviceParameters' field of BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go
index 42cf224bbb5..836db5c015b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func BACnetUnconfirmedServiceRequestUnconfirmedTextMessageParse(readBuffer utils
 		_val, _err := BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassParse(readBuffer, uint8(1))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'messageClass' field of BACnetUnconfirmedServiceRequestUnconfirmedTextMessage")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
index 02487515731..683b5328837 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -172,7 +171,7 @@ func BACnetUnconfirmedServiceRequestWhoHasParse(readBuffer utils.ReadBuffer, ser
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(0), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'deviceInstanceRangeLowLimit' field of BACnetUnconfirmedServiceRequestWhoHas")
@@ -194,7 +193,7 @@ func BACnetUnconfirmedServiceRequestWhoHasParse(readBuffer utils.ReadBuffer, ser
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'deviceInstanceRangeHighLimit' field of BACnetUnconfirmedServiceRequestWhoHas")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
index 99e224ab688..2ad2fd35d50 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -161,7 +160,7 @@ func BACnetUnconfirmedServiceRequestWhoIsParse(readBuffer utils.ReadBuffer, serv
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(0), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'deviceInstanceRangeLowLimit' field of BACnetUnconfirmedServiceRequestWhoIs")
@@ -183,7 +182,7 @@ func BACnetUnconfirmedServiceRequestWhoIsParse(readBuffer utils.ReadBuffer, serv
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'deviceInstanceRangeHighLimit' field of BACnetUnconfirmedServiceRequestWhoIs")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go
index 38dd3e6c448..8b516af4c96 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -220,7 +219,7 @@ func BACnetUnconfirmedServiceRequestWriteGroupParse(readBuffer utils.ReadBuffer,
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(3), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'inhibitDelay' field of BACnetUnconfirmedServiceRequestWriteGroup")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVMACEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVMACEntry.go
index fd1bbdcfe21..a250f546d73 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVMACEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVMACEntry.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -132,7 +131,7 @@ func BACnetVMACEntryParse(readBuffer utils.ReadBuffer) (BACnetVMACEntry, error)
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(0), BACnetDataType_OCTET_STRING)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'virtualMacAddress' field of BACnetVMACEntry")
@@ -154,7 +153,7 @@ func BACnetVMACEntryParse(readBuffer utils.ReadBuffer) (BACnetVMACEntry, error)
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_OCTET_STRING)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'nativeMacAddress' field of BACnetVMACEntry")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClass.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClass.go
index d2535d7c0ab..c5facc8e5b3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClass.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClass.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -138,7 +137,7 @@ func BACnetVTClassParse(readBuffer utils.ReadBuffer) (BACnetVTClass, error) {
 		return 0, errors.Wrap(err, "error reading BACnetVTClass")
 	}
 	if enum, ok := BACnetVTClassByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetVTClass(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
index c7cbbc0dc87..8d9cf283cad 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -19321,7 +19320,7 @@ func BACnetVendorIdParse(readBuffer utils.ReadBuffer) (BACnetVendorId, error) {
 		return 0, errors.Wrap(err, "error reading BACnetVendorId")
 	}
 	if enum, ok := BACnetVendorIdByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetVendorId(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatus.go
index fc29af1177e..48f16ddfef9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func BACnetWriteStatusParse(readBuffer utils.ReadBuffer) (BACnetWriteStatus, err
 		return 0, errors.Wrap(err, "error reading BACnetWriteStatus")
 	}
 	if enum, ok := BACnetWriteStatusByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BACnetWriteStatus(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCode.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCode.go
index fe480d6b770..9d9e7e1675f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -132,7 +131,7 @@ func BVLCResultCodeParse(readBuffer utils.ReadBuffer) (BVLCResultCode, error) {
 		return 0, errors.Wrap(err, "error reading BVLCResultCode")
 	}
 	if enum, ok := BVLCResultCodeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BVLCResultCode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ConfirmedEventNotificationRequest.go b/plc4go/protocols/bacnetip/readwrite/model/ConfirmedEventNotificationRequest.go
index df6528929a3..34c85c384b4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ConfirmedEventNotificationRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ConfirmedEventNotificationRequest.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -337,7 +336,7 @@ func ConfirmedEventNotificationRequestParse(readBuffer utils.ReadBuffer) (Confir
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(7), BACnetDataType_CHARACTER_STRING)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'messageText' field of ConfirmedEventNotificationRequest")
@@ -372,7 +371,7 @@ func ConfirmedEventNotificationRequestParse(readBuffer utils.ReadBuffer) (Confir
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(9), BACnetDataType_BOOLEAN)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'ackRequired' field of ConfirmedEventNotificationRequest")
@@ -394,7 +393,7 @@ func ConfirmedEventNotificationRequestParse(readBuffer utils.ReadBuffer) (Confir
 		_val, _err := BACnetEventStateTaggedParse(readBuffer, uint8(10), TagClass_CONTEXT_SPECIFIC_TAGS)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'fromState' field of ConfirmedEventNotificationRequest")
@@ -429,7 +428,7 @@ func ConfirmedEventNotificationRequestParse(readBuffer utils.ReadBuffer) (Confir
 		_val, _err := BACnetNotificationParametersParse(readBuffer, uint8(12), eventObjectIdentifier.GetObjectType())
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'eventValues' field of ConfirmedEventNotificationRequest")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ConfirmedPrivateTransferError.go b/plc4go/protocols/bacnetip/readwrite/model/ConfirmedPrivateTransferError.go
index 460cddb361a..d3de2d224c3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ConfirmedPrivateTransferError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ConfirmedPrivateTransferError.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -219,7 +218,7 @@ func ConfirmedPrivateTransferErrorParse(readBuffer utils.ReadBuffer, errorChoice
 		_val, _err := BACnetConstructedDataParse(readBuffer, uint8(3), BACnetObjectType_VENDOR_PROPRIETARY_VALUE, BACnetPropertyIdentifier_VENDOR_PROPRIETARY_VALUE, nil)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'errorParameters' field of ConfirmedPrivateTransferError")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ErrorClass.go b/plc4go/protocols/bacnetip/readwrite/model/ErrorClass.go
index 6ffecf4e3b5..f570106a3e9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ErrorClass.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ErrorClass.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -144,7 +143,7 @@ func ErrorClassParse(readBuffer utils.ReadBuffer) (ErrorClass, error) {
 		return 0, errors.Wrap(err, "error reading ErrorClass")
 	}
 	if enum, ok := ErrorClassByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ErrorClass(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ErrorCode.go b/plc4go/protocols/bacnetip/readwrite/model/ErrorCode.go
index a401076d213..42c042b2e1f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ErrorCode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ErrorCode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -870,7 +869,7 @@ func ErrorCodeParse(readBuffer utils.ReadBuffer) (ErrorCode, error) {
 		return 0, errors.Wrap(err, "error reading ErrorCode")
 	}
 	if enum, ok := ErrorCodeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ErrorCode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsValue.go b/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsValue.go
index cf350559527..882d426702a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsValue.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -168,7 +167,7 @@ func ListOfCovNotificationsValueParse(readBuffer utils.ReadBuffer, objectTypeArg
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(1), BACnetDataType_UNSIGNED_INTEGER)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'arrayIndex' field of ListOfCovNotificationsValue")
@@ -203,7 +202,7 @@ func ListOfCovNotificationsValueParse(readBuffer utils.ReadBuffer, objectTypeArg
 		_val, _err := BACnetContextTagParse(readBuffer, uint8(3), BACnetDataType_TIME)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'timeOfChange' field of ListOfCovNotificationsValue")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/MaxApduLengthAccepted.go b/plc4go/protocols/bacnetip/readwrite/model/MaxApduLengthAccepted.go
index b80fd84aa04..98f6390ed6f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/MaxApduLengthAccepted.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/MaxApduLengthAccepted.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -186,7 +185,7 @@ func MaxApduLengthAcceptedParse(readBuffer utils.ReadBuffer) (MaxApduLengthAccep
 		return 0, errors.Wrap(err, "error reading MaxApduLengthAccepted")
 	}
 	if enum, ok := MaxApduLengthAcceptedByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return MaxApduLengthAccepted(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/MaxSegmentsAccepted.go b/plc4go/protocols/bacnetip/readwrite/model/MaxSegmentsAccepted.go
index baec702477e..d73c2b59fe3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/MaxSegmentsAccepted.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/MaxSegmentsAccepted.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -138,7 +137,7 @@ func MaxSegmentsAcceptedParse(readBuffer utils.ReadBuffer) (MaxSegmentsAccepted,
 		return 0, errors.Wrap(err, "error reading MaxSegmentsAccepted")
 	}
 	if enum, ok := MaxSegmentsAcceptedByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return MaxSegmentsAccepted(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMRejectRouterToNetworkRejectReason.go b/plc4go/protocols/bacnetip/readwrite/model/NLMRejectRouterToNetworkRejectReason.go
index 7412580b6ef..78223d4a65b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMRejectRouterToNetworkRejectReason.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMRejectRouterToNetworkRejectReason.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -132,7 +131,7 @@ func NLMRejectRouterToNetworkRejectReasonParse(readBuffer utils.ReadBuffer) (NLM
 		return 0, errors.Wrap(err, "error reading NLMRejectRouterToNetworkRejectReason")
 	}
 	if enum, ok := NLMRejectRouterToNetworkRejectReasonByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return NLMRejectRouterToNetworkRejectReason(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NPDU.go b/plc4go/protocols/bacnetip/readwrite/model/NPDU.go
index 08f1cd07774..3b0fd7d2153 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NPDU.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NPDU.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -445,7 +444,7 @@ func NPDUParse(readBuffer utils.ReadBuffer, npduLength uint16) (NPDU, error) {
 		_val, _err := NLMParse(readBuffer, uint16(npduLength)-uint16(payloadSubtraction))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'nlm' field of NPDU")
@@ -467,7 +466,7 @@ func NPDUParse(readBuffer utils.ReadBuffer, npduLength uint16) (NPDU, error) {
 		_val, _err := APDUParse(readBuffer, uint16(npduLength)-uint16(payloadSubtraction))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'apdu' field of NPDU")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NPDUControl.go b/plc4go/protocols/bacnetip/readwrite/model/NPDUControl.go
index ed62b73f110..e9431f8506b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NPDUControl.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NPDUControl.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -171,7 +170,7 @@ func NPDUControlParse(readBuffer utils.ReadBuffer) (NPDUControl, error) {
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of NPDUControl")
 		}
 		if reserved != uint8(0) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -195,7 +194,7 @@ func NPDUControlParse(readBuffer utils.ReadBuffer) (NPDUControl, error) {
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of NPDUControl")
 		}
 		if reserved != uint8(0) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -265,7 +264,7 @@ func (m *_NPDUControl) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved uint8 = uint8(0)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -288,7 +287,7 @@ func (m *_NPDUControl) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved uint8 = uint8(0)
 		if m.reservedField1 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriority.go b/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriority.go
index 2daa5d72c2b..5a9f3a4a203 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriority.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriority.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func NPDUNetworkPriorityParse(readBuffer utils.ReadBuffer) (NPDUNetworkPriority,
 		return 0, errors.Wrap(err, "error reading NPDUNetworkPriority")
 	}
 	if enum, ok := NPDUNetworkPriorityByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return NPDUNetworkPriority(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/TagClass.go b/plc4go/protocols/bacnetip/readwrite/model/TagClass.go
index 947b1695598..6cd2207a51f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/TagClass.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/TagClass.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -102,7 +101,7 @@ func TagClassParse(readBuffer utils.ReadBuffer) (TagClass, error) {
 		return 0, errors.Wrap(err, "error reading TagClass")
 	}
 	if enum, ok := TagClassByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return TagClass(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/bacnetip/readwrite/model/VTCloseError.go b/plc4go/protocols/bacnetip/readwrite/model/VTCloseError.go
index 0b1b0d038a2..5568db8df2d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/VTCloseError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/VTCloseError.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -171,7 +170,7 @@ func VTCloseErrorParse(readBuffer utils.ReadBuffer, errorChoice BACnetConfirmedS
 		_val, _err := VTCloseErrorListOfVTSessionIdentifiersParse(readBuffer, uint8(1))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'listOfVtSessionIdentifiers' field of VTCloseError")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/plc4x_common.go b/plc4go/protocols/bacnetip/readwrite/model/plc4x_common.go
new file mode 100644
index 00000000000..4a586f90cfe
--- /dev/null
+++ b/plc4go/protocols/bacnetip/readwrite/model/plc4x_common.go
@@ -0,0 +1,27 @@
+/*
+* 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
+
+import "github.com/rs/zerolog/log"
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Plc4xModelLog is the Logger used by the Parse/Serialize methods
+var Plc4xModelLog = log.Logger
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlCategory.go b/plc4go/protocols/cbus/readwrite/model/AccessControlCategory.go
index 6fa122c7c51..e3f59986205 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlCategory.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlCategory.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -102,7 +101,7 @@ func AccessControlCategoryParse(readBuffer utils.ReadBuffer) (AccessControlCateg
 		return 0, errors.Wrap(err, "error reading AccessControlCategory")
 	}
 	if enum, ok := AccessControlCategoryByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return AccessControlCategory(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlCommandType.go b/plc4go/protocols/cbus/readwrite/model/AccessControlCommandType.go
index c6f01e2bfe9..10627740616 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlCommandType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -188,7 +187,7 @@ func AccessControlCommandTypeParse(readBuffer utils.ReadBuffer) (AccessControlCo
 		return 0, errors.Wrap(err, "error reading AccessControlCommandType")
 	}
 	if enum, ok := AccessControlCommandTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return AccessControlCommandType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/AccessControlCommandTypeContainer.go
index 30f16603727..b63f7a9020d 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlCommandTypeContainer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -1406,7 +1405,7 @@ func AccessControlCommandTypeContainerParse(readBuffer utils.ReadBuffer) (Access
 		return 0, errors.Wrap(err, "error reading AccessControlCommandTypeContainer")
 	}
 	if enum, ok := AccessControlCommandTypeContainerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return AccessControlCommandTypeContainer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlDirection.go b/plc4go/protocols/cbus/readwrite/model/AccessControlDirection.go
index bcb2d05056a..3d31b2baa3e 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlDirection.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlDirection.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func AccessControlDirectionParse(readBuffer utils.ReadBuffer) (AccessControlDire
 		return 0, errors.Wrap(err, "error reading AccessControlDirection")
 	}
 	if enum, ok := AccessControlDirectionByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return AccessControlDirection(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandType.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandType.go
index a9e31f1b4c8..c69b9fa7f13 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -298,7 +297,7 @@ func AirConditioningCommandTypeParse(readBuffer utils.ReadBuffer) (AirConditioni
 		return 0, errors.Wrap(err, "error reading AirConditioningCommandType")
 	}
 	if enum, ok := AirConditioningCommandTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return AirConditioningCommandType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandTypeContainer.go
index f0f340f4a15..c67fdc4c091 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandTypeContainer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -393,7 +392,7 @@ func AirConditioningCommandTypeContainerParse(readBuffer utils.ReadBuffer) (AirC
 		return 0, errors.Wrap(err, "error reading AirConditioningCommandTypeContainer")
 	}
 	if enum, ok := AirConditioningCommandTypeContainerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return AirConditioningCommandTypeContainer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHumidityScheduleEntry.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHumidityScheduleEntry.go
index 108e5a101af..fd935fea195 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHumidityScheduleEntry.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHumidityScheduleEntry.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -284,7 +283,7 @@ func AirConditioningDataHumidityScheduleEntryParse(readBuffer utils.ReadBuffer)
 		_val, _err := HVACHumidityParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'level' field of AirConditioningDataHumidityScheduleEntry")
@@ -306,7 +305,7 @@ func AirConditioningDataHumidityScheduleEntryParse(readBuffer utils.ReadBuffer)
 		_val, _err := HVACRawLevelsParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'rawLevel' field of AirConditioningDataHumidityScheduleEntry")
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHvacScheduleEntry.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHvacScheduleEntry.go
index f925bbb0208..cf390f9424b 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHvacScheduleEntry.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHvacScheduleEntry.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -284,7 +283,7 @@ func AirConditioningDataHvacScheduleEntryParse(readBuffer utils.ReadBuffer) (Air
 		_val, _err := HVACTemperatureParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'level' field of AirConditioningDataHvacScheduleEntry")
@@ -306,7 +305,7 @@ func AirConditioningDataHvacScheduleEntryParse(readBuffer utils.ReadBuffer) (Air
 		_val, _err := HVACRawLevelsParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'rawLevel' field of AirConditioningDataHvacScheduleEntry")
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHumidityLevel.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHumidityLevel.go
index 0bb548af9e0..e5ca7d14f30 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHumidityLevel.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHumidityLevel.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -261,7 +260,7 @@ func AirConditioningDataSetPlantHumidityLevelParse(readBuffer utils.ReadBuffer)
 		_val, _err := HVACHumidityParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'level' field of AirConditioningDataSetPlantHumidityLevel")
@@ -283,7 +282,7 @@ func AirConditioningDataSetPlantHumidityLevelParse(readBuffer utils.ReadBuffer)
 		_val, _err := HVACRawLevelsParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'rawLevel' field of AirConditioningDataSetPlantHumidityLevel")
@@ -305,7 +304,7 @@ func AirConditioningDataSetPlantHumidityLevelParse(readBuffer utils.ReadBuffer)
 		_val, _err := HVACAuxiliaryLevelParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'auxLevel' field of AirConditioningDataSetPlantHumidityLevel")
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHvacLevel.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHvacLevel.go
index 73f2ab22570..64e80188c84 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHvacLevel.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHvacLevel.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -261,7 +260,7 @@ func AirConditioningDataSetPlantHvacLevelParse(readBuffer utils.ReadBuffer) (Air
 		_val, _err := HVACTemperatureParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'level' field of AirConditioningDataSetPlantHvacLevel")
@@ -283,7 +282,7 @@ func AirConditioningDataSetPlantHvacLevelParse(readBuffer utils.ReadBuffer) (Air
 		_val, _err := HVACRawLevelsParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'rawLevel' field of AirConditioningDataSetPlantHvacLevel")
@@ -305,7 +304,7 @@ func AirConditioningDataSetPlantHvacLevelParse(readBuffer utils.ReadBuffer) (Air
 		_val, _err := HVACAuxiliaryLevelParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'auxLevel' field of AirConditioningDataSetPlantHvacLevel")
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHumidityMode.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHumidityMode.go
index 600bba3abc8..74002dce5d5 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHumidityMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHumidityMode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -261,7 +260,7 @@ func AirConditioningDataSetZoneHumidityModeParse(readBuffer utils.ReadBuffer) (A
 		_val, _err := HVACHumidityParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'level' field of AirConditioningDataSetZoneHumidityMode")
@@ -283,7 +282,7 @@ func AirConditioningDataSetZoneHumidityModeParse(readBuffer utils.ReadBuffer) (A
 		_val, _err := HVACRawLevelsParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'rawLevel' field of AirConditioningDataSetZoneHumidityMode")
@@ -305,7 +304,7 @@ func AirConditioningDataSetZoneHumidityModeParse(readBuffer utils.ReadBuffer) (A
 		_val, _err := HVACAuxiliaryLevelParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'auxLevel' field of AirConditioningDataSetZoneHumidityMode")
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHvacMode.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHvacMode.go
index b57643bd782..c9dbee76c9d 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHvacMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHvacMode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -261,7 +260,7 @@ func AirConditioningDataSetZoneHvacModeParse(readBuffer utils.ReadBuffer) (AirCo
 		_val, _err := HVACTemperatureParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'level' field of AirConditioningDataSetZoneHvacMode")
@@ -283,7 +282,7 @@ func AirConditioningDataSetZoneHvacModeParse(readBuffer utils.ReadBuffer) (AirCo
 		_val, _err := HVACRawLevelsParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'rawLevel' field of AirConditioningDataSetZoneHvacMode")
@@ -305,7 +304,7 @@ func AirConditioningDataSetZoneHvacModeParse(readBuffer utils.ReadBuffer) (AirCo
 		_val, _err := HVACAuxiliaryLevelParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'auxLevel' field of AirConditioningDataSetZoneHvacMode")
diff --git a/plc4go/protocols/cbus/readwrite/model/ApplicationId.go b/plc4go/protocols/cbus/readwrite/model/ApplicationId.go
index 3dd936b3122..6d1f69fce33 100644
--- a/plc4go/protocols/cbus/readwrite/model/ApplicationId.go
+++ b/plc4go/protocols/cbus/readwrite/model/ApplicationId.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -228,7 +227,7 @@ func ApplicationIdParse(readBuffer utils.ReadBuffer) (ApplicationId, error) {
 		return 0, errors.Wrap(err, "error reading ApplicationId")
 	}
 	if enum, ok := ApplicationIdByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ApplicationId(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ApplicationIdContainer.go b/plc4go/protocols/cbus/readwrite/model/ApplicationIdContainer.go
index 7772274f2eb..87190950361 100644
--- a/plc4go/protocols/cbus/readwrite/model/ApplicationIdContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/ApplicationIdContainer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -3711,7 +3710,7 @@ func ApplicationIdContainerParse(readBuffer utils.ReadBuffer) (ApplicationIdCont
 		return 0, errors.Wrap(err, "error reading ApplicationIdContainer")
 	}
 	if enum, ok := ApplicationIdContainerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ApplicationIdContainer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/Attribute.go b/plc4go/protocols/cbus/readwrite/model/Attribute.go
index d7debe3c398..293b917b0c9 100644
--- a/plc4go/protocols/cbus/readwrite/model/Attribute.go
+++ b/plc4go/protocols/cbus/readwrite/model/Attribute.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -288,7 +287,7 @@ func AttributeParse(readBuffer utils.ReadBuffer) (Attribute, error) {
 		return 0, errors.Wrap(err, "error reading Attribute")
 	}
 	if enum, ok := AttributeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return Attribute(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/BaudRateSelector.go b/plc4go/protocols/cbus/readwrite/model/BaudRateSelector.go
index c266b305ac4..ce0512141e9 100644
--- a/plc4go/protocols/cbus/readwrite/model/BaudRateSelector.go
+++ b/plc4go/protocols/cbus/readwrite/model/BaudRateSelector.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -126,7 +125,7 @@ func BaudRateSelectorParse(readBuffer utils.ReadBuffer) (BaudRateSelector, error
 		return 0, errors.Wrap(err, "error reading BaudRateSelector")
 	}
 	if enum, ok := BaudRateSelectorByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return BaudRateSelector(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/CALCommandType.go b/plc4go/protocols/cbus/readwrite/model/CALCommandType.go
index fbdb6d685f8..9c46e2ebb83 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALCommandType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -144,7 +143,7 @@ func CALCommandTypeParse(readBuffer utils.ReadBuffer) (CALCommandType, error) {
 		return 0, errors.Wrap(err, "error reading CALCommandType")
 	}
 	if enum, ok := CALCommandTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return CALCommandType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/CALCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/CALCommandTypeContainer.go
index 14329413303..db50917320c 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALCommandTypeContainer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -1765,7 +1764,7 @@ func CALCommandTypeContainerParse(readBuffer utils.ReadBuffer) (CALCommandTypeCo
 		return 0, errors.Wrap(err, "error reading CALCommandTypeContainer")
 	}
 	if enum, ok := CALCommandTypeContainerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return CALCommandTypeContainer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/CALData.go b/plc4go/protocols/cbus/readwrite/model/CALData.go
index e1244242441..ad38c252a0e 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALData.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALData.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -245,7 +244,7 @@ func CALDataParse(readBuffer utils.ReadBuffer, requestContext RequestContext) (C
 		_val, _err := CALDataParse(readBuffer, nil)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'additionalData' field of CALData")
diff --git a/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go b/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go
index 94b1447001e..924a667c8ca 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -232,7 +231,7 @@ func CALReplyLongParse(readBuffer utils.ReadBuffer, cBusOptions CBusOptions, req
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CALReplyLong")
 		}
 		if reserved != byte(0x86) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": byte(0x86),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -265,7 +264,7 @@ func CALReplyLongParse(readBuffer utils.ReadBuffer, cBusOptions CBusOptions, req
 		_val, _err := UnitAddressParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'unitAddress' field of CALReplyLong")
@@ -287,7 +286,7 @@ func CALReplyLongParse(readBuffer utils.ReadBuffer, cBusOptions CBusOptions, req
 		_val, _err := BridgeAddressParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'bridgeAddress' field of CALReplyLong")
@@ -337,7 +336,7 @@ func CALReplyLongParse(readBuffer utils.ReadBuffer, cBusOptions CBusOptions, req
 		_val, _err := ReplyNetworkParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'replyNetwork' field of CALReplyLong")
@@ -383,7 +382,7 @@ func (m *_CALReplyLong) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved byte = byte(0x86)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": byte(0x86),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go
index 602ae266f7a..8348f8d979a 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -169,7 +168,7 @@ func CBusPointToMultiPointCommandNormalParse(readBuffer utils.ReadBuffer, cBusOp
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CBusPointToMultiPointCommandNormal")
 		}
 		if reserved != byte(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": byte(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -232,7 +231,7 @@ func (m *_CBusPointToMultiPointCommandNormal) Serialize(writeBuffer utils.WriteB
 		{
 			var reserved byte = byte(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": byte(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go
index c8068fd68ef..370a56c0b6e 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -149,7 +148,7 @@ func CBusPointToMultiPointCommandStatusParse(readBuffer utils.ReadBuffer, cBusOp
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CBusPointToMultiPointCommandStatus")
 		}
 		if reserved != byte(0xFF) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": byte(0xFF),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -166,7 +165,7 @@ func CBusPointToMultiPointCommandStatusParse(readBuffer utils.ReadBuffer, cBusOp
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CBusPointToMultiPointCommandStatus")
 		}
 		if reserved != byte(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": byte(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -217,7 +216,7 @@ func (m *_CBusPointToMultiPointCommandStatus) Serialize(writeBuffer utils.WriteB
 		{
 			var reserved byte = byte(0xFF)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": byte(0xFF),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -233,7 +232,7 @@ func (m *_CBusPointToMultiPointCommandStatus) Serialize(writeBuffer utils.WriteB
 		{
 			var reserved byte = byte(0x00)
 			if m.reservedField1 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": byte(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandDirect.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandDirect.go
index 38205fd1654..dc28bd24281 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandDirect.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandDirect.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -159,7 +158,7 @@ func CBusPointToPointCommandDirectParse(readBuffer utils.ReadBuffer, cBusOptions
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CBusPointToPointCommandDirect")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -208,7 +207,7 @@ func (m *_CBusPointToPointCommandDirect) Serialize(writeBuffer utils.WriteBuffer
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandStatus.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandStatus.go
index e4f6ac11639..a4fd3cdd6e0 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -147,7 +146,7 @@ func CBusPointToPointToMultiPointCommandStatusParse(readBuffer utils.ReadBuffer,
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CBusPointToPointToMultiPointCommandStatus")
 		}
 		if reserved != byte(0xFF) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": byte(0xFF),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -197,7 +196,7 @@ func (m *_CBusPointToPointToMultiPointCommandStatus) Serialize(writeBuffer utils
 		{
 			var reserved byte = byte(0xFF)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": byte(0xFF),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/ChannelStatus.go b/plc4go/protocols/cbus/readwrite/model/ChannelStatus.go
index 14f26ab7e15..e8bf6544a5d 100644
--- a/plc4go/protocols/cbus/readwrite/model/ChannelStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/ChannelStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func ChannelStatusParse(readBuffer utils.ReadBuffer) (ChannelStatus, error) {
 		return 0, errors.Wrap(err, "error reading ChannelStatus")
 	}
 	if enum, ok := ChannelStatusByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ChannelStatus(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandType.go b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandType.go
index bcdf92307c7..d0bd7137fcf 100644
--- a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -128,7 +127,7 @@ func ClockAndTimekeepingCommandTypeParse(readBuffer utils.ReadBuffer) (ClockAndT
 		return 0, errors.Wrap(err, "error reading ClockAndTimekeepingCommandType")
 	}
 	if enum, ok := ClockAndTimekeepingCommandTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ClockAndTimekeepingCommandType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandTypeContainer.go
index c607dbdb92a..cafc44fd8ba 100644
--- a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandTypeContainer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -253,7 +252,7 @@ func ClockAndTimekeepingCommandTypeContainerParse(readBuffer utils.ReadBuffer) (
 		return 0, errors.Wrap(err, "error reading ClockAndTimekeepingCommandTypeContainer")
 	}
 	if enum, ok := ClockAndTimekeepingCommandTypeContainerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ClockAndTimekeepingCommandTypeContainer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/Confirmation.go b/plc4go/protocols/cbus/readwrite/model/Confirmation.go
index cce0a480dfc..bb69e2097c4 100644
--- a/plc4go/protocols/cbus/readwrite/model/Confirmation.go
+++ b/plc4go/protocols/cbus/readwrite/model/Confirmation.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -172,7 +171,7 @@ func ConfirmationParse(readBuffer utils.ReadBuffer) (Confirmation, error) {
 		_val, _err := AlphaParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'secondAlpha' field of Confirmation")
diff --git a/plc4go/protocols/cbus/readwrite/model/ConfirmationType.go b/plc4go/protocols/cbus/readwrite/model/ConfirmationType.go
index 3f3655db1ab..cabbc04c081 100644
--- a/plc4go/protocols/cbus/readwrite/model/ConfirmationType.go
+++ b/plc4go/protocols/cbus/readwrite/model/ConfirmationType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -126,7 +125,7 @@ func ConfirmationTypeParse(readBuffer utils.ReadBuffer) (ConfirmationType, error
 		return 0, errors.Wrap(err, "error reading ConfirmationType")
 	}
 	if enum, ok := ConfirmationTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ConfirmationType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/DestinationAddressType.go b/plc4go/protocols/cbus/readwrite/model/DestinationAddressType.go
index f934ed79270..0de19a0199f 100644
--- a/plc4go/protocols/cbus/readwrite/model/DestinationAddressType.go
+++ b/plc4go/protocols/cbus/readwrite/model/DestinationAddressType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func DestinationAddressTypeParse(readBuffer utils.ReadBuffer) (DestinationAddres
 		return 0, errors.Wrap(err, "error reading DestinationAddressType")
 	}
 	if enum, ok := DestinationAddressTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return DestinationAddressType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/DialInFailureReason.go b/plc4go/protocols/cbus/readwrite/model/DialInFailureReason.go
index 7fae4d9a2f5..5fb3b1fc29f 100644
--- a/plc4go/protocols/cbus/readwrite/model/DialInFailureReason.go
+++ b/plc4go/protocols/cbus/readwrite/model/DialInFailureReason.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,7 +95,7 @@ func DialInFailureReasonParse(readBuffer utils.ReadBuffer) (DialInFailureReason,
 		return 0, errors.Wrap(err, "error reading DialInFailureReason")
 	}
 	if enum, ok := DialInFailureReasonByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return DialInFailureReason(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/DialOutFailureReason.go b/plc4go/protocols/cbus/readwrite/model/DialOutFailureReason.go
index b3fe27e81e3..a5f7e14e3ff 100644
--- a/plc4go/protocols/cbus/readwrite/model/DialOutFailureReason.go
+++ b/plc4go/protocols/cbus/readwrite/model/DialOutFailureReason.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -126,7 +125,7 @@ func DialOutFailureReasonParse(readBuffer utils.ReadBuffer) (DialOutFailureReaso
 		return 0, errors.Wrap(err, "error reading DialOutFailureReason")
 	}
 	if enum, ok := DialOutFailureReasonByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return DialOutFailureReason(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/EnableControlCommandType.go b/plc4go/protocols/cbus/readwrite/model/EnableControlCommandType.go
index df7d6d4b68e..2248e0dff38 100644
--- a/plc4go/protocols/cbus/readwrite/model/EnableControlCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/EnableControlCommandType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -118,7 +117,7 @@ func EnableControlCommandTypeParse(readBuffer utils.ReadBuffer) (EnableControlCo
 		return 0, errors.Wrap(err, "error reading EnableControlCommandType")
 	}
 	if enum, ok := EnableControlCommandTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return EnableControlCommandType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/EnableControlCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/EnableControlCommandTypeContainer.go
index eb6b9d6c7fb..1e8094a8034 100644
--- a/plc4go/protocols/cbus/readwrite/model/EnableControlCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/EnableControlCommandTypeContainer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -351,7 +350,7 @@ func EnableControlCommandTypeContainerParse(readBuffer utils.ReadBuffer) (Enable
 		return 0, errors.Wrap(err, "error reading EnableControlCommandTypeContainer")
 	}
 	if enum, ok := EnableControlCommandTypeContainerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return EnableControlCommandTypeContainer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandType.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandType.go
index b24514e146f..8fe243f7be9 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -148,7 +147,7 @@ func ErrorReportingCommandTypeParse(readBuffer utils.ReadBuffer) (ErrorReporting
 		return 0, errors.Wrap(err, "error reading ErrorReportingCommandType")
 	}
 	if enum, ok := ErrorReportingCommandTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ErrorReportingCommandType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandTypeContainer.go
index 33d55f0fecc..ea75c69be1a 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandTypeContainer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -183,7 +182,7 @@ func ErrorReportingCommandTypeContainerParse(readBuffer utils.ReadBuffer) (Error
 		return 0, errors.Wrap(err, "error reading ErrorReportingCommandTypeContainer")
 	}
 	if enum, ok := ErrorReportingCommandTypeContainerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ErrorReportingCommandTypeContainer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSeverity.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSeverity.go
index 5171f779f5e..e11f543ee84 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSeverity.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSeverity.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -138,7 +137,7 @@ func ErrorReportingSeverityParse(readBuffer utils.ReadBuffer) (ErrorReportingSev
 		return 0, errors.Wrap(err, "error reading ErrorReportingSeverity")
 	}
 	if enum, ok := ErrorReportingSeverityByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ErrorReportingSeverity(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryClass.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryClass.go
index eac30744177..c06fc03bc96 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryClass.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryClass.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -186,7 +185,7 @@ func ErrorReportingSystemCategoryClassParse(readBuffer utils.ReadBuffer) (ErrorR
 		return 0, errors.Wrap(err, "error reading ErrorReportingSystemCategoryClass")
 	}
 	if enum, ok := ErrorReportingSystemCategoryClassByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ErrorReportingSystemCategoryClass(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForBuildingManagementSystems.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForBuildingManagementSystems.go
index 124207b7cee..adef7e0ddf1 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForBuildingManagementSystems.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForBuildingManagementSystems.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -186,7 +185,7 @@ func ErrorReportingSystemCategoryTypeForBuildingManagementSystemsParse(readBuffe
 		return 0, errors.Wrap(err, "error reading ErrorReportingSystemCategoryTypeForBuildingManagementSystems")
 	}
 	if enum, ok := ErrorReportingSystemCategoryTypeForBuildingManagementSystemsByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ErrorReportingSystemCategoryTypeForBuildingManagementSystems(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForClimateControllers.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForClimateControllers.go
index 8e882044889..1ae697c881b 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForClimateControllers.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForClimateControllers.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -186,7 +185,7 @@ func ErrorReportingSystemCategoryTypeForClimateControllersParse(readBuffer utils
 		return 0, errors.Wrap(err, "error reading ErrorReportingSystemCategoryTypeForClimateControllers")
 	}
 	if enum, ok := ErrorReportingSystemCategoryTypeForClimateControllersByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ErrorReportingSystemCategoryTypeForClimateControllers(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForInputUnits.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForInputUnits.go
index 4cc63116702..90087242644 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForInputUnits.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForInputUnits.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -186,7 +185,7 @@ func ErrorReportingSystemCategoryTypeForInputUnitsParse(readBuffer utils.ReadBuf
 		return 0, errors.Wrap(err, "error reading ErrorReportingSystemCategoryTypeForInputUnits")
 	}
 	if enum, ok := ErrorReportingSystemCategoryTypeForInputUnitsByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ErrorReportingSystemCategoryTypeForInputUnits(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForOutputUnits.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForOutputUnits.go
index e111443116e..77aefdbc327 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForOutputUnits.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForOutputUnits.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -186,7 +185,7 @@ func ErrorReportingSystemCategoryTypeForOutputUnitsParse(readBuffer utils.ReadBu
 		return 0, errors.Wrap(err, "error reading ErrorReportingSystemCategoryTypeForOutputUnits")
 	}
 	if enum, ok := ErrorReportingSystemCategoryTypeForOutputUnitsByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ErrorReportingSystemCategoryTypeForOutputUnits(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForSupportUnits.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForSupportUnits.go
index 085aa1cc6fe..f4e734b77f6 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForSupportUnits.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForSupportUnits.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -186,7 +185,7 @@ func ErrorReportingSystemCategoryTypeForSupportUnitsParse(readBuffer utils.ReadB
 		return 0, errors.Wrap(err, "error reading ErrorReportingSystemCategoryTypeForSupportUnits")
 	}
 	if enum, ok := ErrorReportingSystemCategoryTypeForSupportUnitsByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ErrorReportingSystemCategoryTypeForSupportUnits(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryVariant.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryVariant.go
index c8d50b08842..84b1a148f04 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryVariant.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryVariant.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func ErrorReportingSystemCategoryVariantParse(readBuffer utils.ReadBuffer) (Erro
 		return 0, errors.Wrap(err, "error reading ErrorReportingSystemCategoryVariant")
 	}
 	if enum, ok := ErrorReportingSystemCategoryVariantByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ErrorReportingSystemCategoryVariant(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/GAVState.go b/plc4go/protocols/cbus/readwrite/model/GAVState.go
index e1ed2d08440..93238708b61 100644
--- a/plc4go/protocols/cbus/readwrite/model/GAVState.go
+++ b/plc4go/protocols/cbus/readwrite/model/GAVState.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func GAVStateParse(readBuffer utils.ReadBuffer) (GAVState, error) {
 		return 0, errors.Wrap(err, "error reading GAVState")
 	}
 	if enum, ok := GAVStateByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return GAVState(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACAuxiliaryLevel.go b/plc4go/protocols/cbus/readwrite/model/HVACAuxiliaryLevel.go
index 9c7d418310a..bf033e2887b 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACAuxiliaryLevel.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACAuxiliaryLevel.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -171,7 +170,7 @@ func HVACAuxiliaryLevelParse(readBuffer utils.ReadBuffer) (HVACAuxiliaryLevel, e
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of HVACAuxiliaryLevel")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -237,7 +236,7 @@ func (m *_HVACAuxiliaryLevel) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACError.go b/plc4go/protocols/cbus/readwrite/model/HVACError.go
index ece8f96626b..61a454c63c3 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACError.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACError.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -930,7 +929,7 @@ func HVACErrorParse(readBuffer utils.ReadBuffer) (HVACError, error) {
 		return 0, errors.Wrap(err, "error reading HVACError")
 	}
 	if enum, ok := HVACErrorByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return HVACError(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACHumidityError.go b/plc4go/protocols/cbus/readwrite/model/HVACHumidityError.go
index 8446cf57593..202d93b3673 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACHumidityError.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACHumidityError.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -930,7 +929,7 @@ func HVACHumidityErrorParse(readBuffer utils.ReadBuffer) (HVACHumidityError, err
 		return 0, errors.Wrap(err, "error reading HVACHumidityError")
 	}
 	if enum, ok := HVACHumidityErrorByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return HVACHumidityError(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlags.go b/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlags.go
index 9b86eacdf81..bdb638a670b 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlags.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlags.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -233,7 +232,7 @@ func HVACHumidityModeAndFlagsParse(readBuffer utils.ReadBuffer) (HVACHumidityMod
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of HVACHumidityModeAndFlags")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -349,7 +348,7 @@ func (m *_HVACHumidityModeAndFlags) Serialize(writeBuffer utils.WriteBuffer) err
 	{
 		var reserved bool = bool(false)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlagsMode.go b/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlagsMode.go
index a05c3ebe086..98e5c7307c7 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlagsMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlagsMode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func HVACHumidityModeAndFlagsModeParse(readBuffer utils.ReadBuffer) (HVACHumidit
 		return 0, errors.Wrap(err, "error reading HVACHumidityModeAndFlagsMode")
 	}
 	if enum, ok := HVACHumidityModeAndFlagsModeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return HVACHumidityModeAndFlagsMode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACHumidityStatusFlags.go b/plc4go/protocols/cbus/readwrite/model/HVACHumidityStatusFlags.go
index ce9e9258040..6cd02ad3b60 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACHumidityStatusFlags.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACHumidityStatusFlags.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -226,7 +225,7 @@ func HVACHumidityStatusFlagsParse(readBuffer utils.ReadBuffer) (HVACHumidityStat
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of HVACHumidityStatusFlags")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -322,7 +321,7 @@ func (m *_HVACHumidityStatusFlags) Serialize(writeBuffer utils.WriteBuffer) erro
 	{
 		var reserved bool = bool(false)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACHumidityType.go b/plc4go/protocols/cbus/readwrite/model/HVACHumidityType.go
index aa33cf9f889..36eb8c27133 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACHumidityType.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACHumidityType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func HVACHumidityTypeParse(readBuffer utils.ReadBuffer) (HVACHumidityType, error
 		return 0, errors.Wrap(err, "error reading HVACHumidityType")
 	}
 	if enum, ok := HVACHumidityTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return HVACHumidityType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlags.go b/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlags.go
index 02ed637658d..4780a8ce226 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlags.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlags.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -233,7 +232,7 @@ func HVACModeAndFlagsParse(readBuffer utils.ReadBuffer) (HVACModeAndFlags, error
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of HVACModeAndFlags")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -349,7 +348,7 @@ func (m *_HVACModeAndFlags) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlagsMode.go b/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlagsMode.go
index b053f963a02..4b38d08dcda 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlagsMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlagsMode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -120,7 +119,7 @@ func HVACModeAndFlagsModeParse(readBuffer utils.ReadBuffer) (HVACModeAndFlagsMod
 		return 0, errors.Wrap(err, "error reading HVACModeAndFlagsMode")
 	}
 	if enum, ok := HVACModeAndFlagsModeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return HVACModeAndFlagsMode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACSensorStatus.go b/plc4go/protocols/cbus/readwrite/model/HVACSensorStatus.go
index ed064eb20d6..622b82f052b 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACSensorStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACSensorStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func HVACSensorStatusParse(readBuffer utils.ReadBuffer) (HVACSensorStatus, error
 		return 0, errors.Wrap(err, "error reading HVACSensorStatus")
 	}
 	if enum, ok := HVACSensorStatusByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return HVACSensorStatus(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACStatusFlags.go b/plc4go/protocols/cbus/readwrite/model/HVACStatusFlags.go
index d4133056884..45103212f42 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACStatusFlags.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACStatusFlags.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -226,7 +225,7 @@ func HVACStatusFlagsParse(readBuffer utils.ReadBuffer) (HVACStatusFlags, error)
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of HVACStatusFlags")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -322,7 +321,7 @@ func (m *_HVACStatusFlags) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACType.go b/plc4go/protocols/cbus/readwrite/model/HVACType.go
index 1d5107797e6..2cb8528e1bb 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACType.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -162,7 +161,7 @@ func HVACTypeParse(readBuffer utils.ReadBuffer) (HVACType, error) {
 		return 0, errors.Wrap(err, "error reading HVACType")
 	}
 	if enum, ok := HVACTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return HVACType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go
index c4b33106c29..a80e0520906 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -451,7 +450,7 @@ func IdentifyReplyCommandExtendedDiagnosticSummaryParse(readBuffer utils.ReadBuf
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of IdentifyReplyCommandExtendedDiagnosticSummary")
 		}
 		if reserved != uint8(0) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -468,7 +467,7 @@ func IdentifyReplyCommandExtendedDiagnosticSummaryParse(readBuffer utils.ReadBuf
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of IdentifyReplyCommandExtendedDiagnosticSummary")
 		}
 		if reserved != uint8(0) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -485,7 +484,7 @@ func IdentifyReplyCommandExtendedDiagnosticSummaryParse(readBuffer utils.ReadBuf
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of IdentifyReplyCommandExtendedDiagnosticSummary")
 		}
 		if reserved != uint8(0) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -689,7 +688,7 @@ func (m *_IdentifyReplyCommandExtendedDiagnosticSummary) Serialize(writeBuffer u
 		{
 			var reserved uint8 = uint8(0)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -705,7 +704,7 @@ func (m *_IdentifyReplyCommandExtendedDiagnosticSummary) Serialize(writeBuffer u
 		{
 			var reserved uint8 = uint8(0)
 			if m.reservedField1 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -721,7 +720,7 @@ func (m *_IdentifyReplyCommandExtendedDiagnosticSummary) Serialize(writeBuffer u
 		{
 			var reserved uint8 = uint8(0)
 			if m.reservedField2 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1.go b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1.go
index 373a10f8d35..c9e0a53fcb8 100644
--- a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1.go
+++ b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -174,7 +173,7 @@ func InterfaceOptions1Parse(readBuffer utils.ReadBuffer) (InterfaceOptions1, err
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of InterfaceOptions1")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -226,7 +225,7 @@ func InterfaceOptions1Parse(readBuffer utils.ReadBuffer) (InterfaceOptions1, err
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of InterfaceOptions1")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -270,7 +269,7 @@ func (m *_InterfaceOptions1) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -321,7 +320,7 @@ func (m *_InterfaceOptions1) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField1 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions2.go b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions2.go
index 2e7666a30e2..681cf5f89f8 100644
--- a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions2.go
+++ b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions2.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -150,7 +149,7 @@ func InterfaceOptions2Parse(readBuffer utils.ReadBuffer) (InterfaceOptions2, err
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of InterfaceOptions2")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -174,7 +173,7 @@ func InterfaceOptions2Parse(readBuffer utils.ReadBuffer) (InterfaceOptions2, err
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of InterfaceOptions2")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -191,7 +190,7 @@ func InterfaceOptions2Parse(readBuffer utils.ReadBuffer) (InterfaceOptions2, err
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of InterfaceOptions2")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -208,7 +207,7 @@ func InterfaceOptions2Parse(readBuffer utils.ReadBuffer) (InterfaceOptions2, err
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of InterfaceOptions2")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -225,7 +224,7 @@ func InterfaceOptions2Parse(readBuffer utils.ReadBuffer) (InterfaceOptions2, err
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of InterfaceOptions2")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -242,7 +241,7 @@ func InterfaceOptions2Parse(readBuffer utils.ReadBuffer) (InterfaceOptions2, err
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of InterfaceOptions2")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -286,7 +285,7 @@ func (m *_InterfaceOptions2) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -309,7 +308,7 @@ func (m *_InterfaceOptions2) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField1 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -325,7 +324,7 @@ func (m *_InterfaceOptions2) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField2 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -341,7 +340,7 @@ func (m *_InterfaceOptions2) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField3 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -357,7 +356,7 @@ func (m *_InterfaceOptions2) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField4 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -373,7 +372,7 @@ func (m *_InterfaceOptions2) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField5 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions3.go b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions3.go
index 7fa2786a264..00bf73ab644 100644
--- a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions3.go
+++ b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions3.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -162,7 +161,7 @@ func InterfaceOptions3Parse(readBuffer utils.ReadBuffer) (InterfaceOptions3, err
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of InterfaceOptions3")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -179,7 +178,7 @@ func InterfaceOptions3Parse(readBuffer utils.ReadBuffer) (InterfaceOptions3, err
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of InterfaceOptions3")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -196,7 +195,7 @@ func InterfaceOptions3Parse(readBuffer utils.ReadBuffer) (InterfaceOptions3, err
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of InterfaceOptions3")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -213,7 +212,7 @@ func InterfaceOptions3Parse(readBuffer utils.ReadBuffer) (InterfaceOptions3, err
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of InterfaceOptions3")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -278,7 +277,7 @@ func (m *_InterfaceOptions3) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -294,7 +293,7 @@ func (m *_InterfaceOptions3) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField1 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -310,7 +309,7 @@ func (m *_InterfaceOptions3) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField2 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -326,7 +325,7 @@ func (m *_InterfaceOptions3) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField3 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/Language.go b/plc4go/protocols/cbus/readwrite/model/Language.go
index 117b49955ae..96db55c2fd3 100644
--- a/plc4go/protocols/cbus/readwrite/model/Language.go
+++ b/plc4go/protocols/cbus/readwrite/model/Language.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -504,7 +503,7 @@ func LanguageParse(readBuffer utils.ReadBuffer) (Language, error) {
 		return 0, errors.Wrap(err, "error reading Language")
 	}
 	if enum, ok := LanguageByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return Language(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/LevelInformationAbsent.go b/plc4go/protocols/cbus/readwrite/model/LevelInformationAbsent.go
index 49ab150f5c7..08dcda5e3be 100644
--- a/plc4go/protocols/cbus/readwrite/model/LevelInformationAbsent.go
+++ b/plc4go/protocols/cbus/readwrite/model/LevelInformationAbsent.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -124,7 +123,7 @@ func LevelInformationAbsentParse(readBuffer utils.ReadBuffer) (LevelInformationA
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of LevelInformationAbsent")
 		}
 		if reserved != uint16(0x0000) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint16(0x0000),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -158,7 +157,7 @@ func (m *_LevelInformationAbsent) Serialize(writeBuffer utils.WriteBuffer) error
 		{
 			var reserved uint16 = uint16(0x0000)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint16(0x0000),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/LevelInformationNibblePair.go b/plc4go/protocols/cbus/readwrite/model/LevelInformationNibblePair.go
index 49712e52b27..671bcccc380 100644
--- a/plc4go/protocols/cbus/readwrite/model/LevelInformationNibblePair.go
+++ b/plc4go/protocols/cbus/readwrite/model/LevelInformationNibblePair.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -268,7 +267,7 @@ func LevelInformationNibblePairParse(readBuffer utils.ReadBuffer) (LevelInformat
 		return 0, errors.Wrap(err, "error reading LevelInformationNibblePair")
 	}
 	if enum, ok := LevelInformationNibblePairByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return LevelInformationNibblePair(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingCommandType.go b/plc4go/protocols/cbus/readwrite/model/LightingCommandType.go
index ba2bbb139e6..5e0cfdcdb83 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingCommandType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -158,7 +157,7 @@ func LightingCommandTypeParse(readBuffer utils.ReadBuffer) (LightingCommandType,
 		return 0, errors.Wrap(err, "error reading LightingCommandType")
 	}
 	if enum, ok := LightingCommandTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return LightingCommandType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/LightingCommandTypeContainer.go
index c84bbdedb98..bc073905eb1 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingCommandTypeContainer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -841,7 +840,7 @@ func LightingCommandTypeContainerParse(readBuffer utils.ReadBuffer) (LightingCom
 		return 0, errors.Wrap(err, "error reading LightingCommandTypeContainer")
 	}
 	if enum, ok := LightingCommandTypeContainerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return LightingCommandTypeContainer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingCompatible.go b/plc4go/protocols/cbus/readwrite/model/LightingCompatible.go
index 66da41d79d1..200e5dc10ad 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingCompatible.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingCompatible.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func LightingCompatibleParse(readBuffer utils.ReadBuffer) (LightingCompatible, e
 		return 0, errors.Wrap(err, "error reading LightingCompatible")
 	}
 	if enum, ok := LightingCompatibleByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return LightingCompatible(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingLabelFlavour.go b/plc4go/protocols/cbus/readwrite/model/LightingLabelFlavour.go
index f3c906197d8..32a7266437e 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingLabelFlavour.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingLabelFlavour.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func LightingLabelFlavourParse(readBuffer utils.ReadBuffer) (LightingLabelFlavou
 		return 0, errors.Wrap(err, "error reading LightingLabelFlavour")
 	}
 	if enum, ok := LightingLabelFlavourByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return LightingLabelFlavour(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingLabelOptions.go b/plc4go/protocols/cbus/readwrite/model/LightingLabelOptions.go
index 70b1ae3c86c..4209e3c308b 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingLabelOptions.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingLabelOptions.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -142,7 +141,7 @@ func LightingLabelOptionsParse(readBuffer utils.ReadBuffer) (LightingLabelOption
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of LightingLabelOptions")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -172,7 +171,7 @@ func LightingLabelOptionsParse(readBuffer utils.ReadBuffer) (LightingLabelOption
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of LightingLabelOptions")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -189,7 +188,7 @@ func LightingLabelOptionsParse(readBuffer utils.ReadBuffer) (LightingLabelOption
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of LightingLabelOptions")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -219,7 +218,7 @@ func LightingLabelOptionsParse(readBuffer utils.ReadBuffer) (LightingLabelOption
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of LightingLabelOptions")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -254,7 +253,7 @@ func (m *_LightingLabelOptions) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -282,7 +281,7 @@ func (m *_LightingLabelOptions) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField1 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -298,7 +297,7 @@ func (m *_LightingLabelOptions) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField2 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -326,7 +325,7 @@ func (m *_LightingLabelOptions) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField3 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingLabelType.go b/plc4go/protocols/cbus/readwrite/model/LightingLabelType.go
index 4b3978f3f8c..5129d39e046 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingLabelType.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingLabelType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func LightingLabelTypeParse(readBuffer utils.ReadBuffer) (LightingLabelType, err
 		return 0, errors.Wrap(err, "error reading LightingLabelType")
 	}
 	if enum, ok := LightingLabelTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return LightingLabelType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/LineOffHookReason.go b/plc4go/protocols/cbus/readwrite/model/LineOffHookReason.go
index 57aad3295b2..8b2fbac7eab 100644
--- a/plc4go/protocols/cbus/readwrite/model/LineOffHookReason.go
+++ b/plc4go/protocols/cbus/readwrite/model/LineOffHookReason.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -138,7 +137,7 @@ func LineOffHookReasonParse(readBuffer utils.ReadBuffer) (LineOffHookReason, err
 		return 0, errors.Wrap(err, "error reading LineOffHookReason")
 	}
 	if enum, ok := LineOffHookReasonByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return LineOffHookReason(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/LogicAssignment.go b/plc4go/protocols/cbus/readwrite/model/LogicAssignment.go
index 0a1b32fc987..fbd9ebb1520 100644
--- a/plc4go/protocols/cbus/readwrite/model/LogicAssignment.go
+++ b/plc4go/protocols/cbus/readwrite/model/LogicAssignment.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -188,7 +187,7 @@ func LogicAssignmentParse(readBuffer utils.ReadBuffer) (LogicAssignment, error)
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of LogicAssignment")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -205,7 +204,7 @@ func LogicAssignmentParse(readBuffer utils.ReadBuffer) (LogicAssignment, error)
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of LogicAssignment")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -284,7 +283,7 @@ func (m *_LogicAssignment) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -300,7 +299,7 @@ func (m *_LogicAssignment) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved bool = bool(false)
 		if m.reservedField1 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/MeasurementCommandType.go b/plc4go/protocols/cbus/readwrite/model/MeasurementCommandType.go
index 42a738f1241..cbf95c9cfa3 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeasurementCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeasurementCommandType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -118,7 +117,7 @@ func MeasurementCommandTypeParse(readBuffer utils.ReadBuffer) (MeasurementComman
 		return 0, errors.Wrap(err, "error reading MeasurementCommandType")
 	}
 	if enum, ok := MeasurementCommandTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return MeasurementCommandType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/MeasurementCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/MeasurementCommandTypeContainer.go
index 577b97a67e1..93ce8fbae93 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeasurementCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeasurementCommandTypeContainer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -141,7 +140,7 @@ func MeasurementCommandTypeContainerParse(readBuffer utils.ReadBuffer) (Measurem
 		return 0, errors.Wrap(err, "error reading MeasurementCommandTypeContainer")
 	}
 	if enum, ok := MeasurementCommandTypeContainerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return MeasurementCommandTypeContainer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/MeasurementUnits.go b/plc4go/protocols/cbus/readwrite/model/MeasurementUnits.go
index 4cbeb78419a..9f2f4e30538 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeasurementUnits.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeasurementUnits.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -342,7 +341,7 @@ func MeasurementUnitsParse(readBuffer utils.ReadBuffer) (MeasurementUnits, error
 		return 0, errors.Wrap(err, "error reading MeasurementUnits")
 	}
 	if enum, ok := MeasurementUnitsByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return MeasurementUnits(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandType.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandType.go
index e9f00c19fd2..228f95e8829 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -262,7 +261,7 @@ func MediaTransportControlCommandTypeParse(readBuffer utils.ReadBuffer) (MediaTr
 		return 0, errors.Wrap(err, "error reading MediaTransportControlCommandType")
 	}
 	if enum, ok := MediaTransportControlCommandTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return MediaTransportControlCommandType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandTypeContainer.go
index aa74b9dbf8c..c4b4cabdeb2 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandTypeContainer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -1723,7 +1722,7 @@ func MediaTransportControlCommandTypeContainerParse(readBuffer utils.ReadBuffer)
 		return 0, errors.Wrap(err, "error reading MediaTransportControlCommandTypeContainer")
 	}
 	if enum, ok := MediaTransportControlCommandTypeContainerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return MediaTransportControlCommandTypeContainer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringCommandType.go b/plc4go/protocols/cbus/readwrite/model/MeteringCommandType.go
index 1ce616df51c..d8b6c76397a 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringCommandType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -118,7 +117,7 @@ func MeteringCommandTypeParse(readBuffer utils.ReadBuffer) (MeteringCommandType,
 		return 0, errors.Wrap(err, "error reading MeteringCommandType")
 	}
 	if enum, ok := MeteringCommandTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return MeteringCommandType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/MeteringCommandTypeContainer.go
index b854da87d00..58742c154a4 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringCommandTypeContainer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -239,7 +238,7 @@ func MeteringCommandTypeContainerParse(readBuffer utils.ReadBuffer) (MeteringCom
 		return 0, errors.Wrap(err, "error reading MeteringCommandTypeContainer")
 	}
 	if enum, ok := MeteringCommandTypeContainerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return MeteringCommandTypeContainer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go b/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go
index 049f61728bb..cf74d9d339e 100644
--- a/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -246,7 +245,7 @@ func MonitoredSALLongFormSmartModeParse(readBuffer utils.ReadBuffer, cBusOptions
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of MonitoredSALLongFormSmartMode")
 		}
 		if reserved != byte(0x05) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": byte(0x05),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -279,7 +278,7 @@ func MonitoredSALLongFormSmartModeParse(readBuffer utils.ReadBuffer, cBusOptions
 		_val, _err := UnitAddressParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'unitAddress' field of MonitoredSALLongFormSmartMode")
@@ -301,7 +300,7 @@ func MonitoredSALLongFormSmartModeParse(readBuffer utils.ReadBuffer, cBusOptions
 		_val, _err := BridgeAddressParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'bridgeAddress' field of MonitoredSALLongFormSmartMode")
@@ -351,7 +350,7 @@ func MonitoredSALLongFormSmartModeParse(readBuffer utils.ReadBuffer, cBusOptions
 		_val, _err := ReplyNetworkParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'replyNetwork' field of MonitoredSALLongFormSmartMode")
@@ -373,7 +372,7 @@ func MonitoredSALLongFormSmartModeParse(readBuffer utils.ReadBuffer, cBusOptions
 		_val, _err := SALDataParse(readBuffer, application.ApplicationId())
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'salData' field of MonitoredSALLongFormSmartMode")
@@ -419,7 +418,7 @@ func (m *_MonitoredSALLongFormSmartMode) Serialize(writeBuffer utils.WriteBuffer
 		{
 			var reserved byte = byte(0x05)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": byte(0x05),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go b/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go
index 3af08b55283..9e8b1b23947 100644
--- a/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -255,7 +254,7 @@ func MonitoredSALShortFormBasicModeParse(readBuffer utils.ReadBuffer, cBusOption
 		_val, _err := SALDataParse(readBuffer, application.ApplicationId())
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'salData' field of MonitoredSALShortFormBasicMode")
diff --git a/plc4go/protocols/cbus/readwrite/model/NetworkProtocolControlInformation.go b/plc4go/protocols/cbus/readwrite/model/NetworkProtocolControlInformation.go
index c8496ee7f29..d7ca2bd7da3 100644
--- a/plc4go/protocols/cbus/readwrite/model/NetworkProtocolControlInformation.go
+++ b/plc4go/protocols/cbus/readwrite/model/NetworkProtocolControlInformation.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -130,7 +129,7 @@ func NetworkProtocolControlInformationParse(readBuffer utils.ReadBuffer) (Networ
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of NetworkProtocolControlInformation")
 		}
 		if reserved != uint8(0x0) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x0),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -176,7 +175,7 @@ func (m *_NetworkProtocolControlInformation) Serialize(writeBuffer utils.WriteBu
 	{
 		var reserved uint8 = uint8(0x0)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x0),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/Parameter.go b/plc4go/protocols/cbus/readwrite/model/Parameter.go
index fe65856bd35..dea9f332a80 100644
--- a/plc4go/protocols/cbus/readwrite/model/Parameter.go
+++ b/plc4go/protocols/cbus/readwrite/model/Parameter.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -7883,7 +7882,7 @@ func ParameterParse(readBuffer utils.ReadBuffer) (Parameter, error) {
 		return 0, errors.Wrap(err, "error reading Parameter")
 	}
 	if enum, ok := ParameterByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return Parameter(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterType.go b/plc4go/protocols/cbus/readwrite/model/ParameterType.go
index 1fedae426fd..aec7893d44d 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterType.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -156,7 +155,7 @@ func ParameterTypeParse(readBuffer utils.ReadBuffer) (ParameterType, error) {
 		return 0, errors.Wrap(err, "error reading ParameterType")
 	}
 	if enum, ok := ParameterTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ParameterType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/PriorityClass.go b/plc4go/protocols/cbus/readwrite/model/PriorityClass.go
index acc50a2f056..899116d1c68 100644
--- a/plc4go/protocols/cbus/readwrite/model/PriorityClass.go
+++ b/plc4go/protocols/cbus/readwrite/model/PriorityClass.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func PriorityClassParse(readBuffer utils.ReadBuffer) (PriorityClass, error) {
 		return 0, errors.Wrap(err, "error reading PriorityClass")
 	}
 	if enum, ok := PriorityClassByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return PriorityClass(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ProtectionLevel.go b/plc4go/protocols/cbus/readwrite/model/ProtectionLevel.go
index 8cdc80fb581..abd1ea3a6ff 100644
--- a/plc4go/protocols/cbus/readwrite/model/ProtectionLevel.go
+++ b/plc4go/protocols/cbus/readwrite/model/ProtectionLevel.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -148,7 +147,7 @@ func ProtectionLevelParse(readBuffer utils.ReadBuffer) (ProtectionLevel, error)
 		return 0, errors.Wrap(err, "error reading ProtectionLevel")
 	}
 	if enum, ok := ProtectionLevelByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ProtectionLevel(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationConfirmation.go b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationConfirmation.go
index 0f070c84478..209c2d6185b 100644
--- a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationConfirmation.go
+++ b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationConfirmation.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -169,7 +168,7 @@ func ReplyOrConfirmationConfirmationParse(readBuffer utils.ReadBuffer, cBusOptio
 		_val, _err := ReplyOrConfirmationParse(readBuffer, cBusOptions, requestContext)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'embeddedReply' field of ReplyOrConfirmationConfirmation")
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestCommand.go b/plc4go/protocols/cbus/readwrite/model/RequestCommand.go
index 81c5771e23f..ff5786730b1 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestCommand.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -259,7 +258,7 @@ func RequestCommandParse(readBuffer utils.ReadBuffer, cBusOptions CBusOptions) (
 		_val, _err := AlphaParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'alpha' field of RequestCommand")
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestDirectCommandAccess.go b/plc4go/protocols/cbus/readwrite/model/RequestDirectCommandAccess.go
index 3c8aaed8523..62c0d09b4ea 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestDirectCommandAccess.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestDirectCommandAccess.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -223,7 +222,7 @@ func RequestDirectCommandAccessParse(readBuffer utils.ReadBuffer, cBusOptions CB
 		_val, _err := AlphaParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'alpha' field of RequestDirectCommandAccess")
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestObsolete.go b/plc4go/protocols/cbus/readwrite/model/RequestObsolete.go
index b1953fd4d65..e38cbbf026a 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestObsolete.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestObsolete.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -194,7 +193,7 @@ func RequestObsoleteParse(readBuffer utils.ReadBuffer, cBusOptions CBusOptions)
 		_val, _err := AlphaParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'alpha' field of RequestObsolete")
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestType.go b/plc4go/protocols/cbus/readwrite/model/RequestType.go
index 8d2dd593bd1..bb38b72f7a0 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestType.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -178,7 +177,7 @@ func RequestTypeParse(readBuffer utils.ReadBuffer) (RequestType, error) {
 		return 0, errors.Wrap(err, "error reading RequestType")
 	}
 	if enum, ok := RequestTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return RequestType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/SALData.go b/plc4go/protocols/cbus/readwrite/model/SALData.go
index 787aa1bf688..8450676e6b5 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALData.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALData.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -204,7 +203,7 @@ func SALDataParse(readBuffer utils.ReadBuffer, applicationId ApplicationId) (SAL
 		_val, _err := SALDataParse(readBuffer, applicationId)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'salData' field of SALData")
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityCommandType.go b/plc4go/protocols/cbus/readwrite/model/SecurityCommandType.go
index eb0de4d78c7..8a20560ceb4 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityCommandType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -138,7 +137,7 @@ func SecurityCommandTypeParse(readBuffer utils.ReadBuffer) (SecurityCommandType,
 		return 0, errors.Wrap(err, "error reading SecurityCommandType")
 	}
 	if enum, ok := SecurityCommandTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return SecurityCommandType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/SecurityCommandTypeContainer.go
index 3de2a3b0dbc..04c723ee6ad 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityCommandTypeContainer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -1807,7 +1806,7 @@ func SecurityCommandTypeContainerParse(readBuffer utils.ReadBuffer) (SecurityCom
 		return 0, errors.Wrap(err, "error reading SecurityCommandTypeContainer")
 	}
 	if enum, ok := SecurityCommandTypeContainerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return SecurityCommandTypeContainer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/StatusCoding.go b/plc4go/protocols/cbus/readwrite/model/StatusCoding.go
index d20eaf1e3d7..d1561d5787f 100644
--- a/plc4go/protocols/cbus/readwrite/model/StatusCoding.go
+++ b/plc4go/protocols/cbus/readwrite/model/StatusCoding.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func StatusCodingParse(readBuffer utils.ReadBuffer) (StatusCoding, error) {
 		return 0, errors.Wrap(err, "error reading StatusCoding")
 	}
 	if enum, ok := StatusCodingByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return StatusCoding(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryState.go b/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryState.go
index 8d6b6b66adc..e126e103460 100644
--- a/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryState.go
+++ b/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryState.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -149,7 +148,7 @@ func StatusRequestBinaryStateParse(readBuffer utils.ReadBuffer) (StatusRequestBi
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of StatusRequestBinaryState")
 		}
 		if reserved != byte(0x7A) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": byte(0x7A),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -179,7 +178,7 @@ func StatusRequestBinaryStateParse(readBuffer utils.ReadBuffer) (StatusRequestBi
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of StatusRequestBinaryState")
 		}
 		if reserved != byte(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": byte(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -215,7 +214,7 @@ func (m *_StatusRequestBinaryState) Serialize(writeBuffer utils.WriteBuffer) err
 		{
 			var reserved byte = byte(0x7A)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": byte(0x7A),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -243,7 +242,7 @@ func (m *_StatusRequestBinaryState) Serialize(writeBuffer utils.WriteBuffer) err
 		{
 			var reserved byte = byte(0x00)
 			if m.reservedField1 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": byte(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryStateDeprecated.go b/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryStateDeprecated.go
index d846c900c66..77c24956838 100644
--- a/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryStateDeprecated.go
+++ b/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryStateDeprecated.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -149,7 +148,7 @@ func StatusRequestBinaryStateDeprecatedParse(readBuffer utils.ReadBuffer) (Statu
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of StatusRequestBinaryStateDeprecated")
 		}
 		if reserved != byte(0xFA) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": byte(0xFA),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -179,7 +178,7 @@ func StatusRequestBinaryStateDeprecatedParse(readBuffer utils.ReadBuffer) (Statu
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of StatusRequestBinaryStateDeprecated")
 		}
 		if reserved != byte(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": byte(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -215,7 +214,7 @@ func (m *_StatusRequestBinaryStateDeprecated) Serialize(writeBuffer utils.WriteB
 		{
 			var reserved byte = byte(0xFA)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": byte(0xFA),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -243,7 +242,7 @@ func (m *_StatusRequestBinaryStateDeprecated) Serialize(writeBuffer utils.WriteB
 		{
 			var reserved byte = byte(0x00)
 			if m.reservedField1 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": byte(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/StatusRequestLevel.go b/plc4go/protocols/cbus/readwrite/model/StatusRequestLevel.go
index 7cef77c4d8c..0ace88f2da8 100644
--- a/plc4go/protocols/cbus/readwrite/model/StatusRequestLevel.go
+++ b/plc4go/protocols/cbus/readwrite/model/StatusRequestLevel.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -160,7 +159,7 @@ func StatusRequestLevelParse(readBuffer utils.ReadBuffer) (StatusRequestLevel, e
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of StatusRequestLevel")
 		}
 		if reserved != byte(0x73) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": byte(0x73),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -177,7 +176,7 @@ func StatusRequestLevelParse(readBuffer utils.ReadBuffer) (StatusRequestLevel, e
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of StatusRequestLevel")
 		}
 		if reserved != byte(0x07) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": byte(0x07),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -239,7 +238,7 @@ func (m *_StatusRequestLevel) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved byte = byte(0x73)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": byte(0x73),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -255,7 +254,7 @@ func (m *_StatusRequestLevel) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved byte = byte(0x07)
 			if m.reservedField1 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": byte(0x07),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyCommandType.go b/plc4go/protocols/cbus/readwrite/model/TelephonyCommandType.go
index 3c5afc6e2bf..7ebeb2f59bf 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyCommandType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -118,7 +117,7 @@ func TelephonyCommandTypeParse(readBuffer utils.ReadBuffer) (TelephonyCommandTyp
 		return 0, errors.Wrap(err, "error reading TelephonyCommandType")
 	}
 	if enum, ok := TelephonyCommandTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return TelephonyCommandType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/TelephonyCommandTypeContainer.go
index 99a0d2541c5..47328b9fd61 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyCommandTypeContainer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -589,7 +588,7 @@ func TelephonyCommandTypeContainerParse(readBuffer utils.ReadBuffer) (TelephonyC
 		return 0, errors.Wrap(err, "error reading TelephonyCommandTypeContainer")
 	}
 	if enum, ok := TelephonyCommandTypeContainerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return TelephonyCommandTypeContainer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyDataRinging.go b/plc4go/protocols/cbus/readwrite/model/TelephonyDataRinging.go
index 0d45a834472..7bf3f7fa8ab 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyDataRinging.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyDataRinging.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -146,7 +145,7 @@ func TelephonyDataRingingParse(readBuffer utils.ReadBuffer, commandTypeContainer
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of TelephonyDataRinging")
 		}
 		if reserved != byte(0x01) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": byte(0x01),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -188,7 +187,7 @@ func (m *_TelephonyDataRinging) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved byte = byte(0x01)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": byte(0x01),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandType.go b/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandType.go
index 98c9dc4a17f..27e76225160 100644
--- a/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -118,7 +117,7 @@ func TemperatureBroadcastCommandTypeParse(readBuffer utils.ReadBuffer) (Temperat
 		return 0, errors.Wrap(err, "error reading TemperatureBroadcastCommandType")
 	}
 	if enum, ok := TemperatureBroadcastCommandTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return TemperatureBroadcastCommandType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandTypeContainer.go
index 3c2bd5843ab..0597552499a 100644
--- a/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandTypeContainer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -351,7 +350,7 @@ func TemperatureBroadcastCommandTypeContainerParse(readBuffer utils.ReadBuffer)
 		return 0, errors.Wrap(err, "error reading TemperatureBroadcastCommandTypeContainer")
 	}
 	if enum, ok := TemperatureBroadcastCommandTypeContainerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return TemperatureBroadcastCommandTypeContainer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandType.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandType.go
index 786a674d325..5d850b97aae 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -158,7 +157,7 @@ func TriggerControlCommandTypeParse(readBuffer utils.ReadBuffer) (TriggerControl
 		return 0, errors.Wrap(err, "error reading TriggerControlCommandType")
 	}
 	if enum, ok := TriggerControlCommandTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return TriggerControlCommandType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandTypeContainer.go
index 324b68d08f6..a5a20f78678 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandTypeContainer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -841,7 +840,7 @@ func TriggerControlCommandTypeContainerParse(readBuffer utils.ReadBuffer) (Trigg
 		return 0, errors.Wrap(err, "error reading TriggerControlCommandTypeContainer")
 	}
 	if enum, ok := TriggerControlCommandTypeContainerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return TriggerControlCommandTypeContainer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelFlavour.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelFlavour.go
index db3c243984c..4c70fbbb1a8 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelFlavour.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelFlavour.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func TriggerControlLabelFlavourParse(readBuffer utils.ReadBuffer) (TriggerContro
 		return 0, errors.Wrap(err, "error reading TriggerControlLabelFlavour")
 	}
 	if enum, ok := TriggerControlLabelFlavourByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return TriggerControlLabelFlavour(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelOptions.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelOptions.go
index 8e06b0e7417..575696febd8 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelOptions.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelOptions.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -142,7 +141,7 @@ func TriggerControlLabelOptionsParse(readBuffer utils.ReadBuffer) (TriggerContro
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of TriggerControlLabelOptions")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -172,7 +171,7 @@ func TriggerControlLabelOptionsParse(readBuffer utils.ReadBuffer) (TriggerContro
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of TriggerControlLabelOptions")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -189,7 +188,7 @@ func TriggerControlLabelOptionsParse(readBuffer utils.ReadBuffer) (TriggerContro
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of TriggerControlLabelOptions")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -219,7 +218,7 @@ func TriggerControlLabelOptionsParse(readBuffer utils.ReadBuffer) (TriggerContro
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of TriggerControlLabelOptions")
 		}
 		if reserved != bool(false) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -254,7 +253,7 @@ func (m *_TriggerControlLabelOptions) Serialize(writeBuffer utils.WriteBuffer) e
 	{
 		var reserved bool = bool(false)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -282,7 +281,7 @@ func (m *_TriggerControlLabelOptions) Serialize(writeBuffer utils.WriteBuffer) e
 	{
 		var reserved bool = bool(false)
 		if m.reservedField1 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -298,7 +297,7 @@ func (m *_TriggerControlLabelOptions) Serialize(writeBuffer utils.WriteBuffer) e
 	{
 		var reserved bool = bool(false)
 		if m.reservedField2 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
@@ -326,7 +325,7 @@ func (m *_TriggerControlLabelOptions) Serialize(writeBuffer utils.WriteBuffer) e
 	{
 		var reserved bool = bool(false)
 		if m.reservedField3 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": bool(false),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelType.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelType.go
index 1576032f56c..c33daa75f76 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelType.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func TriggerControlLabelTypeParse(readBuffer utils.ReadBuffer) (TriggerControlLa
 		return 0, errors.Wrap(err, "error reading TriggerControlLabelType")
 	}
 	if enum, ok := TriggerControlLabelTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return TriggerControlLabelType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/UnitStatus.go b/plc4go/protocols/cbus/readwrite/model/UnitStatus.go
index 596472bd790..1e6ca0d00ce 100644
--- a/plc4go/protocols/cbus/readwrite/model/UnitStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/UnitStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func UnitStatusParse(readBuffer utils.ReadBuffer) (UnitStatus, error) {
 		return 0, errors.Wrap(err, "error reading UnitStatus")
 	}
 	if enum, ok := UnitStatusByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return UnitStatus(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/ZoneStatusTemp.go b/plc4go/protocols/cbus/readwrite/model/ZoneStatusTemp.go
index b538057b5a2..540174b10ee 100644
--- a/plc4go/protocols/cbus/readwrite/model/ZoneStatusTemp.go
+++ b/plc4go/protocols/cbus/readwrite/model/ZoneStatusTemp.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func ZoneStatusTempParse(readBuffer utils.ReadBuffer) (ZoneStatusTemp, error) {
 		return 0, errors.Wrap(err, "error reading ZoneStatusTemp")
 	}
 	if enum, ok := ZoneStatusTempByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ZoneStatusTemp(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/cbus/readwrite/model/plc4x_common.go b/plc4go/protocols/cbus/readwrite/model/plc4x_common.go
new file mode 100644
index 00000000000..4a586f90cfe
--- /dev/null
+++ b/plc4go/protocols/cbus/readwrite/model/plc4x_common.go
@@ -0,0 +1,27 @@
+/*
+* 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
+
+import "github.com/rs/zerolog/log"
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Plc4xModelLog is the Logger used by the Parse/Serialize methods
+var Plc4xModelLog = log.Logger
diff --git a/plc4go/protocols/df1/readwrite/model/plc4x_common.go b/plc4go/protocols/df1/readwrite/model/plc4x_common.go
new file mode 100644
index 00000000000..4a586f90cfe
--- /dev/null
+++ b/plc4go/protocols/df1/readwrite/model/plc4x_common.go
@@ -0,0 +1,27 @@
+/*
+* 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
+
+import "github.com/rs/zerolog/log"
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Plc4xModelLog is the Logger used by the Parse/Serialize methods
+var Plc4xModelLog = log.Logger
diff --git a/plc4go/protocols/eip/readwrite/model/CIPDataTypeCode.go b/plc4go/protocols/eip/readwrite/model/CIPDataTypeCode.go
index 1b214cb999d..e4613ba59f3 100644
--- a/plc4go/protocols/eip/readwrite/model/CIPDataTypeCode.go
+++ b/plc4go/protocols/eip/readwrite/model/CIPDataTypeCode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -192,7 +191,7 @@ func CIPDataTypeCodeParse(readBuffer utils.ReadBuffer) (CIPDataTypeCode, error)
 		return 0, errors.Wrap(err, "error reading CIPDataTypeCode")
 	}
 	if enum, ok := CIPDataTypeCodeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return CIPDataTypeCode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/eip/readwrite/model/CIPStructTypeCode.go b/plc4go/protocols/eip/readwrite/model/CIPStructTypeCode.go
index 51ece6aa079..e5696c87f6b 100644
--- a/plc4go/protocols/eip/readwrite/model/CIPStructTypeCode.go
+++ b/plc4go/protocols/eip/readwrite/model/CIPStructTypeCode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,7 +95,7 @@ func CIPStructTypeCodeParse(readBuffer utils.ReadBuffer) (CIPStructTypeCode, err
 		return 0, errors.Wrap(err, "error reading CIPStructTypeCode")
 	}
 	if enum, ok := CIPStructTypeCodeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return CIPStructTypeCode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/eip/readwrite/model/CipRRData.go b/plc4go/protocols/eip/readwrite/model/CipRRData.go
index ccfee674cf6..94650639972 100644
--- a/plc4go/protocols/eip/readwrite/model/CipRRData.go
+++ b/plc4go/protocols/eip/readwrite/model/CipRRData.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -159,7 +158,7 @@ func CipRRDataParse(readBuffer utils.ReadBuffer, packetLength uint16) (CipRRData
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CipRRData")
 		}
 		if reserved != uint32(0x00000000) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint32(0x00000000),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -176,7 +175,7 @@ func CipRRDataParse(readBuffer utils.ReadBuffer, packetLength uint16) (CipRRData
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CipRRData")
 		}
 		if reserved != uint16(0x0000) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint16(0x0000),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -225,7 +224,7 @@ func (m *_CipRRData) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved uint32 = uint32(0x00000000)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint32(0x00000000),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -241,7 +240,7 @@ func (m *_CipRRData) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved uint16 = uint16(0x0000)
 			if m.reservedField1 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint16(0x0000),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/eip/readwrite/model/CipReadResponse.go b/plc4go/protocols/eip/readwrite/model/CipReadResponse.go
index 3a2ca3f9eed..f75608e7769 100644
--- a/plc4go/protocols/eip/readwrite/model/CipReadResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipReadResponse.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -182,7 +181,7 @@ func CipReadResponseParse(readBuffer utils.ReadBuffer, serviceLen uint16) (CipRe
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CipReadResponse")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -255,7 +254,7 @@ func (m *_CipReadResponse) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go b/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go
index 21e61675890..2438a33898c 100644
--- a/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -212,7 +211,7 @@ func CipUnconnectedRequestParse(readBuffer utils.ReadBuffer, serviceLen uint16)
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CipUnconnectedRequest")
 		}
 		if reserved != uint8(0x02) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x02),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -229,7 +228,7 @@ func CipUnconnectedRequestParse(readBuffer utils.ReadBuffer, serviceLen uint16)
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CipUnconnectedRequest")
 		}
 		if reserved != uint8(0x20) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x20),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -246,7 +245,7 @@ func CipUnconnectedRequestParse(readBuffer utils.ReadBuffer, serviceLen uint16)
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CipUnconnectedRequest")
 		}
 		if reserved != uint8(0x06) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x06),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -263,7 +262,7 @@ func CipUnconnectedRequestParse(readBuffer utils.ReadBuffer, serviceLen uint16)
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CipUnconnectedRequest")
 		}
 		if reserved != uint8(0x24) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x24),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -280,7 +279,7 @@ func CipUnconnectedRequestParse(readBuffer utils.ReadBuffer, serviceLen uint16)
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CipUnconnectedRequest")
 		}
 		if reserved != uint8(0x01) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x01),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -297,7 +296,7 @@ func CipUnconnectedRequestParse(readBuffer utils.ReadBuffer, serviceLen uint16)
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CipUnconnectedRequest")
 		}
 		if reserved != uint16(0x9D05) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint16(0x9D05),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -384,7 +383,7 @@ func (m *_CipUnconnectedRequest) Serialize(writeBuffer utils.WriteBuffer) error
 		{
 			var reserved uint8 = uint8(0x02)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x02),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -400,7 +399,7 @@ func (m *_CipUnconnectedRequest) Serialize(writeBuffer utils.WriteBuffer) error
 		{
 			var reserved uint8 = uint8(0x20)
 			if m.reservedField1 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x20),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -416,7 +415,7 @@ func (m *_CipUnconnectedRequest) Serialize(writeBuffer utils.WriteBuffer) error
 		{
 			var reserved uint8 = uint8(0x06)
 			if m.reservedField2 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x06),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -432,7 +431,7 @@ func (m *_CipUnconnectedRequest) Serialize(writeBuffer utils.WriteBuffer) error
 		{
 			var reserved uint8 = uint8(0x24)
 			if m.reservedField3 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x24),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -448,7 +447,7 @@ func (m *_CipUnconnectedRequest) Serialize(writeBuffer utils.WriteBuffer) error
 		{
 			var reserved uint8 = uint8(0x01)
 			if m.reservedField4 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x01),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -464,7 +463,7 @@ func (m *_CipUnconnectedRequest) Serialize(writeBuffer utils.WriteBuffer) error
 		{
 			var reserved uint16 = uint16(0x9D05)
 			if m.reservedField5 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint16(0x9D05),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go b/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go
index 7d9f27aabad..268115fee68 100644
--- a/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -158,7 +157,7 @@ func CipWriteResponseParse(readBuffer utils.ReadBuffer, serviceLen uint16) (CipW
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of CipWriteResponse")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -210,7 +209,7 @@ func (m *_CipWriteResponse) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/eip/readwrite/model/EiPCommand.go b/plc4go/protocols/eip/readwrite/model/EiPCommand.go
index a7f3afabfb2..b64f19b4919 100644
--- a/plc4go/protocols/eip/readwrite/model/EiPCommand.go
+++ b/plc4go/protocols/eip/readwrite/model/EiPCommand.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func EiPCommandParse(readBuffer utils.ReadBuffer) (EiPCommand, error) {
 		return 0, errors.Wrap(err, "error reading EiPCommand")
 	}
 	if enum, ok := EiPCommandByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return EiPCommand(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go b/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go
index 6059db2cd53..632dbeea486 100644
--- a/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -195,7 +194,7 @@ func MultipleServiceResponseParse(readBuffer utils.ReadBuffer, serviceLen uint16
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of MultipleServiceResponse")
 		}
 		if reserved != uint8(0x0) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x0),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -286,7 +285,7 @@ func (m *_MultipleServiceResponse) Serialize(writeBuffer utils.WriteBuffer) erro
 		{
 			var reserved uint8 = uint8(0x0)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x0),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/eip/readwrite/model/plc4x_common.go b/plc4go/protocols/eip/readwrite/model/plc4x_common.go
new file mode 100644
index 00000000000..4a586f90cfe
--- /dev/null
+++ b/plc4go/protocols/eip/readwrite/model/plc4x_common.go
@@ -0,0 +1,27 @@
+/*
+* 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
+
+import "github.com/rs/zerolog/log"
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Plc4xModelLog is the Logger used by the Parse/Serialize methods
+var Plc4xModelLog = log.Logger
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go
index 4632d39570b..f2be5074f93 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -165,7 +164,7 @@ func FirmataCommandSetDigitalPinValueParse(readBuffer utils.ReadBuffer, response
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of FirmataCommandSetDigitalPinValue")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -217,7 +216,7 @@ func (m *_FirmataCommandSetDigitalPinValue) Serialize(writeBuffer utils.WriteBuf
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSysex.go b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSysex.go
index 1d57ffd80e1..eb80f7deecd 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSysex.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSysex.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -160,7 +159,7 @@ func FirmataCommandSysexParse(readBuffer utils.ReadBuffer, response bool) (Firma
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of FirmataCommandSysex")
 		}
 		if reserved != uint8(0xF7) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0xF7),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -209,7 +208,7 @@ func (m *_FirmataCommandSysex) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved uint8 = uint8(0xF7)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0xF7),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go b/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go
index e880950e763..51c63da7a3d 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -165,7 +164,7 @@ func FirmataMessageSubscribeAnalogPinValueParse(readBuffer utils.ReadBuffer, res
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of FirmataMessageSubscribeAnalogPinValue")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -217,7 +216,7 @@ func (m *_FirmataMessageSubscribeAnalogPinValue) Serialize(writeBuffer utils.Wri
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go b/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go
index aebed78c9a6..a9e7aed51fd 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -165,7 +164,7 @@ func FirmataMessageSubscribeDigitalPinValueParse(readBuffer utils.ReadBuffer, re
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of FirmataMessageSubscribeDigitalPinValue")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -217,7 +216,7 @@ func (m *_FirmataMessageSubscribeDigitalPinValue) Serialize(writeBuffer utils.Wr
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/firmata/readwrite/model/PinMode.go b/plc4go/protocols/firmata/readwrite/model/PinMode.go
index 6e80ff00d51..2d8d53c7fd3 100644
--- a/plc4go/protocols/firmata/readwrite/model/PinMode.go
+++ b/plc4go/protocols/firmata/readwrite/model/PinMode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -162,7 +161,7 @@ func PinModeParse(readBuffer utils.ReadBuffer) (PinMode, error) {
 		return 0, errors.Wrap(err, "error reading PinMode")
 	}
 	if enum, ok := PinModeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return PinMode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/firmata/readwrite/model/plc4x_common.go b/plc4go/protocols/firmata/readwrite/model/plc4x_common.go
new file mode 100644
index 00000000000..4a586f90cfe
--- /dev/null
+++ b/plc4go/protocols/firmata/readwrite/model/plc4x_common.go
@@ -0,0 +1,27 @@
+/*
+* 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
+
+import "github.com/rs/zerolog/log"
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Plc4xModelLog is the Logger used by the Parse/Serialize methods
+var Plc4xModelLog = log.Logger
diff --git a/plc4go/protocols/knxnetip/readwrite/model/AccessLevel.go b/plc4go/protocols/knxnetip/readwrite/model/AccessLevel.go
index 511204810b1..4c1b7fcaa3f 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/AccessLevel.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/AccessLevel.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -197,7 +196,7 @@ func AccessLevelParse(readBuffer utils.ReadBuffer) (AccessLevel, error) {
 		return 0, errors.Wrap(err, "error reading AccessLevel")
 	}
 	if enum, ok := AccessLevelByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return AccessLevel(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go
index 1bcdbfce023..ce76a8bb063 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -256,7 +255,7 @@ func ApduDataExtPropertyDescriptionResponseParse(readBuffer utils.ReadBuffer, le
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of ApduDataExtPropertyDescriptionResponse")
 		}
 		if reserved != uint8(0x0) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x0),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -286,7 +285,7 @@ func ApduDataExtPropertyDescriptionResponseParse(readBuffer utils.ReadBuffer, le
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of ApduDataExtPropertyDescriptionResponse")
 		}
 		if reserved != uint8(0x0) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x0),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -392,7 +391,7 @@ func (m *_ApduDataExtPropertyDescriptionResponse) Serialize(writeBuffer utils.Wr
 		{
 			var reserved uint8 = uint8(0x0)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x0),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -420,7 +419,7 @@ func (m *_ApduDataExtPropertyDescriptionResponse) Serialize(writeBuffer utils.Wr
 		{
 			var reserved uint8 = uint8(0x0)
 			if m.reservedField1 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x0),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueRead.go
index 321ad494dd6..c7258ab08f1 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueRead.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -126,7 +125,7 @@ func ApduDataGroupValueReadParse(readBuffer utils.ReadBuffer, dataLength uint8)
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of ApduDataGroupValueRead")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -162,7 +161,7 @@ func (m *_ApduDataGroupValueRead) Serialize(writeBuffer utils.WriteBuffer) error
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/knxnetip/readwrite/model/CEMIPriority.go b/plc4go/protocols/knxnetip/readwrite/model/CEMIPriority.go
index b448b0bf0f4..9a9333181ba 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/CEMIPriority.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/CEMIPriority.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func CEMIPriorityParse(readBuffer utils.ReadBuffer) (CEMIPriority, error) {
 		return 0, errors.Wrap(err, "error reading CEMIPriority")
 	}
 	if enum, ok := CEMIPriorityByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return CEMIPriority(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableAddresses.go b/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableAddresses.go
index 8c78a51c163..ea235fc84e7 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableAddresses.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableAddresses.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -18868,7 +18867,7 @@ func ComObjectTableAddressesParse(readBuffer utils.ReadBuffer) (ComObjectTableAd
 		return 0, errors.Wrap(err, "error reading ComObjectTableAddresses")
 	}
 	if enum, ok := ComObjectTableAddressesByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ComObjectTableAddresses(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ComObjectValueType.go b/plc4go/protocols/knxnetip/readwrite/model/ComObjectValueType.go
index da8a1ffb154..c0607f3f140 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ComObjectValueType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ComObjectValueType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -258,7 +257,7 @@ func ComObjectValueTypeParse(readBuffer utils.ReadBuffer) (ComObjectValueType, e
 		return 0, errors.Wrap(err, "error reading ComObjectValueType")
 	}
 	if enum, ok := ComObjectValueTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ComObjectValueType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go b/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go
index d57c8014992..3222970738d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -161,7 +160,7 @@ func ConnectionRequestInformationTunnelConnectionParse(readBuffer utils.ReadBuff
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of ConnectionRequestInformationTunnelConnection")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -208,7 +207,7 @@ func (m *_ConnectionRequestInformationTunnelConnection) Serialize(writeBuffer ut
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponse.go
index 67eb51a58c7..79fb8d1a2a2 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponse.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -202,7 +201,7 @@ func ConnectionResponseParse(readBuffer utils.ReadBuffer) (ConnectionResponse, e
 		_val, _err := HPAIDataEndpointParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'hpaiDataEndpoint' field of ConnectionResponse")
@@ -224,7 +223,7 @@ func ConnectionResponseParse(readBuffer utils.ReadBuffer) (ConnectionResponse, e
 		_val, _err := ConnectionResponseDataBlockParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'connectionResponseDataBlock' field of ConnectionResponse")
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ConnectionStateRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ConnectionStateRequest.go
index 3f03c7b7c06..f94e31a3dad 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ConnectionStateRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ConnectionStateRequest.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -165,7 +164,7 @@ func ConnectionStateRequestParse(readBuffer utils.ReadBuffer) (ConnectionStateRe
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of ConnectionStateRequest")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -221,7 +220,7 @@ func (m *_ConnectionStateRequest) Serialize(writeBuffer utils.WriteBuffer) error
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go
index 6a0c729cf28..05328069a11 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -154,7 +153,7 @@ func DeviceConfigurationRequestDataBlockParse(readBuffer utils.ReadBuffer) (Devi
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of DeviceConfigurationRequestDataBlock")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -207,7 +206,7 @@ func (m *_DeviceConfigurationRequestDataBlock) Serialize(writeBuffer utils.Write
 	{
 		var reserved uint8 = uint8(0x00)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptor.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptor.go
index 5d77d08b0d2..a902a592dc5 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptor.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptor.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -533,7 +532,7 @@ func DeviceDescriptorParse(readBuffer utils.ReadBuffer) (DeviceDescriptor, error
 		return 0, errors.Wrap(err, "error reading DeviceDescriptor")
 	}
 	if enum, ok := DeviceDescriptorByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return DeviceDescriptor(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorMediumType.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorMediumType.go
index 660bbc635c9..b32076bee01 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorMediumType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorMediumType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -126,7 +125,7 @@ func DeviceDescriptorMediumTypeParse(readBuffer utils.ReadBuffer) (DeviceDescrip
 		return 0, errors.Wrap(err, "error reading DeviceDescriptorMediumType")
 	}
 	if enum, ok := DeviceDescriptorMediumTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return DeviceDescriptorMediumType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceStatus.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceStatus.go
index 8f310b2d17b..827f7cf7f3d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceStatus.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceStatus.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -120,7 +119,7 @@ func DeviceStatusParse(readBuffer utils.ReadBuffer) (DeviceStatus, error) {
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of DeviceStatus")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -158,7 +157,7 @@ func (m *_DeviceStatus) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved uint8 = uint8(0x00)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DisconnectRequest.go b/plc4go/protocols/knxnetip/readwrite/model/DisconnectRequest.go
index b94a9da187a..acc2f9489a2 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DisconnectRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DisconnectRequest.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -165,7 +164,7 @@ func DisconnectRequestParse(readBuffer utils.ReadBuffer) (DisconnectRequest, err
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of DisconnectRequest")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -221,7 +220,7 @@ func (m *_DisconnectRequest) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/knxnetip/readwrite/model/FirmwareType.go b/plc4go/protocols/knxnetip/readwrite/model/FirmwareType.go
index 89761ccde3e..c7e534927c8 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/FirmwareType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/FirmwareType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -186,7 +185,7 @@ func FirmwareTypeParse(readBuffer utils.ReadBuffer) (FirmwareType, error) {
 		return 0, errors.Wrap(err, "error reading FirmwareType")
 	}
 	if enum, ok := FirmwareTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return FirmwareType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go
index 03dd329c2ca..697c0a49d5e 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -197,7 +196,7 @@ func GroupObjectDescriptorRealisationType1Parse(readBuffer utils.ReadBuffer) (Gr
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of GroupObjectDescriptorRealisationType1")
 		}
 		if reserved != uint8(0x1) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x1),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -303,7 +302,7 @@ func (m *_GroupObjectDescriptorRealisationType1) Serialize(writeBuffer utils.Wri
 	{
 		var reserved uint8 = uint8(0x1)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x1),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/knxnetip/readwrite/model/HostProtocolCode.go b/plc4go/protocols/knxnetip/readwrite/model/HostProtocolCode.go
index 6a45dc5a2f3..81b2fca8f2d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/HostProtocolCode.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/HostProtocolCode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -102,7 +101,7 @@ func HostProtocolCodeParse(readBuffer utils.ReadBuffer) (HostProtocolCode, error
 		return 0, errors.Wrap(err, "error reading HostProtocolCode")
 	}
 	if enum, ok := HostProtocolCodeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return HostProtocolCode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointMainType.go b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointMainType.go
index a0465bcef13..920eab04888 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointMainType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointMainType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -1244,7 +1243,7 @@ func KnxDatapointMainTypeParse(readBuffer utils.ReadBuffer) (KnxDatapointMainTyp
 		return 0, errors.Wrap(err, "error reading KnxDatapointMainType")
 	}
 	if enum, ok := KnxDatapointMainTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return KnxDatapointMainType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go
index d8647f98361..c3790407702 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -6428,7 +6427,7 @@ func KnxDatapointTypeParse(readBuffer utils.ReadBuffer) (KnxDatapointType, error
 		return 0, errors.Wrap(err, "error reading KnxDatapointType")
 	}
 	if enum, ok := KnxDatapointTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return KnxDatapointType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go b/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go
index c296a9f9c3a..a387dbf9454 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -4917,7 +4916,7 @@ func KnxInterfaceObjectPropertyParse(readBuffer utils.ReadBuffer) (KnxInterfaceO
 		return 0, errors.Wrap(err, "error reading KnxInterfaceObjectProperty")
 	}
 	if enum, ok := KnxInterfaceObjectPropertyByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return KnxInterfaceObjectProperty(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectType.go b/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectType.go
index be5e18fbf18..3e5b0f46248 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -477,7 +476,7 @@ func KnxInterfaceObjectTypeParse(readBuffer utils.ReadBuffer) (KnxInterfaceObjec
 		return 0, errors.Wrap(err, "error reading KnxInterfaceObjectType")
 	}
 	if enum, ok := KnxInterfaceObjectTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return KnxInterfaceObjectType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxLayer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxLayer.go
index 3a5e6486365..9ad37f70bf9 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxLayer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxLayer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func KnxLayerParse(readBuffer utils.ReadBuffer) (KnxLayer, error) {
 		return 0, errors.Wrap(err, "error reading KnxLayer")
 	}
 	if enum, ok := KnxLayerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return KnxLayer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index 4cbb6c9da3e..bdd105ba1eb 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -8527,7 +8526,7 @@ func KnxManufacturerParse(readBuffer utils.ReadBuffer) (KnxManufacturer, error)
 		return 0, errors.Wrap(err, "error reading KnxManufacturer")
 	}
 	if enum, ok := KnxManufacturerByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return KnxManufacturer(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxMedium.go b/plc4go/protocols/knxnetip/readwrite/model/KnxMedium.go
index 4a88a0e584f..108a6df01aa 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxMedium.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxMedium.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -126,7 +125,7 @@ func KnxMediumParse(readBuffer utils.ReadBuffer) (KnxMedium, error) {
 		return 0, errors.Wrap(err, "error reading KnxMedium")
 	}
 	if enum, ok := KnxMediumByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return KnxMedium(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxPropertyDataType.go b/plc4go/protocols/knxnetip/readwrite/model/KnxPropertyDataType.go
index 3854b31f533..cfb8b462a7d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxPropertyDataType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxPropertyDataType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -1046,7 +1045,7 @@ func KnxPropertyDataTypeParse(readBuffer utils.ReadBuffer) (KnxPropertyDataType,
 		return 0, errors.Wrap(err, "error reading KnxPropertyDataType")
 	}
 	if enum, ok := KnxPropertyDataTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return KnxPropertyDataType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LPollData.go b/plc4go/protocols/knxnetip/readwrite/model/LPollData.go
index 6688f6ebb7b..6395c9c036f 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LPollData.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LPollData.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -200,7 +199,7 @@ func LPollDataParse(readBuffer utils.ReadBuffer) (LPollData, error) {
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of LPollData")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -262,7 +261,7 @@ func (m *_LPollData) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/knxnetip/readwrite/model/Status.go b/plc4go/protocols/knxnetip/readwrite/model/Status.go
index 6f72c33bec0..d697a50bd4c 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/Status.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/Status.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -162,7 +161,7 @@ func StatusParse(readBuffer utils.ReadBuffer) (Status, error) {
 		return 0, errors.Wrap(err, "error reading Status")
 	}
 	if enum, ok := StatusByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return Status(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/SupportedPhysicalMedia.go b/plc4go/protocols/knxnetip/readwrite/model/SupportedPhysicalMedia.go
index 07b8addbf97..030c85d1b70 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/SupportedPhysicalMedia.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/SupportedPhysicalMedia.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -421,7 +420,7 @@ func SupportedPhysicalMediaParse(readBuffer utils.ReadBuffer) (SupportedPhysical
 		return 0, errors.Wrap(err, "error reading SupportedPhysicalMedia")
 	}
 	if enum, ok := SupportedPhysicalMediaByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return SupportedPhysicalMedia(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequestDataBlock.go b/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequestDataBlock.go
index f2a26eba900..1ea9eef906d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequestDataBlock.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequestDataBlock.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -154,7 +153,7 @@ func TunnelingRequestDataBlockParse(readBuffer utils.ReadBuffer) (TunnelingReque
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of TunnelingRequestDataBlock")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -207,7 +206,7 @@ func (m *_TunnelingRequestDataBlock) Serialize(writeBuffer utils.WriteBuffer) er
 	{
 		var reserved uint8 = uint8(0x00)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/knxnetip/readwrite/model/plc4x_common.go b/plc4go/protocols/knxnetip/readwrite/model/plc4x_common.go
new file mode 100644
index 00000000000..4a586f90cfe
--- /dev/null
+++ b/plc4go/protocols/knxnetip/readwrite/model/plc4x_common.go
@@ -0,0 +1,27 @@
+/*
+* 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
+
+import "github.com/rs/zerolog/log"
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Plc4xModelLog is the Logger used by the Parse/Serialize methods
+var Plc4xModelLog = log.Logger
diff --git a/plc4go/protocols/modbus/readwrite/model/DriverType.go b/plc4go/protocols/modbus/readwrite/model/DriverType.go
index 5507947509d..1e285787323 100644
--- a/plc4go/protocols/modbus/readwrite/model/DriverType.go
+++ b/plc4go/protocols/modbus/readwrite/model/DriverType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func DriverTypeParse(readBuffer utils.ReadBuffer) (DriverType, error) {
 		return 0, errors.Wrap(err, "error reading DriverType")
 	}
 	if enum, ok := DriverTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return DriverType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusDataType.go b/plc4go/protocols/modbus/readwrite/model/ModbusDataType.go
index 165f2e5c245..589b5cce9f2 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusDataType.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusDataType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -378,7 +377,7 @@ func ModbusDataTypeParse(readBuffer utils.ReadBuffer) (ModbusDataType, error) {
 		return 0, errors.Wrap(err, "error reading ModbusDataType")
 	}
 	if enum, ok := ModbusDataTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ModbusDataType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationConformityLevel.go b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationConformityLevel.go
index 746bd1c659c..3d03b9d82bf 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationConformityLevel.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationConformityLevel.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func ModbusDeviceInformationConformityLevelParse(readBuffer utils.ReadBuffer) (M
 		return 0, errors.Wrap(err, "error reading ModbusDeviceInformationConformityLevel")
 	}
 	if enum, ok := ModbusDeviceInformationConformityLevelByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ModbusDeviceInformationConformityLevel(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationLevel.go b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationLevel.go
index 912c02b793f..700fb640605 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationLevel.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationLevel.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func ModbusDeviceInformationLevelParse(readBuffer utils.ReadBuffer) (ModbusDevic
 		return 0, errors.Wrap(err, "error reading ModbusDeviceInformationLevel")
 	}
 	if enum, ok := ModbusDeviceInformationLevelByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ModbusDeviceInformationLevel(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationMoreFollows.go b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationMoreFollows.go
index e357095ac96..23e31041b5b 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationMoreFollows.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationMoreFollows.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -102,7 +101,7 @@ func ModbusDeviceInformationMoreFollowsParse(readBuffer utils.ReadBuffer) (Modbu
 		return 0, errors.Wrap(err, "error reading ModbusDeviceInformationMoreFollows")
 	}
 	if enum, ok := ModbusDeviceInformationMoreFollowsByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ModbusDeviceInformationMoreFollows(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusErrorCode.go b/plc4go/protocols/modbus/readwrite/model/ModbusErrorCode.go
index ec42773bacf..2f7e793cbfa 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusErrorCode.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusErrorCode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -150,7 +149,7 @@ func ModbusErrorCodeParse(readBuffer utils.ReadBuffer) (ModbusErrorCode, error)
 		return 0, errors.Wrap(err, "error reading ModbusErrorCode")
 	}
 	if enum, ok := ModbusErrorCodeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ModbusErrorCode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/modbus/readwrite/model/plc4x_common.go b/plc4go/protocols/modbus/readwrite/model/plc4x_common.go
new file mode 100644
index 00000000000..4a586f90cfe
--- /dev/null
+++ b/plc4go/protocols/modbus/readwrite/model/plc4x_common.go
@@ -0,0 +1,27 @@
+/*
+* 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
+
+import "github.com/rs/zerolog/log"
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Plc4xModelLog is the Logger used by the Parse/Serialize methods
+var Plc4xModelLog = log.Logger
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectQueryType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectQueryType.go
index 56642376781..e12d3deb0e7 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectQueryType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectQueryType.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -217,7 +216,7 @@ func AlarmMessageObjectQueryTypeParse(readBuffer utils.ReadBuffer) (AlarmMessage
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of AlarmMessageObjectQueryType")
 		}
 		if reserved != uint16(0x0000) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint16(0x0000),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -362,7 +361,7 @@ func (m *_AlarmMessageObjectQueryType) Serialize(writeBuffer utils.WriteBuffer)
 	{
 		var reserved uint16 = uint16(0x0000)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint16(0x0000),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmStateType.go b/plc4go/protocols/s7/readwrite/model/AlarmStateType.go
index 82354867e39..6162c737f44 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmStateType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmStateType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -126,7 +125,7 @@ func AlarmStateTypeParse(readBuffer utils.ReadBuffer) (AlarmStateType, error) {
 		return 0, errors.Wrap(err, "error reading AlarmStateType")
 	}
 	if enum, ok := AlarmStateTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return AlarmStateType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmType.go b/plc4go/protocols/s7/readwrite/model/AlarmType.go
index 6e35c9b46c8..84343ad63bd 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func AlarmTypeParse(readBuffer utils.ReadBuffer) (AlarmType, error) {
 		return 0, errors.Wrap(err, "error reading AlarmType")
 	}
 	if enum, ok := AlarmTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return AlarmType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/COTPPacket.go b/plc4go/protocols/s7/readwrite/model/COTPPacket.go
index 9e08df261b9..b1921a91aa4 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPPacket.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPPacket.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -232,7 +231,7 @@ func COTPPacketParse(readBuffer utils.ReadBuffer, cotpLen uint16) (COTPPacket, e
 		_val, _err := S7MessageParse(readBuffer)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'payload' field of COTPPacket")
diff --git a/plc4go/protocols/s7/readwrite/model/COTPProtocolClass.go b/plc4go/protocols/s7/readwrite/model/COTPProtocolClass.go
index b2ebbcd19d7..a91f1d4b0fb 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPProtocolClass.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPProtocolClass.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -120,7 +119,7 @@ func COTPProtocolClassParse(readBuffer utils.ReadBuffer) (COTPProtocolClass, err
 		return 0, errors.Wrap(err, "error reading COTPProtocolClass")
 	}
 	if enum, ok := COTPProtocolClassByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return COTPProtocolClass(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/COTPTpduSize.go b/plc4go/protocols/s7/readwrite/model/COTPTpduSize.go
index 91ce810cc72..125d5d17901 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPTpduSize.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPTpduSize.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -178,7 +177,7 @@ func COTPTpduSizeParse(readBuffer utils.ReadBuffer) (COTPTpduSize, error) {
 		return 0, errors.Wrap(err, "error reading COTPTpduSize")
 	}
 	if enum, ok := COTPTpduSizeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return COTPTpduSize(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/CpuSubscribeEvents.go b/plc4go/protocols/s7/readwrite/model/CpuSubscribeEvents.go
index 35f582880b2..fa6a631964f 100644
--- a/plc4go/protocols/s7/readwrite/model/CpuSubscribeEvents.go
+++ b/plc4go/protocols/s7/readwrite/model/CpuSubscribeEvents.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func CpuSubscribeEventsParse(readBuffer utils.ReadBuffer) (CpuSubscribeEvents, e
 		return 0, errors.Wrap(err, "error reading CpuSubscribeEvents")
 	}
 	if enum, ok := CpuSubscribeEventsByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return CpuSubscribeEvents(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/DataTransportErrorCode.go b/plc4go/protocols/s7/readwrite/model/DataTransportErrorCode.go
index fc59a7bf8ab..fbd5f1224a3 100644
--- a/plc4go/protocols/s7/readwrite/model/DataTransportErrorCode.go
+++ b/plc4go/protocols/s7/readwrite/model/DataTransportErrorCode.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -126,7 +125,7 @@ func DataTransportErrorCodeParse(readBuffer utils.ReadBuffer) (DataTransportErro
 		return 0, errors.Wrap(err, "error reading DataTransportErrorCode")
 	}
 	if enum, ok := DataTransportErrorCodeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return DataTransportErrorCode(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/DataTransportSize.go b/plc4go/protocols/s7/readwrite/model/DataTransportSize.go
index 6bea783f4f0..4c1992bf930 100644
--- a/plc4go/protocols/s7/readwrite/model/DataTransportSize.go
+++ b/plc4go/protocols/s7/readwrite/model/DataTransportSize.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -178,7 +177,7 @@ func DataTransportSizeParse(readBuffer utils.ReadBuffer) (DataTransportSize, err
 		return 0, errors.Wrap(err, "error reading DataTransportSize")
 	}
 	if enum, ok := DataTransportSizeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return DataTransportSize(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/DeviceGroup.go b/plc4go/protocols/s7/readwrite/model/DeviceGroup.go
index a373fdb55e8..b48cbcd4788 100644
--- a/plc4go/protocols/s7/readwrite/model/DeviceGroup.go
+++ b/plc4go/protocols/s7/readwrite/model/DeviceGroup.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func DeviceGroupParse(readBuffer utils.ReadBuffer) (DeviceGroup, error) {
 		return 0, errors.Wrap(err, "error reading DeviceGroup")
 	}
 	if enum, ok := DeviceGroupByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return DeviceGroup(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/EventType.go b/plc4go/protocols/s7/readwrite/model/EventType.go
index c38c3500e13..c9c881f09b5 100644
--- a/plc4go/protocols/s7/readwrite/model/EventType.go
+++ b/plc4go/protocols/s7/readwrite/model/EventType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func EventTypeParse(readBuffer utils.ReadBuffer) (EventType, error) {
 		return 0, errors.Wrap(err, "error reading EventType")
 	}
 	if enum, ok := EventTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return EventType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/MemoryArea.go b/plc4go/protocols/s7/readwrite/model/MemoryArea.go
index 2bff87b12de..7588008fe40 100644
--- a/plc4go/protocols/s7/readwrite/model/MemoryArea.go
+++ b/plc4go/protocols/s7/readwrite/model/MemoryArea.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -198,7 +197,7 @@ func MemoryAreaParse(readBuffer utils.ReadBuffer) (MemoryArea, error) {
 		return 0, errors.Wrap(err, "error reading MemoryArea")
 	}
 	if enum, ok := MemoryAreaByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return MemoryArea(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/ModeTransitionType.go b/plc4go/protocols/s7/readwrite/model/ModeTransitionType.go
index c17038d525f..ad7c97c4cb8 100644
--- a/plc4go/protocols/s7/readwrite/model/ModeTransitionType.go
+++ b/plc4go/protocols/s7/readwrite/model/ModeTransitionType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -144,7 +143,7 @@ func ModeTransitionTypeParse(readBuffer utils.ReadBuffer) (ModeTransitionType, e
 		return 0, errors.Wrap(err, "error reading ModeTransitionType")
 	}
 	if enum, ok := ModeTransitionTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return ModeTransitionType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/QueryType.go b/plc4go/protocols/s7/readwrite/model/QueryType.go
index d7f12f5d039..50a88daf7db 100644
--- a/plc4go/protocols/s7/readwrite/model/QueryType.go
+++ b/plc4go/protocols/s7/readwrite/model/QueryType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -108,7 +107,7 @@ func QueryTypeParse(readBuffer utils.ReadBuffer) (QueryType, error) {
 		return 0, errors.Wrap(err, "error reading QueryType")
 	}
 	if enum, ok := QueryTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return QueryType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/S7AddressAny.go b/plc4go/protocols/s7/readwrite/model/S7AddressAny.go
index e30a0d8eec9..912843d3dee 100644
--- a/plc4go/protocols/s7/readwrite/model/S7AddressAny.go
+++ b/plc4go/protocols/s7/readwrite/model/S7AddressAny.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -245,7 +244,7 @@ func S7AddressAnyParse(readBuffer utils.ReadBuffer) (S7AddressAny, error) {
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of S7AddressAny")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -337,7 +336,7 @@ func (m *_S7AddressAny) Serialize(writeBuffer utils.WriteBuffer) error {
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/s7/readwrite/model/S7Message.go b/plc4go/protocols/s7/readwrite/model/S7Message.go
index 0ec5c1630e6..9958c2c2187 100644
--- a/plc4go/protocols/s7/readwrite/model/S7Message.go
+++ b/plc4go/protocols/s7/readwrite/model/S7Message.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 	"io"
 )
 
@@ -208,7 +207,7 @@ func S7MessageParse(readBuffer utils.ReadBuffer) (S7Message, error) {
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of S7Message")
 		}
 		if reserved != uint16(0x0000) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint16(0x0000),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -274,7 +273,7 @@ func S7MessageParse(readBuffer utils.ReadBuffer) (S7Message, error) {
 		_val, _err := S7ParameterParse(readBuffer, messageType)
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'parameter' field of S7Message")
@@ -296,7 +295,7 @@ func S7MessageParse(readBuffer utils.ReadBuffer) (S7Message, error) {
 		_val, _err := S7PayloadParse(readBuffer, messageType, (parameter))
 		switch {
 		case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
-			log.Debug().Err(_err).Msg("Resetting position because optional threw an error")
+			Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
 			readBuffer.Reset(currentPos)
 		case _err != nil:
 			return nil, errors.Wrap(_err, "Error parsing 'payload' field of S7Message")
@@ -346,7 +345,7 @@ func (pm *_S7Message) SerializeParent(writeBuffer utils.WriteBuffer, child S7Mes
 	{
 		var reserved uint16 = uint16(0x0000)
 		if pm.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint16(0x0000),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/s7/readwrite/model/S7MessageObjectRequest.go b/plc4go/protocols/s7/readwrite/model/S7MessageObjectRequest.go
index cdb735bd532..c5246849236 100644
--- a/plc4go/protocols/s7/readwrite/model/S7MessageObjectRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7MessageObjectRequest.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -232,7 +231,7 @@ func S7MessageObjectRequestParse(readBuffer utils.ReadBuffer, cpuFunctionType ui
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of S7MessageObjectRequest")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -262,7 +261,7 @@ func S7MessageObjectRequestParse(readBuffer utils.ReadBuffer, cpuFunctionType ui
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of S7MessageObjectRequest")
 		}
 		if reserved != uint8(0x34) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x34),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -337,7 +336,7 @@ func (m *_S7MessageObjectRequest) Serialize(writeBuffer utils.WriteBuffer) error
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -365,7 +364,7 @@ func (m *_S7MessageObjectRequest) Serialize(writeBuffer utils.WriteBuffer) error
 		{
 			var reserved uint8 = uint8(0x34)
 			if m.reservedField1 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x34),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/s7/readwrite/model/S7MessageObjectResponse.go b/plc4go/protocols/s7/readwrite/model/S7MessageObjectResponse.go
index ccf3916d271..7a5fee0b995 100644
--- a/plc4go/protocols/s7/readwrite/model/S7MessageObjectResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7MessageObjectResponse.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -184,7 +183,7 @@ func S7MessageObjectResponseParse(readBuffer utils.ReadBuffer, cpuFunctionType u
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of S7MessageObjectResponse")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -244,7 +243,7 @@ func (m *_S7MessageObjectResponse) Serialize(writeBuffer utils.WriteBuffer) erro
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/s7/readwrite/model/S7ParameterModeTransition.go b/plc4go/protocols/s7/readwrite/model/S7ParameterModeTransition.go
index 9c8f27a5b42..e1ff1a994cb 100644
--- a/plc4go/protocols/s7/readwrite/model/S7ParameterModeTransition.go
+++ b/plc4go/protocols/s7/readwrite/model/S7ParameterModeTransition.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -198,7 +197,7 @@ func S7ParameterModeTransitionParse(readBuffer utils.ReadBuffer, messageType uin
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of S7ParameterModeTransition")
 		}
 		if reserved != uint16(0x0010) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint16(0x0010),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -279,7 +278,7 @@ func (m *_S7ParameterModeTransition) Serialize(writeBuffer utils.WriteBuffer) er
 		{
 			var reserved uint16 = uint16(0x0010)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint16(0x0010),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/s7/readwrite/model/S7ParameterSetupCommunication.go b/plc4go/protocols/s7/readwrite/model/S7ParameterSetupCommunication.go
index ac630cb3374..d4fd2137880 100644
--- a/plc4go/protocols/s7/readwrite/model/S7ParameterSetupCommunication.go
+++ b/plc4go/protocols/s7/readwrite/model/S7ParameterSetupCommunication.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -173,7 +172,7 @@ func S7ParameterSetupCommunicationParse(readBuffer utils.ReadBuffer, messageType
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of S7ParameterSetupCommunication")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -231,7 +230,7 @@ func (m *_S7ParameterSetupCommunication) Serialize(writeBuffer utils.WriteBuffer
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQuery.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQuery.go
index f64b364d762..ac0ab3761f7 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQuery.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQuery.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -277,7 +276,7 @@ func S7PayloadUserDataItemCpuFunctionAlarmQueryParse(readBuffer utils.ReadBuffer
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of S7PayloadUserDataItemCpuFunctionAlarmQuery")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -307,7 +306,7 @@ func S7PayloadUserDataItemCpuFunctionAlarmQueryParse(readBuffer utils.ReadBuffer
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of S7PayloadUserDataItemCpuFunctionAlarmQuery")
 		}
 		if reserved != uint8(0x34) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x34),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -394,7 +393,7 @@ func (m *_S7PayloadUserDataItemCpuFunctionAlarmQuery) Serialize(writeBuffer util
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
@@ -422,7 +421,7 @@ func (m *_S7PayloadUserDataItemCpuFunctionAlarmQuery) Serialize(writeBuffer util
 		{
 			var reserved uint8 = uint8(0x34)
 			if m.reservedField1 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x34),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go
index 1657765e43f..c9095ae9b68 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -241,7 +240,7 @@ func S7PayloadUserDataItemCpuFunctionAlarmQueryResponseParse(readBuffer utils.Re
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of S7PayloadUserDataItemCpuFunctionAlarmQueryResponse")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -313,7 +312,7 @@ func (m *_S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) Serialize(writeBuf
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go
index 108e32a7f03..4083fcfeb6d 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -202,7 +201,7 @@ func S7PayloadUserDataItemCpuFunctionMsgSubscriptionParse(readBuffer utils.ReadB
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of S7PayloadUserDataItemCpuFunctionMsgSubscription")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -280,7 +279,7 @@ func (m *_S7PayloadUserDataItemCpuFunctionMsgSubscription) Serialize(writeBuffer
 		{
 			var reserved uint8 = uint8(0x00)
 			if m.reservedField0 != nil {
-				log.Info().Fields(map[string]interface{}{
+				Plc4xModelLog.Info().Fields(map[string]interface{}{
 					"expected value": uint8(0x00),
 					"got value":      reserved,
 				}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/s7/readwrite/model/SyntaxIdType.go b/plc4go/protocols/s7/readwrite/model/SyntaxIdType.go
index f622466494e..2220aca2eb1 100644
--- a/plc4go/protocols/s7/readwrite/model/SyntaxIdType.go
+++ b/plc4go/protocols/s7/readwrite/model/SyntaxIdType.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -168,7 +167,7 @@ func SyntaxIdTypeParse(readBuffer utils.ReadBuffer) (SyntaxIdType, error) {
 		return 0, errors.Wrap(err, "error reading SyntaxIdType")
 	}
 	if enum, ok := SyntaxIdTypeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return SyntaxIdType(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/SzlModuleTypeClass.go b/plc4go/protocols/s7/readwrite/model/SzlModuleTypeClass.go
index 556a83ad44c..90520566f96 100644
--- a/plc4go/protocols/s7/readwrite/model/SzlModuleTypeClass.go
+++ b/plc4go/protocols/s7/readwrite/model/SzlModuleTypeClass.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,7 +113,7 @@ func SzlModuleTypeClassParse(readBuffer utils.ReadBuffer) (SzlModuleTypeClass, e
 		return 0, errors.Wrap(err, "error reading SzlModuleTypeClass")
 	}
 	if enum, ok := SzlModuleTypeClassByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return SzlModuleTypeClass(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/SzlSublist.go b/plc4go/protocols/s7/readwrite/model/SzlSublist.go
index 6456aa68b46..69be55bc4b0 100644
--- a/plc4go/protocols/s7/readwrite/model/SzlSublist.go
+++ b/plc4go/protocols/s7/readwrite/model/SzlSublist.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -204,7 +203,7 @@ func SzlSublistParse(readBuffer utils.ReadBuffer) (SzlSublist, error) {
 		return 0, errors.Wrap(err, "error reading SzlSublist")
 	}
 	if enum, ok := SzlSublistByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return SzlSublist(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/TPKTPacket.go b/plc4go/protocols/s7/readwrite/model/TPKTPacket.go
index 982d43306c9..84c0896d6c8 100644
--- a/plc4go/protocols/s7/readwrite/model/TPKTPacket.go
+++ b/plc4go/protocols/s7/readwrite/model/TPKTPacket.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -152,7 +151,7 @@ func TPKTPacketParse(readBuffer utils.ReadBuffer) (TPKTPacket, error) {
 			return nil, errors.Wrap(_err, "Error parsing 'reserved' field of TPKTPacket")
 		}
 		if reserved != uint8(0x00) {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Got unexpected response for reserved field.")
@@ -209,7 +208,7 @@ func (m *_TPKTPacket) Serialize(writeBuffer utils.WriteBuffer) error {
 	{
 		var reserved uint8 = uint8(0x00)
 		if m.reservedField0 != nil {
-			log.Info().Fields(map[string]interface{}{
+			Plc4xModelLog.Info().Fields(map[string]interface{}{
 				"expected value": uint8(0x00),
 				"got value":      reserved,
 			}).Msg("Overriding reserved field with unexpected value.")
diff --git a/plc4go/protocols/s7/readwrite/model/TransportSize.go b/plc4go/protocols/s7/readwrite/model/TransportSize.go
index 9a7cf86f442..0042e1d65cd 100644
--- a/plc4go/protocols/s7/readwrite/model/TransportSize.go
+++ b/plc4go/protocols/s7/readwrite/model/TransportSize.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -1598,7 +1597,7 @@ func TransportSizeParse(readBuffer utils.ReadBuffer) (TransportSize, error) {
 		return 0, errors.Wrap(err, "error reading TransportSize")
 	}
 	if enum, ok := TransportSizeByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return TransportSize(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/s7/readwrite/model/plc4x_common.go b/plc4go/protocols/s7/readwrite/model/plc4x_common.go
new file mode 100644
index 00000000000..4a586f90cfe
--- /dev/null
+++ b/plc4go/protocols/s7/readwrite/model/plc4x_common.go
@@ -0,0 +1,27 @@
+/*
+* 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
+
+import "github.com/rs/zerolog/log"
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Plc4xModelLog is the Logger used by the Parse/Serialize methods
+var Plc4xModelLog = log.Logger
diff --git a/plc4go/protocols/simulated/readwrite/model/SimulatedDataTypeSizes.go b/plc4go/protocols/simulated/readwrite/model/SimulatedDataTypeSizes.go
index 6b6725213ce..3962830c604 100644
--- a/plc4go/protocols/simulated/readwrite/model/SimulatedDataTypeSizes.go
+++ b/plc4go/protocols/simulated/readwrite/model/SimulatedDataTypeSizes.go
@@ -22,7 +22,6 @@ package model
 import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -378,7 +377,7 @@ func SimulatedDataTypeSizesParse(readBuffer utils.ReadBuffer) (SimulatedDataType
 		return 0, errors.Wrap(err, "error reading SimulatedDataTypeSizes")
 	}
 	if enum, ok := SimulatedDataTypeSizesByValue(val); !ok {
-		log.Debug().Msgf("no value %x found for RequestType", val)
+		Plc4xModelLog.Debug().Msgf("no value %x found for RequestType", val)
 		return SimulatedDataTypeSizes(val), nil
 	} else {
 		return enum, nil
diff --git a/plc4go/protocols/simulated/readwrite/model/plc4x_common.go b/plc4go/protocols/simulated/readwrite/model/plc4x_common.go
new file mode 100644
index 00000000000..4a586f90cfe
--- /dev/null
+++ b/plc4go/protocols/simulated/readwrite/model/plc4x_common.go
@@ -0,0 +1,27 @@
+/*
+* 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
+
+import "github.com/rs/zerolog/log"
+
+// Code generated by code-generation. DO NOT EDIT.
+
+// Plc4xModelLog is the Logger used by the Parse/Serialize methods
+var Plc4xModelLog = log.Logger